You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2014/09/30 01:20:42 UTC
svn commit: r1628336 [3/3] - in
/qpid/branches/QPID-6125-ProtocolRefactoring/java:
broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/
broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/...
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/MethodRegistry.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/MethodRegistry.java?rev=1628336&r1=1628335&r2=1628336&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/MethodRegistry.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/MethodRegistry.java Mon Sep 29 23:20:39 2014
@@ -30,39 +30,293 @@
package org.apache.qpid.framing;
import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
-import org.apache.qpid.framing.abstraction.ProtocolVersionMethodConverter;
import org.apache.qpid.codec.MarkableDataInput;
+import org.apache.qpid.protocol.AMQConstant;
-import java.util.Map;
-import java.util.HashMap;
-
-public abstract class MethodRegistry
+public final class MethodRegistry
{
- private static final Map<ProtocolVersion, MethodRegistry> _registries =
- new HashMap<ProtocolVersion, MethodRegistry>();
+ private static final Map<ProtocolVersion, MethodRegistry> _registries = new HashMap<>();
public static final MethodRegistry registry_0_9 =
- new org.apache.qpid.framing.amqp_0_9.MethodRegistry_0_9();
+ new MethodRegistry(ProtocolVersion.v0_9);
public static final MethodRegistry registry_0_91 =
- new org.apache.qpid.framing.amqp_0_91.MethodRegistry_0_91();
+ new MethodRegistry(ProtocolVersion.v0_91);
public static final MethodRegistry registry_8_0 =
- new org.apache.qpid.framing.amqp_8_0.MethodRegistry_8_0();
+ new MethodRegistry(ProtocolVersion.v8_0);
+
+ private final ProtocolVersion _protocolVersion;
- public abstract AMQMethodBody convertToBody(MarkableDataInput in, long size)
- throws AMQFrameDecodingException, IOException;
+ public final AMQMethodBody convertToBody(MarkableDataInput in, long size)
+ throws AMQFrameDecodingException, IOException
+ {
+ final int classAndMethod = in.readInt();
- public abstract int getMaxClassId();
+ AMQMethodBody methodBody;
+ switch(classAndMethod)
+ {
+ //CONNECTION_CLASS:
+ case 0x000a000a:
+ methodBody = new ConnectionStartBody(in);
+ break;
+ case 0x000a000b:
+ methodBody = new ConnectionStartOkBody(in);
+ break;
+ case 0x000a0014:
+ methodBody = new ConnectionSecureBody(in);
+ break;
+ case 0x000a0015:
+ methodBody = new ConnectionSecureOkBody(in);
+ break;
+ case 0x000a001e:
+ methodBody = new ConnectionTuneBody(in);
+ break;
+ case 0x000a001f:
+ methodBody = new ConnectionTuneOkBody(in);
+ break;
+ case 0x000a0028:
+ methodBody = new ConnectionOpenBody(in);
+ break;
+ case 0x000a0029:
+ methodBody = new ConnectionOpenOkBody(in);
+ break;
+ case 0x000a002a:
+ methodBody = new ConnectionRedirectBody(in, _protocolVersion);
+ break;
+ case 0x000a0032:
+ if(_protocolVersion.equals(ProtocolVersion.v8_0))
+ {
+ methodBody = new ConnectionRedirectBody(in, _protocolVersion);
+ }
+ else
+ {
+ methodBody = new ConnectionCloseBody(in, _protocolVersion);
+ }
+ break;
+ case 0x000a0033:
+ if(_protocolVersion.equals(ProtocolVersion.v8_0))
+ {
+ throw newUnknownMethodException((classAndMethod >> 16), (classAndMethod & 0xFFFF));
+ }
+ else
+ {
+ methodBody = ConnectionCloseOkBody.CONNECTION_CLOSE_OK_0_9;
+ }
+ break;
+ case 0x000a003c:
+ if(_protocolVersion.equals(ProtocolVersion.v8_0))
+ {
+ methodBody = new ConnectionCloseBody(in, _protocolVersion);
+ }
+ else
+ {
+ throw newUnknownMethodException((classAndMethod >> 16), (classAndMethod & 0xFFFF));
+ }
+ break;
+ case 0x000a003d:
+ if(_protocolVersion.equals(ProtocolVersion.v8_0))
+ {
+ methodBody = ConnectionCloseOkBody.CONNECTION_CLOSE_OK_0_8;
+ }
+ else
+ {
+ throw newUnknownMethodException((classAndMethod >> 16), (classAndMethod & 0xFFFF));
+ }
+ break;
+
+ // CHANNEL_CLASS:
+
+ case 0x0014000a:
+ methodBody = new ChannelOpenBody(in);
+ break;
+ case 0x0014000b:
+ methodBody = ChannelOpenOkBody.getInstance(_protocolVersion, in);
+ break;
+ case 0x00140014:
+ methodBody = new ChannelFlowBody(in);
+ break;
+ case 0x00140015:
+ methodBody = new ChannelFlowOkBody(in);
+ break;
+ case 0x0014001e:
+ methodBody = new ChannelAlertBody(in);
+ break;
+ case 0x00140028:
+ methodBody = new ChannelCloseBody(in);
+ break;
+ case 0x00140029:
+ methodBody = new ChannelCloseOkBody(in);
+ break;
+ // ACCESS_CLASS:
+
+ case 0x001e000a:
+ methodBody = new AccessRequestBody(in);
+ break;
+ case 0x001e000b:
+ methodBody = new AccessRequestOkBody(in);
+ break;
+
+ // EXCHANGE_CLASS:
+
+ case 0x0028000a:
+ methodBody = new ExchangeDeclareBody(in);
+ break;
+ case 0x0028000b:
+ methodBody = new ExchangeDeclareOkBody(in);
+ break;
+ case 0x00280014:
+ methodBody = new ExchangeDeleteBody(in);
+ break;
+ case 0x00280015:
+ methodBody = new ExchangeDeleteOkBody(in);
+ break;
+ case 0x00280016:
+ methodBody = new ExchangeBoundBody(in);
+ break;
+ case 0x00280017:
+ methodBody = new ExchangeBoundOkBody(in);
+ break;
+
+
+ // QUEUE_CLASS:
+
+ case 0x0032000a:
+ methodBody = new QueueDeclareBody(in);
+ break;
+ case 0x0032000b:
+ methodBody = new QueueDeclareOkBody(in);
+ break;
+ case 0x00320014:
+ methodBody = new QueueBindBody(in);
+ break;
+ case 0x00320015:
+ methodBody = new QueueBindOkBody(in);
+ break;
+ case 0x0032001e:
+ methodBody = new QueuePurgeBody(in);
+ break;
+ case 0x0032001f:
+ methodBody = new QueuePurgeOkBody(in);
+ break;
+ case 0x00320028:
+ methodBody = new QueueDeleteBody(in);
+ break;
+ case 0x00320029:
+ methodBody = new QueueDeleteOkBody(in);
+ break;
+ case 0x00320032:
+ methodBody = new QueueUnbindBody(in);
+ break;
+ case 0x00320033:
+ methodBody = new QueueUnbindOkBody(in);
+ break;
+
+
+ // BASIC_CLASS:
+
+ case 0x003c000a:
+ methodBody = new BasicQosBody(in);
+ break;
+ case 0x003c000b:
+ methodBody = new BasicQosOkBody(in);
+ break;
+ case 0x003c0014:
+ methodBody = new BasicConsumeBody(in);
+ break;
+ case 0x003c0015:
+ methodBody = new BasicConsumeOkBody(in);
+ break;
+ case 0x003c001e:
+ methodBody = new BasicCancelBody(in);
+ break;
+ case 0x003c001f:
+ methodBody = new BasicCancelOkBody(in);
+ break;
+ case 0x003c0028:
+ methodBody = new BasicPublishBody(in);
+ break;
+ case 0x003c0032:
+ methodBody = new BasicReturnBody(in);
+ break;
+ case 0x003c003c:
+ methodBody = new BasicDeliverBody(in);
+ break;
+ case 0x003c0046:
+ methodBody = new BasicGetBody(in);
+ break;
+ case 0x003c0047:
+ methodBody = new BasicGetOkBody(in);
+ break;
+ case 0x003c0048:
+ methodBody = new BasicGetEmptyBody(in);
+ break;
+ case 0x003c0050:
+ methodBody = new BasicAckBody(in);
+ break;
+ case 0x003c005a:
+ methodBody = new BasicRejectBody(in);
+ break;
+ case 0x003c0064:
+ methodBody = new BasicRecoverBody(in);
+ break;
+ case 0x003c0065:
+ methodBody = new BasicRecoverSyncOkBody(_protocolVersion);
+ break;
+ case 0x003c0066:
+ methodBody = new BasicRecoverSyncBody(in, _protocolVersion);
+ break;
+ case 0x003c006e:
+ methodBody = new BasicRecoverSyncBody(in, _protocolVersion);
+ break;
+ case 0x003c006f:
+ methodBody = new BasicRecoverSyncOkBody(_protocolVersion);
+ break;
+
+ // TX_CLASS:
+
+ case 0x005a000a:
+ methodBody = TxSelectBody.INSTANCE;
+ break;
+ case 0x005a000b:
+ methodBody = TxSelectOkBody.INSTANCE;
+ break;
+ case 0x005a0014:
+ methodBody = TxCommitBody.INSTANCE;
+ break;
+ case 0x005a0015:
+ methodBody = TxCommitOkBody.INSTANCE;
+ break;
+ case 0x005a001e:
+ methodBody = TxRollbackBody.INSTANCE;
+ break;
+ case 0x005a001f:
+ methodBody = TxRollbackOkBody.INSTANCE;
+ break;
- public abstract int getMaxMethodId(int classId);
+ default:
+ throw newUnknownMethodException((classAndMethod >> 16), (classAndMethod & 0xFFFF));
- protected MethodRegistry(ProtocolVersion pv)
+ }
+ return methodBody;
+ }
+
+ private AMQFrameDecodingException newUnknownMethodException(final int classId, final int methodId)
+ {
+ return new AMQFrameDecodingException(AMQConstant.COMMAND_INVALID,
+ "Method " + methodId + " unknown in AMQP version " + _protocolVersion
+ + " (while trying to decode class " + classId + " method " + methodId + ".");
+ }
+
+ private MethodRegistry(ProtocolVersion pv)
{
_registries.put(pv, this);
+ _protocolVersion = pv;
}
public static MethodRegistry getMethodRegistry(ProtocolVersion pv)
@@ -71,288 +325,508 @@ public abstract class MethodRegistry
}
+ public final AccessRequestBody createAccessRequestBody(final AMQShortString realm,
+ final boolean exclusive,
+ final boolean passive,
+ final boolean active,
+ final boolean write,
+ final boolean read)
+ {
+ return new AccessRequestBody(realm,
+ exclusive,
+ passive,
+ active,
+ write,
+ read);
+ }
+
+ public final AccessRequestOkBody createAccessRequestOkBody(final int ticket)
+ {
+ return new AccessRequestOkBody(ticket);
+ }
+
+
+ public final BasicQosBody createBasicQosBody(final long prefetchSize,
+ final int prefetchCount,
+ final boolean global)
+ {
+ return new BasicQosBody(prefetchSize,
+ prefetchCount,
+ global);
+ }
+
+ public final BasicQosOkBody createBasicQosOkBody()
+ {
+ return new BasicQosOkBody();
+ }
+
+ public final BasicConsumeBody createBasicConsumeBody(final int ticket,
+ final AMQShortString queue,
+ final AMQShortString consumerTag,
+ final boolean noLocal,
+ final boolean noAck,
+ final boolean exclusive,
+ final boolean nowait,
+ final FieldTable arguments)
+ {
+ return new BasicConsumeBody(ticket,
+ queue,
+ consumerTag,
+ noLocal,
+ noAck,
+ exclusive,
+ nowait,
+ arguments);
+ }
+
+ public final BasicConsumeOkBody createBasicConsumeOkBody(final AMQShortString consumerTag)
+ {
+ return new BasicConsumeOkBody(consumerTag);
+ }
+
+ public final BasicCancelBody createBasicCancelBody(final AMQShortString consumerTag,
+ final boolean nowait)
+ {
+ return new BasicCancelBody(consumerTag,
+ nowait);
+ }
+
+ public final BasicCancelOkBody createBasicCancelOkBody(final AMQShortString consumerTag)
+ {
+ return new BasicCancelOkBody(consumerTag);
+ }
+
+ public final BasicPublishBody createBasicPublishBody(final int ticket,
+ final AMQShortString exchange,
+ final AMQShortString routingKey,
+ final boolean mandatory,
+ final boolean immediate)
+ {
+ return new BasicPublishBody(ticket,
+ exchange,
+ routingKey,
+ mandatory,
+ immediate);
+ }
+
+ public final BasicReturnBody createBasicReturnBody(final int replyCode,
+ final AMQShortString replyText,
+ final AMQShortString exchange,
+ final AMQShortString routingKey)
+ {
+ return new BasicReturnBody(replyCode,
+ replyText,
+ exchange,
+ routingKey);
+ }
+
+ public final BasicDeliverBody createBasicDeliverBody(final AMQShortString consumerTag,
+ final long deliveryTag,
+ final boolean redelivered,
+ final AMQShortString exchange,
+ final AMQShortString routingKey)
+ {
+ return new BasicDeliverBody(consumerTag,
+ deliveryTag,
+ redelivered,
+ exchange,
+ routingKey);
+ }
+
+ public final BasicGetBody createBasicGetBody(final int ticket,
+ final AMQShortString queue,
+ final boolean noAck)
+ {
+ return new BasicGetBody(ticket,
+ queue,
+ noAck);
+ }
+
+ public final BasicGetOkBody createBasicGetOkBody(final long deliveryTag,
+ final boolean redelivered,
+ final AMQShortString exchange,
+ final AMQShortString routingKey,
+ final long messageCount)
+ {
+ return new BasicGetOkBody(deliveryTag,
+ redelivered,
+ exchange,
+ routingKey,
+ messageCount);
+ }
+
+ public final BasicGetEmptyBody createBasicGetEmptyBody(final AMQShortString clusterId)
+ {
+ return new BasicGetEmptyBody(clusterId);
+ }
+
+ public final BasicAckBody createBasicAckBody(final long deliveryTag,
+ final boolean multiple)
+ {
+ return new BasicAckBody(deliveryTag,
+ multiple);
+ }
+
+ public final BasicRejectBody createBasicRejectBody(final long deliveryTag,
+ final boolean requeue)
+ {
+ return new BasicRejectBody(deliveryTag,
+ requeue);
+ }
+
+ public final BasicRecoverBody createBasicRecoverBody(final boolean requeue)
+ {
+ return new BasicRecoverBody(requeue);
+ }
+
+
+ public final BasicRecoverSyncOkBody createBasicRecoverSyncOkBody()
+ {
+ return new BasicRecoverSyncOkBody(_protocolVersion);
+ }
+
+
+ public final BasicRecoverSyncBody createBasicRecoverSyncBody(final boolean requeue)
+ {
+ return new BasicRecoverSyncBody(_protocolVersion, requeue);
+ }
+
+ public final ChannelAlertBody createChannelAlertBody(final int replyCode,
+ final AMQShortString replyText,
+ final FieldTable details)
+ {
+ return new ChannelAlertBody(replyCode,
+ replyText,
+ details);
+ }
+
+ public final ChannelOpenBody createChannelOpenBody(final AMQShortString outOfBand)
+ {
+ return new ChannelOpenBody(outOfBand);
+ }
+
+ public final ChannelOpenOkBody createChannelOpenOkBody(byte[] channelId)
+ {
+ return createChannelOpenOkBody();
+ }
+
+ public final ChannelOpenOkBody createChannelOpenOkBody()
+ {
+ return _protocolVersion.equals(ProtocolVersion.v8_0)
+ ? ChannelOpenOkBody.INSTANCE_0_8
+ : ChannelOpenOkBody.INSTANCE_0_9;
+ }
+
+ public final ChannelFlowBody createChannelFlowBody(final boolean active)
+ {
+ return new ChannelFlowBody(active);
+ }
+
+ public final ChannelFlowOkBody createChannelFlowOkBody(final boolean active)
+ {
+ return new ChannelFlowOkBody(active);
+ }
+
+ public final ChannelCloseBody createChannelCloseBody(final int replyCode, final AMQShortString replyText,
+ final int classId,
+ final int methodId
+ )
+ {
+ return new ChannelCloseBody(replyCode,
+ replyText,
+ classId,
+ methodId);
+ }
+
+ public final ChannelCloseOkBody createChannelCloseOkBody()
+ {
+ return new ChannelCloseOkBody();
+ }
+
+
+
+
+ public final ConnectionStartBody createConnectionStartBody(final short versionMajor,
+ final short versionMinor,
+ final FieldTable serverProperties,
+ final byte[] mechanisms,
+ final byte[] locales)
+ {
+ return new ConnectionStartBody(versionMajor,
+ versionMinor,
+ serverProperties,
+ mechanisms,
+ locales);
+ }
+
+ public final ConnectionStartOkBody createConnectionStartOkBody(final FieldTable clientProperties,
+ final AMQShortString mechanism,
+ final byte[] response,
+ final AMQShortString locale)
+ {
+ return new ConnectionStartOkBody(clientProperties,
+ mechanism,
+ response,
+ locale);
+ }
+
+ public final ConnectionSecureBody createConnectionSecureBody(final byte[] challenge)
+ {
+ return new ConnectionSecureBody(challenge);
+ }
+
+ public final ConnectionSecureOkBody createConnectionSecureOkBody(final byte[] response)
+ {
+ return new ConnectionSecureOkBody(response);
+ }
+
+ public final ConnectionTuneBody createConnectionTuneBody(final int channelMax,
+ final long frameMax,
+ final int heartbeat)
+ {
+ return new ConnectionTuneBody(channelMax,
+ frameMax,
+ heartbeat);
+ }
+
+ public final ConnectionTuneOkBody createConnectionTuneOkBody(final int channelMax,
+ final long frameMax,
+ final int heartbeat)
+ {
+ return new ConnectionTuneOkBody(channelMax,
+ frameMax,
+ heartbeat);
+ }
+
+ public final ConnectionOpenBody createConnectionOpenBody(final AMQShortString virtualHost,
+ final AMQShortString capabilities,
+ final boolean insist)
+ {
+ return new ConnectionOpenBody(virtualHost,
+ capabilities,
+ insist);
+ }
+
+ public final ConnectionOpenOkBody createConnectionOpenOkBody(final AMQShortString knownHosts)
+ {
+ return new ConnectionOpenOkBody(knownHosts);
+ }
+
+ public final ConnectionRedirectBody createConnectionRedirectBody(final AMQShortString host,
+ final AMQShortString knownHosts)
+ {
+ return new ConnectionRedirectBody(_protocolVersion,
+ host,
+ knownHosts);
+ }
+
+ public final ConnectionCloseBody createConnectionCloseBody(final int replyCode,
+ final AMQShortString replyText,
+ final int classId,
+ final int methodId)
+ {
+ return new ConnectionCloseBody(_protocolVersion,
+ replyCode,
+ replyText,
+ classId,
+ methodId);
+ }
+
+ public final ConnectionCloseOkBody createConnectionCloseOkBody()
+ {
+ return ProtocolVersion.v8_0 == _protocolVersion
+ ? ConnectionCloseOkBody.CONNECTION_CLOSE_OK_0_8
+ : ConnectionCloseOkBody.CONNECTION_CLOSE_OK_0_9;
+ }
+
+
+ public final ExchangeDeclareBody createExchangeDeclareBody(final int ticket,
+ final AMQShortString exchange,
+ final AMQShortString type,
+ final boolean passive,
+ final boolean durable,
+ final boolean autoDelete,
+ final boolean internal,
+ final boolean nowait,
+ final FieldTable arguments)
+ {
+ return new ExchangeDeclareBody(ticket,
+ exchange,
+ type,
+ passive,
+ durable,
+ autoDelete,
+ internal,
+ nowait,
+ arguments);
+ }
+
+ public final ExchangeDeclareOkBody createExchangeDeclareOkBody()
+ {
+ return new ExchangeDeclareOkBody();
+ }
+
+ public final ExchangeDeleteBody createExchangeDeleteBody(final int ticket,
+ final AMQShortString exchange,
+ final boolean ifUnused,
+ final boolean nowait)
+ {
+ return new ExchangeDeleteBody(ticket,
+ exchange,
+ ifUnused,
+ nowait
+ );
+ }
+
+ public final ExchangeDeleteOkBody createExchangeDeleteOkBody()
+ {
+ return new ExchangeDeleteOkBody();
+ }
+
+ public final ExchangeBoundBody createExchangeBoundBody(final AMQShortString exchange,
+ final AMQShortString routingKey,
+ final AMQShortString queue)
+ {
+ return new ExchangeBoundBody(exchange,
+ routingKey,
+ queue);
+ }
+
+ public final ExchangeBoundOkBody createExchangeBoundOkBody(final int replyCode,
+ final AMQShortString replyText)
+ {
+ return new ExchangeBoundOkBody(replyCode,
+ replyText);
+ }
+
+ public final QueueDeclareBody createQueueDeclareBody(final int ticket,
+ final AMQShortString queue,
+ final boolean passive,
+ final boolean durable,
+ final boolean exclusive,
+ final boolean autoDelete,
+ final boolean nowait,
+ final FieldTable arguments)
+ {
+ return new QueueDeclareBody(ticket,
+ queue,
+ passive,
+ durable,
+ exclusive,
+ autoDelete,
+ nowait,
+ arguments);
+ }
- public abstract BasicAckBody createBasicAckBody(
- final long deliveryTag,
- final boolean multiple
- );
-
- public abstract BasicCancelBody createBasicCancelBody(
- final AMQShortString consumerTag,
- final boolean nowait
- );
-
- public abstract BasicCancelOkBody createBasicCancelOkBody(
- final AMQShortString consumerTag
- );
-
- public abstract BasicConsumeBody createBasicConsumeBody(
- final int ticket,
- final AMQShortString queue,
- final AMQShortString consumerTag,
- final boolean noLocal,
- final boolean noAck,
- final boolean exclusive,
- final boolean nowait,
- final FieldTable arguments
- );
-
- public abstract BasicConsumeOkBody createBasicConsumeOkBody(
- final AMQShortString consumerTag
- );
-
- public abstract BasicDeliverBody createBasicDeliverBody(
- final AMQShortString consumerTag,
- final long deliveryTag,
- final boolean redelivered,
- final AMQShortString exchange,
- final AMQShortString routingKey
- );
-
- public abstract BasicGetBody createBasicGetBody(
- final int ticket,
- final AMQShortString queue,
- final boolean noAck
- );
-
- public abstract BasicGetEmptyBody createBasicGetEmptyBody(
- final AMQShortString clusterId
- );
-
- public abstract BasicGetOkBody createBasicGetOkBody(
- final long deliveryTag,
- final boolean redelivered,
- final AMQShortString exchange,
- final AMQShortString routingKey,
- final long messageCount
- );
-
- public abstract BasicPublishBody createBasicPublishBody(
- final int ticket,
- final AMQShortString exchange,
- final AMQShortString routingKey,
- final boolean mandatory,
- final boolean immediate
- );
-
- public abstract BasicQosBody createBasicQosBody(
- final long prefetchSize,
- final int prefetchCount,
- final boolean global
- );
-
- public abstract BasicQosOkBody createBasicQosOkBody(
- );
-
- public abstract BasicRecoverBody createBasicRecoverBody(
- final boolean requeue
- );
-
- public abstract BasicRejectBody createBasicRejectBody(
- final long deliveryTag,
- final boolean requeue
- );
-
- public abstract BasicReturnBody createBasicReturnBody(
- final int replyCode,
- final AMQShortString replyText,
- final AMQShortString exchange,
- final AMQShortString routingKey
- );
-
-
- public abstract ChannelCloseBody createChannelCloseBody(
- final int replyCode,
- final AMQShortString replyText,
- final int classId,
- final int methodId
- );
-
- public abstract ChannelCloseOkBody createChannelCloseOkBody(
- );
-
- public abstract ChannelFlowBody createChannelFlowBody(
- final boolean active
- );
-
- public abstract ChannelFlowOkBody createChannelFlowOkBody(
- final boolean active
- );
-
- public abstract ChannelOpenBody createChannelOpenBody(
- final AMQShortString outOfBand
- );
-
-
- public abstract ConnectionCloseBody createConnectionCloseBody(
- final int replyCode,
- final AMQShortString replyText,
- final int classId,
- final int methodId
- );
-
- public abstract ConnectionCloseOkBody createConnectionCloseOkBody(
- );
-
- public abstract ConnectionOpenBody createConnectionOpenBody(
- final AMQShortString virtualHost,
- final AMQShortString capabilities,
- final boolean insist
- );
-
- public abstract ConnectionOpenOkBody createConnectionOpenOkBody(
- final AMQShortString knownHosts
- );
-
- public abstract ConnectionSecureBody createConnectionSecureBody(
- final byte[] challenge
- );
-
- public abstract ConnectionSecureOkBody createConnectionSecureOkBody(
- final byte[] response
- );
-
- public abstract ConnectionStartBody createConnectionStartBody(
- final short versionMajor,
- final short versionMinor,
- final FieldTable serverProperties,
- final byte[] mechanisms,
- final byte[] locales
- );
-
- public abstract ConnectionStartOkBody createConnectionStartOkBody(
- final FieldTable clientProperties,
- final AMQShortString mechanism,
- final byte[] response,
- final AMQShortString locale
- );
-
- public abstract ConnectionTuneBody createConnectionTuneBody(
- final int channelMax,
- final long frameMax,
- final int heartbeat
- );
-
- public abstract ConnectionTuneOkBody createConnectionTuneOkBody(
- final int channelMax,
- final long frameMax,
- final int heartbeat
- );
-
-
-
- public abstract ExchangeBoundBody createExchangeBoundBody(
- final AMQShortString exchange,
- final AMQShortString routingKey,
- final AMQShortString queue
- );
-
- public abstract ExchangeBoundOkBody createExchangeBoundOkBody(
- final int replyCode,
- final AMQShortString replyText
- );
-
- public abstract ExchangeDeclareBody createExchangeDeclareBody(
- final int ticket,
- final AMQShortString exchange,
- final AMQShortString type,
- final boolean passive,
- final boolean durable,
- final boolean autoDelete,
- final boolean internal,
- final boolean nowait,
- final FieldTable arguments
- );
-
- public abstract ExchangeDeclareOkBody createExchangeDeclareOkBody(
- );
-
- public abstract ExchangeDeleteBody createExchangeDeleteBody(
- final int ticket,
- final AMQShortString exchange,
- final boolean ifUnused,
- final boolean nowait
- );
-
- public abstract ExchangeDeleteOkBody createExchangeDeleteOkBody(
- );
-
-
-
-
- public abstract QueueBindBody createQueueBindBody(
- final int ticket,
- final AMQShortString queue,
- final AMQShortString exchange,
- final AMQShortString routingKey,
- final boolean nowait,
- final FieldTable arguments
- );
-
- public abstract QueueBindOkBody createQueueBindOkBody(
- );
-
- public abstract QueueDeclareBody createQueueDeclareBody(
- final int ticket,
- final AMQShortString queue,
- final boolean passive,
- final boolean durable,
- final boolean exclusive,
- final boolean autoDelete,
- final boolean nowait,
- final FieldTable arguments
- );
-
- public abstract QueueDeclareOkBody createQueueDeclareOkBody(
- final AMQShortString queue,
- final long messageCount,
- final long consumerCount
- );
-
- public abstract QueueDeleteBody createQueueDeleteBody(
- final int ticket,
- final AMQShortString queue,
- final boolean ifUnused,
- final boolean ifEmpty,
- final boolean nowait
- );
-
- public abstract QueueDeleteOkBody createQueueDeleteOkBody(
- final long messageCount
- );
-
- public abstract QueuePurgeBody createQueuePurgeBody(
- final int ticket,
- final AMQShortString queue,
- final boolean nowait
- );
-
- public abstract QueuePurgeOkBody createQueuePurgeOkBody(
- final long messageCount
- );
-
-
-
-
-
- public abstract TxCommitBody createTxCommitBody(
- );
-
- public abstract TxCommitOkBody createTxCommitOkBody(
- );
-
- public abstract TxRollbackBody createTxRollbackBody(
- );
-
- public abstract TxRollbackOkBody createTxRollbackOkBody(
- );
+ public final QueueDeclareOkBody createQueueDeclareOkBody(final AMQShortString queue,
+ final long messageCount,
+ final long consumerCount)
+ {
+ return new QueueDeclareOkBody(queue,
+ messageCount,
+ consumerCount);
+ }
+
+ public final QueueBindBody createQueueBindBody(final int ticket,
+ final AMQShortString queue,
+ final AMQShortString exchange,
+ final AMQShortString routingKey,
+ final boolean nowait,
+ final FieldTable arguments)
+ {
+ return new QueueBindBody(ticket,
+ queue,
+ exchange,
+ routingKey,
+ nowait,
+ arguments);
+ }
- public abstract TxSelectBody createTxSelectBody(
- );
+ public final QueueBindOkBody createQueueBindOkBody()
+ {
+ return new QueueBindOkBody();
+ }
+
+ public final QueuePurgeBody createQueuePurgeBody(final int ticket,
+ final AMQShortString queue,
+ final boolean nowait)
+ {
+ return new QueuePurgeBody(ticket,
+ queue,
+ nowait);
+ }
+
+ public final QueuePurgeOkBody createQueuePurgeOkBody(final long messageCount)
+ {
+ return new QueuePurgeOkBody(messageCount);
+ }
+
+ public final QueueDeleteBody createQueueDeleteBody(final int ticket,
+ final AMQShortString queue,
+ final boolean ifUnused,
+ final boolean ifEmpty,
+ final boolean nowait)
+ {
+ return new QueueDeleteBody(ticket,
+ queue,
+ ifUnused,
+ ifEmpty,
+ nowait);
+ }
+
+ public final QueueDeleteOkBody createQueueDeleteOkBody(final long messageCount)
+ {
+ return new QueueDeleteOkBody(messageCount);
+ }
- public abstract TxSelectOkBody createTxSelectOkBody(
- );
+ public final QueueUnbindBody createQueueUnbindBody(final int ticket,
+ final AMQShortString queue,
+ final AMQShortString exchange,
+ final AMQShortString routingKey,
+ final FieldTable arguments)
+ {
+ return new QueueUnbindBody(ticket,
+ queue,
+ exchange,
+ routingKey,
+ arguments);
+ }
+
+ public final QueueUnbindOkBody createQueueUnbindOkBody()
+ {
+ return new QueueUnbindOkBody();
+ }
+
+
+ public final TxSelectBody createTxSelectBody()
+ {
+ return TxSelectBody.INSTANCE;
+ }
+
+ public final TxSelectOkBody createTxSelectOkBody()
+ {
+ return TxSelectOkBody.INSTANCE;
+ }
+
+ public final TxCommitBody createTxCommitBody()
+ {
+ return TxCommitBody.INSTANCE;
+ }
+
+ public final TxCommitOkBody createTxCommitOkBody()
+ {
+ return TxCommitOkBody.INSTANCE;
+ }
+
+ public final TxRollbackBody createTxRollbackBody()
+ {
+ return TxRollbackBody.INSTANCE;
+ }
+
+ public final TxRollbackOkBody createTxRollbackOkBody()
+ {
+ return TxRollbackOkBody.INSTANCE;
+ }
- public abstract ProtocolVersionMethodConverter getProtocolVersionMethodConverter();
}
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueBindBody.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueBindBody.java?rev=1628336&r1=1628335&r2=1628336&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueBindBody.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueBindBody.java Mon Sep 29 23:20:39 2014
@@ -35,18 +35,6 @@ import org.apache.qpid.codec.MarkableDat
public class QueueBindBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
- private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
- {
- public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
- {
- return new QueueBindBody(in);
- }
- };
-
- public static AMQMethodBodyInstanceFactory getFactory()
- {
- return FACTORY_INSTANCE;
- }
public static final int CLASS_ID = 50;
public static final int METHOD_ID = 20;
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueBindOkBody.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueBindOkBody.java?rev=1628336&r1=1628335&r2=1628336&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueBindOkBody.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueBindOkBody.java Mon Sep 29 23:20:39 2014
@@ -35,18 +35,6 @@ import org.apache.qpid.codec.MarkableDat
public class QueueBindOkBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
- private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
- {
- public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
- {
- return new QueueBindOkBody(in);
- }
- };
-
- public static AMQMethodBodyInstanceFactory getFactory()
- {
- return FACTORY_INSTANCE;
- }
public static final int CLASS_ID = 50;
public static final int METHOD_ID = 21;
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueDeclareBody.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueDeclareBody.java?rev=1628336&r1=1628335&r2=1628336&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueDeclareBody.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueDeclareBody.java Mon Sep 29 23:20:39 2014
@@ -35,18 +35,6 @@ import org.apache.qpid.codec.MarkableDat
public class QueueDeclareBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
- private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
- {
- public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
- {
- return new QueueDeclareBody(in);
- }
- };
-
- public static AMQMethodBodyInstanceFactory getFactory()
- {
- return FACTORY_INSTANCE;
- }
public static final int CLASS_ID = 50;
public static final int METHOD_ID = 10;
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueDeclareOkBody.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueDeclareOkBody.java?rev=1628336&r1=1628335&r2=1628336&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueDeclareOkBody.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueDeclareOkBody.java Mon Sep 29 23:20:39 2014
@@ -35,18 +35,6 @@ import org.apache.qpid.codec.MarkableDat
public class QueueDeclareOkBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
- private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
- {
- public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
- {
- return new QueueDeclareOkBody(in);
- }
- };
-
- public static AMQMethodBodyInstanceFactory getFactory()
- {
- return FACTORY_INSTANCE;
- }
public static final int CLASS_ID = 50;
public static final int METHOD_ID = 11;
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueDeleteBody.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueDeleteBody.java?rev=1628336&r1=1628335&r2=1628336&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueDeleteBody.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueDeleteBody.java Mon Sep 29 23:20:39 2014
@@ -35,18 +35,6 @@ import org.apache.qpid.codec.MarkableDat
public class QueueDeleteBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
- private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
- {
- public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
- {
- return new QueueDeleteBody(in);
- }
- };
-
- public static AMQMethodBodyInstanceFactory getFactory()
- {
- return FACTORY_INSTANCE;
- }
public static final int CLASS_ID = 50;
public static final int METHOD_ID = 40;
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueDeleteOkBody.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueDeleteOkBody.java?rev=1628336&r1=1628335&r2=1628336&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueDeleteOkBody.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueDeleteOkBody.java Mon Sep 29 23:20:39 2014
@@ -35,18 +35,6 @@ import org.apache.qpid.codec.MarkableDat
public class QueueDeleteOkBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
- private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
- {
- public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
- {
- return new QueueDeleteOkBody(in);
- }
- };
-
- public static AMQMethodBodyInstanceFactory getFactory()
- {
- return FACTORY_INSTANCE;
- }
public static final int CLASS_ID = 50;
public static final int METHOD_ID = 41;
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueuePurgeBody.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueuePurgeBody.java?rev=1628336&r1=1628335&r2=1628336&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueuePurgeBody.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueuePurgeBody.java Mon Sep 29 23:20:39 2014
@@ -35,18 +35,6 @@ import org.apache.qpid.codec.MarkableDat
public class QueuePurgeBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
- private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
- {
- public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
- {
- return new QueuePurgeBody(in);
- }
- };
-
- public static AMQMethodBodyInstanceFactory getFactory()
- {
- return FACTORY_INSTANCE;
- }
public static final int CLASS_ID = 50;
public static final int METHOD_ID = 30;
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueuePurgeOkBody.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueuePurgeOkBody.java?rev=1628336&r1=1628335&r2=1628336&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueuePurgeOkBody.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueuePurgeOkBody.java Mon Sep 29 23:20:39 2014
@@ -35,18 +35,6 @@ import org.apache.qpid.codec.MarkableDat
public class QueuePurgeOkBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
- private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
- {
- public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
- {
- return new QueuePurgeOkBody(in);
- }
- };
-
- public static AMQMethodBodyInstanceFactory getFactory()
- {
- return FACTORY_INSTANCE;
- }
public static final int CLASS_ID = 50;
public static final int METHOD_ID = 31;
Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueUnbindBody.java (from r1628074, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueUnbindBodyImpl.java)
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueUnbindBody.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueUnbindBody.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueUnbindBodyImpl.java&r1=1628074&r2=1628336&rev=1628336&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueUnbindBodyImpl.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueUnbindBody.java Mon Sep 29 23:20:39 2014
@@ -25,29 +25,16 @@
* 0-91
*/
-package org.apache.qpid.framing.amqp_0_91;
+package org.apache.qpid.framing;
-import org.apache.qpid.codec.MarkableDataInput;
import java.io.DataOutput;
import java.io.IOException;
-import org.apache.qpid.framing.*;
import org.apache.qpid.AMQException;
+import org.apache.qpid.codec.MarkableDataInput;
-public class QueueUnbindBodyImpl extends AMQMethodBodyImpl implements QueueUnbindBody
+public class QueueUnbindBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
- private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
- {
- public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
- {
- return new QueueUnbindBodyImpl(in);
- }
- };
-
- public static AMQMethodBodyInstanceFactory getFactory()
- {
- return FACTORY_INSTANCE;
- }
public static final int CLASS_ID = 50;
public static final int METHOD_ID = 50;
@@ -60,7 +47,7 @@ public class QueueUnbindBodyImpl extends
private final FieldTable _arguments; // [arguments]
// Constructor
- public QueueUnbindBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
+ public QueueUnbindBody(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
{
_ticket = readUnsignedShort( buffer );
_queue = readAMQShortString( buffer );
@@ -69,13 +56,13 @@ public class QueueUnbindBodyImpl extends
_arguments = readFieldTable( buffer );
}
- public QueueUnbindBodyImpl(
- int ticket,
- AMQShortString queue,
- AMQShortString exchange,
- AMQShortString routingKey,
- FieldTable arguments
- )
+ public QueueUnbindBody(
+ int ticket,
+ AMQShortString queue,
+ AMQShortString exchange,
+ AMQShortString routingKey,
+ FieldTable arguments
+ )
{
_ticket = ticket;
_queue = queue;
@@ -136,7 +123,7 @@ public class QueueUnbindBodyImpl extends
public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
{
- return ((MethodDispatcher_0_91)dispatcher).dispatchQueueUnbind(this, channelId);
+ return dispatcher.dispatchQueueUnbind(this, channelId);
}
public String toString()
Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueUnbindOkBody.java (from r1628074, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueUnbindOkBodyImpl.java)
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueUnbindOkBody.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueUnbindOkBody.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueUnbindOkBodyImpl.java&r1=1628074&r2=1628336&rev=1628336&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueUnbindOkBodyImpl.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueUnbindOkBody.java Mon Sep 29 23:20:39 2014
@@ -25,29 +25,16 @@
* 0-91
*/
-package org.apache.qpid.framing.amqp_0_91;
+package org.apache.qpid.framing;
import org.apache.qpid.codec.MarkableDataInput;
import java.io.DataOutput;
import java.io.IOException;
-import org.apache.qpid.framing.*;
import org.apache.qpid.AMQException;
-public class QueueUnbindOkBodyImpl extends AMQMethodBodyImpl implements QueueUnbindOkBody
+public class QueueUnbindOkBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
- private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
- {
- public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
- {
- return new QueueUnbindOkBodyImpl(in);
- }
- };
-
- public static AMQMethodBodyInstanceFactory getFactory()
- {
- return FACTORY_INSTANCE;
- }
public static final int CLASS_ID = 50;
public static final int METHOD_ID = 51;
@@ -55,11 +42,11 @@ public class QueueUnbindOkBodyImpl exten
// Fields declared in specification
// Constructor
- public QueueUnbindOkBodyImpl(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
+ public QueueUnbindOkBody(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
{
}
- public QueueUnbindOkBodyImpl(
+ public QueueUnbindOkBody(
)
{
}
@@ -87,7 +74,7 @@ public class QueueUnbindOkBodyImpl exten
public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException
{
- return ((MethodDispatcher_0_91)dispatcher).dispatchQueueUnbindOk(this, channelId);
+ return dispatcher.dispatchQueueUnbindOk(this, channelId);
}
public String toString()
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ServerMethodDispatcher.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ServerMethodDispatcher.java?rev=1628336&r1=1628335&r2=1628336&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ServerMethodDispatcher.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ServerMethodDispatcher.java Mon Sep 29 23:20:39 2014
@@ -33,6 +33,7 @@ import org.apache.qpid.AMQException;
public interface ServerMethodDispatcher
{
+ boolean dispatchAccessRequest(AccessRequestBody accessRequestBody, int channelId) throws AMQException;
public boolean dispatchBasicAck(BasicAckBody body, int channelId) throws AMQException;
public boolean dispatchBasicCancel(BasicCancelBody body, int channelId) throws AMQException;
@@ -64,4 +65,5 @@ public interface ServerMethodDispatcher
public boolean dispatchTxRollback(TxRollbackBody body, int channelId) throws AMQException;
public boolean dispatchTxSelect(TxSelectBody body, int channelId) throws AMQException;
+ boolean dispatchQueueUnbind(QueueUnbindBody queueUnbindBody, int channelId) throws AMQException;
}
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxCommitBody.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxCommitBody.java?rev=1628336&r1=1628335&r2=1628336&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxCommitBody.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxCommitBody.java Mon Sep 29 23:20:39 2014
@@ -31,35 +31,19 @@ import java.io.DataOutput;
import java.io.IOException;
import org.apache.qpid.AMQException;
-import org.apache.qpid.codec.MarkableDataInput;
public class TxCommitBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
- private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
- {
- public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
- {
- return new TxCommitBody(in);
- }
- };
-
- public static AMQMethodBodyInstanceFactory getFactory()
- {
- return FACTORY_INSTANCE;
- }
public static final int CLASS_ID = 90;
public static final int METHOD_ID = 20;
- // Fields declared in specification
+ public static final TxCommitBody INSTANCE = new TxCommitBody();
// Constructor
- public TxCommitBody(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
- {
- }
- public TxCommitBody(
- )
+
+ public TxCommitBody()
{
}
@@ -76,8 +60,7 @@ public class TxCommitBody extends AMQMet
protected int getBodySize()
{
- int size = 0;
- return size;
+ return 0;
}
public void writeMethodPayload(DataOutput buffer) throws IOException
@@ -91,9 +74,7 @@ public class TxCommitBody extends AMQMet
public String toString()
{
- StringBuilder buf = new StringBuilder("[TxCommitBodyImpl: ");
- buf.append("]");
- return buf.toString();
+ return "[TxCommitBody]";
}
}
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxCommitOkBody.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxCommitOkBody.java?rev=1628336&r1=1628335&r2=1628336&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxCommitOkBody.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxCommitOkBody.java Mon Sep 29 23:20:39 2014
@@ -31,35 +31,17 @@ import java.io.DataOutput;
import java.io.IOException;
import org.apache.qpid.AMQException;
-import org.apache.qpid.codec.MarkableDataInput;
public class TxCommitOkBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
- private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
- {
- public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
- {
- return new TxCommitOkBody(in);
- }
- };
-
- public static AMQMethodBodyInstanceFactory getFactory()
- {
- return FACTORY_INSTANCE;
- }
public static final int CLASS_ID = 90;
public static final int METHOD_ID = 21;
- // Fields declared in specification
+ public static final TxCommitOkBody INSTANCE = new TxCommitOkBody();
// Constructor
- public TxCommitOkBody(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
- {
- }
-
- public TxCommitOkBody(
- )
+ private TxCommitOkBody()
{
}
@@ -76,8 +58,7 @@ public class TxCommitOkBody extends AMQM
protected int getBodySize()
{
- int size = 0;
- return size;
+ return 0;
}
public void writeMethodPayload(DataOutput buffer) throws IOException
@@ -91,9 +72,7 @@ public class TxCommitOkBody extends AMQM
public String toString()
{
- StringBuilder buf = new StringBuilder("[TxCommitOkBodyImpl: ");
- buf.append("]");
- return buf.toString();
+ return "[TxCommitOkBody]";
}
}
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxRollbackBody.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxRollbackBody.java?rev=1628336&r1=1628335&r2=1628336&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxRollbackBody.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxRollbackBody.java Mon Sep 29 23:20:39 2014
@@ -31,35 +31,17 @@ import java.io.DataOutput;
import java.io.IOException;
import org.apache.qpid.AMQException;
-import org.apache.qpid.codec.MarkableDataInput;
public class TxRollbackBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
- private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
- {
- public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
- {
- return new TxRollbackBody(in);
- }
- };
-
- public static AMQMethodBodyInstanceFactory getFactory()
- {
- return FACTORY_INSTANCE;
- }
public static final int CLASS_ID = 90;
public static final int METHOD_ID = 30;
- // Fields declared in specification
+ public static final TxRollbackBody INSTANCE = new TxRollbackBody();
- // Constructor
- public TxRollbackBody(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
- {
- }
- public TxRollbackBody(
- )
+ private TxRollbackBody()
{
}
@@ -76,8 +58,7 @@ public class TxRollbackBody extends AMQM
protected int getBodySize()
{
- int size = 0;
- return size;
+ return 0;
}
public void writeMethodPayload(DataOutput buffer) throws IOException
@@ -91,9 +72,7 @@ public class TxRollbackBody extends AMQM
public String toString()
{
- StringBuilder buf = new StringBuilder("[TxRollbackBodyImpl: ");
- buf.append("]");
- return buf.toString();
+ return "[TxRollbackBody]";
}
}
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxRollbackOkBody.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxRollbackOkBody.java?rev=1628336&r1=1628335&r2=1628336&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxRollbackOkBody.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxRollbackOkBody.java Mon Sep 29 23:20:39 2014
@@ -31,35 +31,18 @@ import java.io.DataOutput;
import java.io.IOException;
import org.apache.qpid.AMQException;
-import org.apache.qpid.codec.MarkableDataInput;
public class TxRollbackOkBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
- private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
- {
- public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
- {
- return new TxRollbackOkBody(in);
- }
- };
-
- public static AMQMethodBodyInstanceFactory getFactory()
- {
- return FACTORY_INSTANCE;
- }
public static final int CLASS_ID = 90;
public static final int METHOD_ID = 31;
- // Fields declared in specification
+ public static final TxRollbackOkBody INSTANCE = new TxRollbackOkBody();
// Constructor
- public TxRollbackOkBody(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
- {
- }
- public TxRollbackOkBody(
- )
+ private TxRollbackOkBody()
{
}
@@ -76,8 +59,7 @@ public class TxRollbackOkBody extends AM
protected int getBodySize()
{
- int size = 0;
- return size;
+ return 0;
}
public void writeMethodPayload(DataOutput buffer) throws IOException
@@ -91,9 +73,7 @@ public class TxRollbackOkBody extends AM
public String toString()
{
- StringBuilder buf = new StringBuilder("[TxRollbackOkBodyImpl: ");
- buf.append("]");
- return buf.toString();
+ return "[TxRollbackOkBody]";
}
}
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxSelectBody.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxSelectBody.java?rev=1628336&r1=1628335&r2=1628336&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxSelectBody.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxSelectBody.java Mon Sep 29 23:20:39 2014
@@ -31,35 +31,20 @@ import java.io.DataOutput;
import java.io.IOException;
import org.apache.qpid.AMQException;
-import org.apache.qpid.codec.MarkableDataInput;
public class TxSelectBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
- private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
- {
- public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
- {
- return new TxSelectBody(in);
- }
- };
-
- public static AMQMethodBodyInstanceFactory getFactory()
- {
- return FACTORY_INSTANCE;
- }
public static final int CLASS_ID = 90;
public static final int METHOD_ID = 10;
+ public static final TxSelectBody INSTANCE = new TxSelectBody();
+
// Fields declared in specification
// Constructor
- public TxSelectBody(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
- {
- }
- public TxSelectBody(
- )
+ private TxSelectBody()
{
}
@@ -76,8 +61,7 @@ public class TxSelectBody extends AMQMet
protected int getBodySize()
{
- int size = 0;
- return size;
+ return 0;
}
public void writeMethodPayload(DataOutput buffer) throws IOException
@@ -91,9 +75,7 @@ public class TxSelectBody extends AMQMet
public String toString()
{
- StringBuilder buf = new StringBuilder("[TxSelectBodyImpl: ");
- buf.append("]");
- return buf.toString();
+ return "[TxSelectBody]";
}
}
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxSelectOkBody.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxSelectOkBody.java?rev=1628336&r1=1628335&r2=1628336&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxSelectOkBody.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxSelectOkBody.java Mon Sep 29 23:20:39 2014
@@ -31,35 +31,16 @@ import java.io.DataOutput;
import java.io.IOException;
import org.apache.qpid.AMQException;
-import org.apache.qpid.codec.MarkableDataInput;
public class TxSelectOkBody extends AMQMethodBodyImpl implements EncodableAMQDataBlock, AMQMethodBody
{
- private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory()
- {
- public AMQMethodBody newInstance(MarkableDataInput in, long size) throws AMQFrameDecodingException, IOException
- {
- return new TxSelectOkBody(in);
- }
- };
-
- public static AMQMethodBodyInstanceFactory getFactory()
- {
- return FACTORY_INSTANCE;
- }
public static final int CLASS_ID = 90;
public static final int METHOD_ID = 11;
- // Fields declared in specification
-
- // Constructor
- public TxSelectOkBody(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
- {
- }
+ public static final TxSelectOkBody INSTANCE = new TxSelectOkBody();
- public TxSelectOkBody(
- )
+ private TxSelectOkBody()
{
}
@@ -76,8 +57,7 @@ public class TxSelectOkBody extends AMQM
protected int getBodySize()
{
- int size = 0;
- return size;
+ return 0;
}
public void writeMethodPayload(DataOutput buffer) throws IOException
@@ -91,9 +71,7 @@ public class TxSelectOkBody extends AMQM
public String toString()
{
- StringBuilder buf = new StringBuilder("[TxSelectOkBodyImpl: ");
- buf.append("]");
- return buf.toString();
+ return "[TxSelectOkBody]";
}
}
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ClientMethodDispatcher_8_0.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ClientMethodDispatcher_8_0.java?rev=1628336&r1=1628335&r2=1628336&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ClientMethodDispatcher_8_0.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ClientMethodDispatcher_8_0.java Mon Sep 29 23:20:39 2014
@@ -34,7 +34,6 @@ public interface ClientMethodDispatcher_
{
public boolean dispatchAccessRequestOk(AccessRequestOkBody body, int channelId) throws AMQException;
- public boolean dispatchBasicRecoverOk(BasicRecoverOkBody body, int channelId) throws AMQException;
public boolean dispatchChannelAlert(ChannelAlertBody body, int channelId) throws AMQException;
public boolean dispatchConnectionRedirect(ConnectionRedirectBody body, int channelId) throws AMQException;
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/test/java/org/apache/qpid/server/logging/ExchangeLoggingTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/test/java/org/apache/qpid/server/logging/ExchangeLoggingTest.java?rev=1628336&r1=1628335&r2=1628336&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/test/java/org/apache/qpid/server/logging/ExchangeLoggingTest.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/test/java/org/apache/qpid/server/logging/ExchangeLoggingTest.java Mon Sep 29 23:20:39 2014
@@ -20,14 +20,8 @@
*/
package org.apache.qpid.server.logging;
-import org.apache.qpid.client.AMQConnection;
-import org.apache.qpid.client.AMQSession;
-import org.apache.qpid.client.AMQSession_0_10;
-import org.apache.qpid.framing.AMQFrame;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.ExchangeDeleteBody;
-import org.apache.qpid.framing.ExchangeDeleteOkBody;
-import org.apache.qpid.framing.amqp_8_0.MethodRegistry_8_0;
+import java.io.IOException;
+import java.util.List;
import javax.jms.Connection;
import javax.jms.JMSException;
@@ -35,8 +29,15 @@ import javax.jms.MessageProducer;
import javax.jms.Queue;
import javax.jms.Session;
import javax.jms.TextMessage;
-import java.io.IOException;
-import java.util.List;
+
+import org.apache.qpid.client.AMQConnection;
+import org.apache.qpid.client.AMQSession;
+import org.apache.qpid.client.AMQSession_0_10;
+import org.apache.qpid.framing.AMQFrame;
+import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.framing.ExchangeDeleteBody;
+import org.apache.qpid.framing.ExchangeDeleteOkBody;
+import org.apache.qpid.framing.MethodRegistry;
/**
* Exchange
@@ -191,7 +192,7 @@ public class ExchangeLoggingTest extends
}
else
{
- MethodRegistry_8_0 registry = new MethodRegistry_8_0();
+ MethodRegistry registry = MethodRegistry.registry_8_0;
ExchangeDeleteBody body = registry.createExchangeDeleteBody(0, new AMQShortString(_name), false, true);
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/test/java/org/apache/qpid/transport/MaxFrameSizeTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/test/java/org/apache/qpid/transport/MaxFrameSizeTest.java?rev=1628336&r1=1628335&r2=1628336&view=diff
==============================================================================
--- qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/test/java/org/apache/qpid/transport/MaxFrameSizeTest.java (original)
+++ qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/test/java/org/apache/qpid/transport/MaxFrameSizeTest.java Mon Sep 29 23:20:39 2014
@@ -54,7 +54,7 @@ import org.apache.qpid.framing.Connectio
import org.apache.qpid.framing.ConnectionStartOkBody;
import org.apache.qpid.framing.ConnectionTuneOkBody;
import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.framing.amqp_0_91.MethodRegistry_0_91;
+import org.apache.qpid.framing.MethodRegistry;
import org.apache.qpid.jms.BrokerDetails;
import org.apache.qpid.server.model.AuthenticationProvider;
import org.apache.qpid.server.model.Broker;
@@ -238,7 +238,7 @@ public class MaxFrameSizeTest extends Qp
byte[] serverData = baos.toByteArray();
ByteArrayDataInput badi = new ByteArrayDataInput(serverData);
AMQDataBlockDecoder datablockDecoder = new AMQDataBlockDecoder();
- final MethodRegistry_0_91 methodRegistry_0_91 = new MethodRegistry_0_91();
+ final MethodRegistry methodRegistry_0_91 = MethodRegistry.registry_0_91;
BodyFactory methodBodyFactory = new BodyFactory()
{
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org