Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueUnbindBodyImpl.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueUnbindBodyImpl.java?rev=1628074&r1=1628073&r2=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueUnbindBodyImpl.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueUnbindBodyImpl.java Sun Sep 28 15:22:03 2014 @@ -34,7 +34,7 @@ import java.io.IOException; import org.apache.qpid.framing.*; import org.apache.qpid.AMQException; -public class QueueUnbindBodyImpl extends AMQMethodBody_0_9 implements QueueUnbindBody +public class QueueUnbindBodyImpl extends AMQMethodBodyImpl implements QueueUnbindBody { private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() {
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueUnbindOkBodyImpl.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueUnbindOkBodyImpl.java?rev=1628074&r1=1628073&r2=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueUnbindOkBodyImpl.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueUnbindOkBodyImpl.java Sun Sep 28 15:22:03 2014 @@ -34,7 +34,7 @@ import java.io.IOException; import org.apache.qpid.framing.*; import org.apache.qpid.AMQException; -public class QueueUnbindOkBodyImpl extends AMQMethodBody_0_9 implements QueueUnbindOkBody +public class QueueUnbindOkBodyImpl extends AMQMethodBodyImpl implements QueueUnbindOkBody { private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() { Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ServerMethodDispatcher_0_9.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ServerMethodDispatcher_0_9.java?rev=1628074&r1=1628073&r2=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ServerMethodDispatcher_0_9.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ServerMethodDispatcher_0_9.java Sun Sep 28 15:22:03 2014 @@ -35,71 +35,7 @@ public interface ServerMethodDispatcher_ { public boolean dispatchAccessRequest(AccessRequestBody body, int channelId) throws AMQException; - public boolean dispatchBasicAck(BasicAckBody body, int channelId) throws AMQException; - public boolean dispatchBasicCancel(BasicCancelBody body, int channelId) throws AMQException; - public boolean dispatchBasicConsume(BasicConsumeBody body, int channelId) throws AMQException; - public boolean dispatchBasicGet(BasicGetBody body, int channelId) throws AMQException; - public boolean dispatchBasicPublish(BasicPublishBody body, int channelId) throws AMQException; - public boolean dispatchBasicQos(BasicQosBody body, int channelId) throws AMQException; - public boolean dispatchBasicRecover(BasicRecoverBody body, int channelId) throws AMQException; public boolean dispatchBasicRecoverSync(BasicRecoverSyncBody body, int channelId) throws AMQException; - public boolean dispatchBasicReject(BasicRejectBody body, int channelId) throws AMQException; - public boolean dispatchChannelClose(ChannelCloseBody body, int channelId) throws AMQException; - public boolean dispatchChannelCloseOk(ChannelCloseOkBody body, int channelId) throws AMQException; - public boolean dispatchChannelFlow(ChannelFlowBody body, int channelId) throws AMQException; - public boolean dispatchChannelFlowOk(ChannelFlowOkBody body, int channelId) throws AMQException; - public boolean dispatchChannelOk(ChannelOkBody body, int channelId) throws AMQException; - public boolean dispatchChannelOpen(ChannelOpenBody body, int channelId) throws AMQException; - public boolean dispatchChannelPing(ChannelPingBody body, int channelId) throws AMQException; - public boolean dispatchChannelPong(ChannelPongBody body, int channelId) throws AMQException; - public boolean dispatchChannelResume(ChannelResumeBody body, int channelId) throws AMQException; - public boolean dispatchConnectionClose(ConnectionCloseBody body, int channelId) throws AMQException; - public boolean dispatchConnectionCloseOk(ConnectionCloseOkBody body, int channelId) throws AMQException; - public boolean dispatchConnectionOpen(ConnectionOpenBody body, int channelId) throws AMQException; - public boolean dispatchConnectionSecureOk(ConnectionSecureOkBody body, int channelId) throws AMQException; - public boolean dispatchConnectionStartOk(ConnectionStartOkBody body, int channelId) throws AMQException; - public boolean dispatchConnectionTuneOk(ConnectionTuneOkBody body, int channelId) throws AMQException; - public boolean dispatchDtxSelect(DtxSelectBody body, int channelId) throws AMQException; - public boolean dispatchDtxStart(DtxStartBody body, int channelId) throws AMQException; - public boolean dispatchExchangeBound(ExchangeBoundBody body, int channelId) throws AMQException; - public boolean dispatchExchangeDeclare(ExchangeDeclareBody body, int channelId) throws AMQException; - public boolean dispatchExchangeDelete(ExchangeDeleteBody body, int channelId) throws AMQException; - public boolean dispatchFileAck(FileAckBody body, int channelId) throws AMQException; - public boolean dispatchFileCancel(FileCancelBody body, int channelId) throws AMQException; - public boolean dispatchFileConsume(FileConsumeBody body, int channelId) throws AMQException; - public boolean dispatchFileOpen(FileOpenBody body, int channelId) throws AMQException; - public boolean dispatchFileOpenOk(FileOpenOkBody body, int channelId) throws AMQException; - public boolean dispatchFilePublish(FilePublishBody body, int channelId) throws AMQException; - public boolean dispatchFileQos(FileQosBody body, int channelId) throws AMQException; - public boolean dispatchFileReject(FileRejectBody body, int channelId) throws AMQException; - public boolean dispatchFileStage(FileStageBody body, int channelId) throws AMQException; - public boolean dispatchMessageAppend(MessageAppendBody body, int channelId) throws AMQException; - public boolean dispatchMessageCancel(MessageCancelBody body, int channelId) throws AMQException; - public boolean dispatchMessageCheckpoint(MessageCheckpointBody body, int channelId) throws AMQException; - public boolean dispatchMessageClose(MessageCloseBody body, int channelId) throws AMQException; - public boolean dispatchMessageConsume(MessageConsumeBody body, int channelId) throws AMQException; - public boolean dispatchMessageEmpty(MessageEmptyBody body, int channelId) throws AMQException; - public boolean dispatchMessageGet(MessageGetBody body, int channelId) throws AMQException; - public boolean dispatchMessageOffset(MessageOffsetBody body, int channelId) throws AMQException; - public boolean dispatchMessageOk(MessageOkBody body, int channelId) throws AMQException; - public boolean dispatchMessageOpen(MessageOpenBody body, int channelId) throws AMQException; - public boolean dispatchMessageQos(MessageQosBody body, int channelId) throws AMQException; - public boolean dispatchMessageRecover(MessageRecoverBody body, int channelId) throws AMQException; - public boolean dispatchMessageReject(MessageRejectBody body, int channelId) throws AMQException; - public boolean dispatchMessageResume(MessageResumeBody body, int channelId) throws AMQException; - public boolean dispatchMessageTransfer(MessageTransferBody body, int channelId) throws AMQException; - public boolean dispatchQueueBind(QueueBindBody body, int channelId) throws AMQException; - public boolean dispatchQueueDeclare(QueueDeclareBody body, int channelId) throws AMQException; - public boolean dispatchQueueDelete(QueueDeleteBody body, int channelId) throws AMQException; - public boolean dispatchQueuePurge(QueuePurgeBody body, int channelId) throws AMQException; public boolean dispatchQueueUnbind(QueueUnbindBody body, int channelId) throws AMQException; - public boolean dispatchStreamCancel(StreamCancelBody body, int channelId) throws AMQException; - public boolean dispatchStreamConsume(StreamConsumeBody body, int channelId) throws AMQException; - public boolean dispatchStreamPublish(StreamPublishBody body, int channelId) throws AMQException; - public boolean dispatchStreamQos(StreamQosBody body, int channelId) throws AMQException; - public boolean dispatchTunnelRequest(TunnelRequestBody body, int channelId) throws AMQException; - public boolean dispatchTxCommit(TxCommitBody body, int channelId) throws AMQException; - public boolean dispatchTxRollback(TxRollbackBody body, int channelId) throws AMQException; - public boolean dispatchTxSelect(TxSelectBody body, int channelId) throws AMQException; -} \ No newline at end of file +} Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicRecoverSyncBodyImpl.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicRecoverSyncBodyImpl.java?rev=1628074&r1=1628073&r2=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicRecoverSyncBodyImpl.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicRecoverSyncBodyImpl.java Sun Sep 28 15:22:03 2014 @@ -34,7 +34,7 @@ import java.io.IOException; import org.apache.qpid.framing.*; import org.apache.qpid.AMQException; -public class BasicRecoverSyncBodyImpl extends AMQMethodBody_0_91 implements BasicRecoverSyncBody +public class BasicRecoverSyncBodyImpl extends AMQMethodBodyImpl implements BasicRecoverSyncBody { private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() { Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicRecoverSyncOkBodyImpl.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicRecoverSyncOkBodyImpl.java?rev=1628074&r1=1628073&r2=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicRecoverSyncOkBodyImpl.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicRecoverSyncOkBodyImpl.java Sun Sep 28 15:22:03 2014 @@ -34,7 +34,7 @@ import java.io.IOException; import org.apache.qpid.framing.*; import org.apache.qpid.AMQException; -public class BasicRecoverSyncOkBodyImpl extends AMQMethodBody_0_91 implements BasicRecoverSyncOkBody +public class BasicRecoverSyncOkBodyImpl extends AMQMethodBodyImpl implements BasicRecoverSyncOkBody { private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() { Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ChannelOpenOkBodyImpl.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ChannelOpenOkBodyImpl.java?rev=1628074&r1=1628073&r2=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ChannelOpenOkBodyImpl.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ChannelOpenOkBodyImpl.java Sun Sep 28 15:22:03 2014 @@ -34,7 +34,7 @@ import java.io.IOException; import org.apache.qpid.framing.*; import org.apache.qpid.AMQException; -public class ChannelOpenOkBodyImpl extends AMQMethodBody_0_91 implements ChannelOpenOkBody +public class ChannelOpenOkBodyImpl extends AMQMethodBodyImpl implements ChannelOpenOkBody { private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() { Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ClientMethodDispatcher_0_91.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ClientMethodDispatcher_0_91.java?rev=1628074&r1=1628073&r2=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ClientMethodDispatcher_0_91.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ClientMethodDispatcher_0_91.java Sun Sep 28 15:22:03 2014 @@ -33,35 +33,7 @@ import org.apache.qpid.framing.*; public interface ClientMethodDispatcher_0_91 extends ClientMethodDispatcher { - public boolean dispatchBasicCancelOk(BasicCancelOkBody body, int channelId) throws AMQException; - public boolean dispatchBasicConsumeOk(BasicConsumeOkBody body, int channelId) throws AMQException; - public boolean dispatchBasicDeliver(BasicDeliverBody body, int channelId) throws AMQException; - public boolean dispatchBasicGetEmpty(BasicGetEmptyBody body, int channelId) throws AMQException; - public boolean dispatchBasicGetOk(BasicGetOkBody body, int channelId) throws AMQException; - public boolean dispatchBasicQosOk(BasicQosOkBody body, int channelId) throws AMQException; public boolean dispatchBasicRecoverSyncOk(BasicRecoverSyncOkBody body, int channelId) throws AMQException; - public boolean dispatchBasicReturn(BasicReturnBody body, int channelId) throws AMQException; - public boolean dispatchChannelClose(ChannelCloseBody body, int channelId) throws AMQException; - public boolean dispatchChannelCloseOk(ChannelCloseOkBody body, int channelId) throws AMQException; - public boolean dispatchChannelFlow(ChannelFlowBody body, int channelId) throws AMQException; - public boolean dispatchChannelFlowOk(ChannelFlowOkBody body, int channelId) throws AMQException; - public boolean dispatchChannelOpenOk(ChannelOpenOkBody body, int channelId) throws AMQException; - public boolean dispatchConnectionClose(ConnectionCloseBody body, int channelId) throws AMQException; - public boolean dispatchConnectionCloseOk(ConnectionCloseOkBody body, int channelId) throws AMQException; - public boolean dispatchConnectionOpenOk(ConnectionOpenOkBody body, int channelId) throws AMQException; - public boolean dispatchConnectionSecure(ConnectionSecureBody body, int channelId) throws AMQException; - public boolean dispatchConnectionStart(ConnectionStartBody body, int channelId) throws AMQException; - public boolean dispatchConnectionTune(ConnectionTuneBody body, int channelId) throws AMQException; - public boolean dispatchExchangeBoundOk(ExchangeBoundOkBody body, int channelId) throws AMQException; - public boolean dispatchExchangeDeclareOk(ExchangeDeclareOkBody body, int channelId) throws AMQException; - public boolean dispatchExchangeDeleteOk(ExchangeDeleteOkBody body, int channelId) throws AMQException; - public boolean dispatchQueueBindOk(QueueBindOkBody body, int channelId) throws AMQException; - public boolean dispatchQueueDeclareOk(QueueDeclareOkBody body, int channelId) throws AMQException; - public boolean dispatchQueueDeleteOk(QueueDeleteOkBody body, int channelId) throws AMQException; - public boolean dispatchQueuePurgeOk(QueuePurgeOkBody body, int channelId) throws AMQException; public boolean dispatchQueueUnbindOk(QueueUnbindOkBody body, int channelId) throws AMQException; - public boolean dispatchTxCommitOk(TxCommitOkBody body, int channelId) throws AMQException; - public boolean dispatchTxRollbackOk(TxRollbackOkBody body, int channelId) throws AMQException; - public boolean dispatchTxSelectOk(TxSelectOkBody body, int channelId) throws AMQException; -} \ No newline at end of file +} Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionCloseBodyImpl.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionCloseBodyImpl.java?rev=1628074&r1=1628073&r2=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionCloseBodyImpl.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionCloseBodyImpl.java Sun Sep 28 15:22:03 2014 @@ -34,7 +34,7 @@ import java.io.IOException; import org.apache.qpid.framing.*; import org.apache.qpid.AMQException; -public class ConnectionCloseBodyImpl extends AMQMethodBody_0_91 implements ConnectionCloseBody +public class ConnectionCloseBodyImpl extends AMQMethodBodyImpl implements ConnectionCloseBody { private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() { Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionCloseOkBodyImpl.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionCloseOkBodyImpl.java?rev=1628074&r1=1628073&r2=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionCloseOkBodyImpl.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionCloseOkBodyImpl.java Sun Sep 28 15:22:03 2014 @@ -34,7 +34,7 @@ import java.io.IOException; import org.apache.qpid.framing.*; import org.apache.qpid.AMQException; -public class ConnectionCloseOkBodyImpl extends AMQMethodBody_0_91 implements ConnectionCloseOkBody +public class ConnectionCloseOkBodyImpl extends AMQMethodBodyImpl implements ConnectionCloseOkBody { private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() { Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodConverter_0_91.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodConverter_0_91.java?rev=1628074&r1=1628073&r2=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodConverter_0_91.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodConverter_0_91.java Sun Sep 28 15:22:03 2014 @@ -24,6 +24,7 @@ package org.apache.qpid.framing.amqp_0_9 import org.apache.qpid.framing.AMQMethodBody; import org.apache.qpid.framing.AMQShortString; import org.apache.qpid.framing.BasicPublishBody; +import org.apache.qpid.framing.BasicPublishBodyImpl; import org.apache.qpid.framing.abstraction.AbstractMethodConverter; import org.apache.qpid.framing.abstraction.MessagePublishInfo; import org.apache.qpid.framing.abstraction.MessagePublishInfoImpl; @@ -63,4 +64,4 @@ public class MethodConverter_0_91 extend } -} \ No newline at end of file +} Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodRegistry_0_91.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodRegistry_0_91.java?rev=1628074&r1=1628073&r2=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodRegistry_0_91.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodRegistry_0_91.java Sun Sep 28 15:22:03 2014 @@ -27,17 +27,15 @@ package org.apache.qpid.framing.amqp_0_91; -import org.apache.qpid.framing.*; -import org.apache.qpid.protocol.AMQConstant; - +import java.io.IOException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; - -import org.apache.qpid.framing.abstraction.ProtocolVersionMethodConverter; import org.apache.qpid.codec.MarkableDataInput; +import org.apache.qpid.framing.*; +import org.apache.qpid.framing.abstraction.ProtocolVersionMethodConverter; +import org.apache.qpid.protocol.AMQConstant; public class MethodRegistry_0_91 extends MethodRegistry Modified: 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/amqp_0_91/QueueUnbindBodyImpl.java?rev=1628074&r1=1628073&r2=1628074&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/amqp_0_91/QueueUnbindBodyImpl.java Sun Sep 28 15:22:03 2014 @@ -34,7 +34,7 @@ import java.io.IOException; import org.apache.qpid.framing.*; import org.apache.qpid.AMQException; -public class QueueUnbindBodyImpl extends AMQMethodBody_0_91 implements QueueUnbindBody +public class QueueUnbindBodyImpl extends AMQMethodBodyImpl implements QueueUnbindBody { private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() { Modified: 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/amqp_0_91/QueueUnbindOkBodyImpl.java?rev=1628074&r1=1628073&r2=1628074&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/amqp_0_91/QueueUnbindOkBodyImpl.java Sun Sep 28 15:22:03 2014 @@ -34,7 +34,7 @@ import java.io.IOException; import org.apache.qpid.framing.*; import org.apache.qpid.AMQException; -public class QueueUnbindOkBodyImpl extends AMQMethodBody_0_91 implements QueueUnbindOkBody +public class QueueUnbindOkBodyImpl extends AMQMethodBodyImpl implements QueueUnbindOkBody { private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() { Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ServerMethodDispatcher_0_91.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ServerMethodDispatcher_0_91.java?rev=1628074&r1=1628073&r2=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ServerMethodDispatcher_0_91.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ServerMethodDispatcher_0_91.java Sun Sep 28 15:22:03 2014 @@ -34,36 +34,7 @@ import org.apache.qpid.framing.*; public interface ServerMethodDispatcher_0_91 extends ServerMethodDispatcher { - public boolean dispatchBasicAck(BasicAckBody body, int channelId) throws AMQException; - public boolean dispatchBasicCancel(BasicCancelBody body, int channelId) throws AMQException; - public boolean dispatchBasicConsume(BasicConsumeBody body, int channelId) throws AMQException; - public boolean dispatchBasicGet(BasicGetBody body, int channelId) throws AMQException; - public boolean dispatchBasicPublish(BasicPublishBody body, int channelId) throws AMQException; - public boolean dispatchBasicQos(BasicQosBody body, int channelId) throws AMQException; - public boolean dispatchBasicRecover(BasicRecoverBody body, int channelId) throws AMQException; public boolean dispatchBasicRecoverSync(BasicRecoverSyncBody body, int channelId) throws AMQException; - public boolean dispatchBasicReject(BasicRejectBody body, int channelId) throws AMQException; - public boolean dispatchChannelClose(ChannelCloseBody body, int channelId) throws AMQException; - public boolean dispatchChannelCloseOk(ChannelCloseOkBody body, int channelId) throws AMQException; - public boolean dispatchChannelFlow(ChannelFlowBody body, int channelId) throws AMQException; - public boolean dispatchChannelFlowOk(ChannelFlowOkBody body, int channelId) throws AMQException; - public boolean dispatchChannelOpen(ChannelOpenBody body, int channelId) throws AMQException; - public boolean dispatchConnectionClose(ConnectionCloseBody body, int channelId) throws AMQException; - public boolean dispatchConnectionCloseOk(ConnectionCloseOkBody body, int channelId) throws AMQException; - public boolean dispatchConnectionOpen(ConnectionOpenBody body, int channelId) throws AMQException; - public boolean dispatchConnectionSecureOk(ConnectionSecureOkBody body, int channelId) throws AMQException; - public boolean dispatchConnectionStartOk(ConnectionStartOkBody body, int channelId) throws AMQException; - public boolean dispatchConnectionTuneOk(ConnectionTuneOkBody body, int channelId) throws AMQException; - public boolean dispatchExchangeBound(ExchangeBoundBody body, int channelId) throws AMQException; - public boolean dispatchExchangeDeclare(ExchangeDeclareBody body, int channelId) throws AMQException; - public boolean dispatchExchangeDelete(ExchangeDeleteBody body, int channelId) throws AMQException; - public boolean dispatchQueueBind(QueueBindBody body, int channelId) throws AMQException; - public boolean dispatchQueueDeclare(QueueDeclareBody body, int channelId) throws AMQException; - public boolean dispatchQueueDelete(QueueDeleteBody body, int channelId) throws AMQException; - public boolean dispatchQueuePurge(QueuePurgeBody body, int channelId) throws AMQException; public boolean dispatchQueueUnbind(QueueUnbindBody body, int channelId) throws AMQException; - public boolean dispatchTxCommit(TxCommitBody body, int channelId) throws AMQException; - public boolean dispatchTxRollback(TxRollbackBody body, int channelId) throws AMQException; - public boolean dispatchTxSelect(TxSelectBody body, int channelId) throws AMQException; -} \ No newline at end of file +} Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/AccessRequestBodyImpl.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/AccessRequestBodyImpl.java?rev=1628074&r1=1628073&r2=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/AccessRequestBodyImpl.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/AccessRequestBodyImpl.java Sun Sep 28 15:22:03 2014 @@ -27,14 +27,20 @@ package org.apache.qpid.framing.amqp_8_0; -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; +import org.apache.qpid.framing.AMQFrameDecodingException; +import org.apache.qpid.framing.AMQMethodBody; +import org.apache.qpid.framing.AMQMethodBodyImpl; +import org.apache.qpid.framing.AMQMethodBodyInstanceFactory; +import org.apache.qpid.framing.AMQShortString; +import org.apache.qpid.framing.AccessRequestBody; +import org.apache.qpid.framing.MethodDispatcher; -public class AccessRequestBodyImpl extends AMQMethodBody_8_0 implements AccessRequestBody +public class AccessRequestBodyImpl extends AMQMethodBodyImpl implements AccessRequestBody { private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() { Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/AccessRequestOkBodyImpl.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/AccessRequestOkBodyImpl.java?rev=1628074&r1=1628073&r2=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/AccessRequestOkBodyImpl.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/AccessRequestOkBodyImpl.java Sun Sep 28 15:22:03 2014 @@ -34,7 +34,7 @@ import java.io.IOException; import org.apache.qpid.framing.*; import org.apache.qpid.AMQException; -public class AccessRequestOkBodyImpl extends AMQMethodBody_8_0 implements AccessRequestOkBody +public class AccessRequestOkBodyImpl extends AMQMethodBodyImpl implements AccessRequestOkBody { private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() { Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicRecoverOkBodyImpl.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicRecoverOkBodyImpl.java?rev=1628074&r1=1628073&r2=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicRecoverOkBodyImpl.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicRecoverOkBodyImpl.java Sun Sep 28 15:22:03 2014 @@ -27,14 +27,19 @@ package org.apache.qpid.framing.amqp_8_0; -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; +import org.apache.qpid.framing.AMQFrameDecodingException; +import org.apache.qpid.framing.AMQMethodBody; +import org.apache.qpid.framing.AMQMethodBodyImpl; +import org.apache.qpid.framing.AMQMethodBodyInstanceFactory; +import org.apache.qpid.framing.BasicRecoverOkBody; +import org.apache.qpid.framing.MethodDispatcher; -public class BasicRecoverOkBodyImpl extends AMQMethodBody_8_0 implements BasicRecoverOkBody +public class BasicRecoverOkBodyImpl extends AMQMethodBodyImpl implements BasicRecoverOkBody { private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() { Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelAlertBodyImpl.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelAlertBodyImpl.java?rev=1628074&r1=1628073&r2=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelAlertBodyImpl.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelAlertBodyImpl.java Sun Sep 28 15:22:03 2014 @@ -34,7 +34,7 @@ import java.io.IOException; import org.apache.qpid.framing.*; import org.apache.qpid.AMQException; -public class ChannelAlertBodyImpl extends AMQMethodBody_8_0 implements ChannelAlertBody +public class ChannelAlertBodyImpl extends AMQMethodBodyImpl implements ChannelAlertBody { private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() { Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelOpenOkBodyImpl.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelOpenOkBodyImpl.java?rev=1628074&r1=1628073&r2=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelOpenOkBodyImpl.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelOpenOkBodyImpl.java Sun Sep 28 15:22:03 2014 @@ -34,7 +34,7 @@ import java.io.IOException; import org.apache.qpid.framing.*; import org.apache.qpid.AMQException; -public class ChannelOpenOkBodyImpl extends AMQMethodBody_8_0 implements ChannelOpenOkBody +public class ChannelOpenOkBodyImpl extends AMQMethodBodyImpl implements ChannelOpenOkBody { private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() { 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=1628074&r1=1628073&r2=1628074&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 Sun Sep 28 15:22:03 2014 @@ -34,59 +34,8 @@ public interface ClientMethodDispatcher_ { public boolean dispatchAccessRequestOk(AccessRequestOkBody body, int channelId) throws AMQException; - public boolean dispatchBasicCancelOk(BasicCancelOkBody body, int channelId) throws AMQException; - public boolean dispatchBasicConsumeOk(BasicConsumeOkBody body, int channelId) throws AMQException; - public boolean dispatchBasicDeliver(BasicDeliverBody body, int channelId) throws AMQException; - public boolean dispatchBasicGetEmpty(BasicGetEmptyBody body, int channelId) throws AMQException; - public boolean dispatchBasicGetOk(BasicGetOkBody body, int channelId) throws AMQException; - public boolean dispatchBasicQosOk(BasicQosOkBody body, int channelId) throws AMQException; public boolean dispatchBasicRecoverOk(BasicRecoverOkBody body, int channelId) throws AMQException; - public boolean dispatchBasicReturn(BasicReturnBody body, int channelId) throws AMQException; public boolean dispatchChannelAlert(ChannelAlertBody body, int channelId) throws AMQException; - public boolean dispatchChannelClose(ChannelCloseBody body, int channelId) throws AMQException; - public boolean dispatchChannelCloseOk(ChannelCloseOkBody body, int channelId) throws AMQException; - public boolean dispatchChannelFlow(ChannelFlowBody body, int channelId) throws AMQException; - public boolean dispatchChannelFlowOk(ChannelFlowOkBody body, int channelId) throws AMQException; - public boolean dispatchChannelOpenOk(ChannelOpenOkBody body, int channelId) throws AMQException; - public boolean dispatchConnectionClose(ConnectionCloseBody body, int channelId) throws AMQException; - public boolean dispatchConnectionCloseOk(ConnectionCloseOkBody body, int channelId) throws AMQException; - public boolean dispatchConnectionOpenOk(ConnectionOpenOkBody body, int channelId) throws AMQException; public boolean dispatchConnectionRedirect(ConnectionRedirectBody body, int channelId) throws AMQException; - public boolean dispatchConnectionSecure(ConnectionSecureBody body, int channelId) throws AMQException; - public boolean dispatchConnectionStart(ConnectionStartBody body, int channelId) throws AMQException; - public boolean dispatchConnectionTune(ConnectionTuneBody body, int channelId) throws AMQException; - public boolean dispatchDtxSelectOk(DtxSelectOkBody body, int channelId) throws AMQException; - public boolean dispatchDtxStartOk(DtxStartOkBody body, int channelId) throws AMQException; - public boolean dispatchExchangeBoundOk(ExchangeBoundOkBody body, int channelId) throws AMQException; - public boolean dispatchExchangeDeclareOk(ExchangeDeclareOkBody body, int channelId) throws AMQException; - public boolean dispatchExchangeDeleteOk(ExchangeDeleteOkBody body, int channelId) throws AMQException; - public boolean dispatchFileCancelOk(FileCancelOkBody body, int channelId) throws AMQException; - public boolean dispatchFileConsumeOk(FileConsumeOkBody body, int channelId) throws AMQException; - public boolean dispatchFileDeliver(FileDeliverBody body, int channelId) throws AMQException; - public boolean dispatchFileOpen(FileOpenBody body, int channelId) throws AMQException; - public boolean dispatchFileOpenOk(FileOpenOkBody body, int channelId) throws AMQException; - public boolean dispatchFileQosOk(FileQosOkBody body, int channelId) throws AMQException; - public boolean dispatchFileReturn(FileReturnBody body, int channelId) throws AMQException; - public boolean dispatchFileStage(FileStageBody body, int channelId) throws AMQException; - public boolean dispatchQueueBindOk(QueueBindOkBody body, int channelId) throws AMQException; - public boolean dispatchQueueDeclareOk(QueueDeclareOkBody body, int channelId) throws AMQException; - public boolean dispatchQueueDeleteOk(QueueDeleteOkBody body, int channelId) throws AMQException; - public boolean dispatchQueuePurgeOk(QueuePurgeOkBody body, int channelId) throws AMQException; - public boolean dispatchStreamCancelOk(StreamCancelOkBody body, int channelId) throws AMQException; - public boolean dispatchStreamConsumeOk(StreamConsumeOkBody body, int channelId) throws AMQException; - public boolean dispatchStreamDeliver(StreamDeliverBody body, int channelId) throws AMQException; - public boolean dispatchStreamQosOk(StreamQosOkBody body, int channelId) throws AMQException; - public boolean dispatchStreamReturn(StreamReturnBody body, int channelId) throws AMQException; - public boolean dispatchTestContent(TestContentBody body, int channelId) throws AMQException; - public boolean dispatchTestContentOk(TestContentOkBody body, int channelId) throws AMQException; - public boolean dispatchTestInteger(TestIntegerBody body, int channelId) throws AMQException; - public boolean dispatchTestIntegerOk(TestIntegerOkBody body, int channelId) throws AMQException; - public boolean dispatchTestString(TestStringBody body, int channelId) throws AMQException; - public boolean dispatchTestStringOk(TestStringOkBody body, int channelId) throws AMQException; - public boolean dispatchTestTable(TestTableBody body, int channelId) throws AMQException; - public boolean dispatchTestTableOk(TestTableOkBody body, int channelId) throws AMQException; - public boolean dispatchTxCommitOk(TxCommitOkBody body, int channelId) throws AMQException; - public boolean dispatchTxRollbackOk(TxRollbackOkBody body, int channelId) throws AMQException; - public boolean dispatchTxSelectOk(TxSelectOkBody body, int channelId) throws AMQException; -} \ No newline at end of file +} Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionCloseBodyImpl.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionCloseBodyImpl.java?rev=1628074&r1=1628073&r2=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionCloseBodyImpl.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionCloseBodyImpl.java Sun Sep 28 15:22:03 2014 @@ -34,7 +34,7 @@ import java.io.IOException; import org.apache.qpid.framing.*; import org.apache.qpid.AMQException; -public class ConnectionCloseBodyImpl extends AMQMethodBody_8_0 implements ConnectionCloseBody +public class ConnectionCloseBodyImpl extends AMQMethodBodyImpl implements ConnectionCloseBody { private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() { Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionCloseOkBodyImpl.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionCloseOkBodyImpl.java?rev=1628074&r1=1628073&r2=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionCloseOkBodyImpl.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionCloseOkBodyImpl.java Sun Sep 28 15:22:03 2014 @@ -34,7 +34,7 @@ import java.io.IOException; import org.apache.qpid.framing.*; import org.apache.qpid.AMQException; -public class ConnectionCloseOkBodyImpl extends AMQMethodBody_8_0 implements ConnectionCloseOkBody +public class ConnectionCloseOkBodyImpl extends AMQMethodBodyImpl implements ConnectionCloseOkBody { private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() { Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionRedirectBodyImpl.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionRedirectBodyImpl.java?rev=1628074&r1=1628073&r2=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionRedirectBodyImpl.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionRedirectBodyImpl.java Sun Sep 28 15:22:03 2014 @@ -34,7 +34,7 @@ import java.io.IOException; import org.apache.qpid.framing.*; import org.apache.qpid.AMQException; -public class ConnectionRedirectBodyImpl extends AMQMethodBody_8_0 implements ConnectionRedirectBody +public class ConnectionRedirectBodyImpl extends AMQMethodBodyImpl implements ConnectionRedirectBody { private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() { Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodConverter_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/MethodConverter_8_0.java?rev=1628074&r1=1628073&r2=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodConverter_8_0.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodConverter_8_0.java Sun Sep 28 15:22:03 2014 @@ -24,6 +24,7 @@ package org.apache.qpid.framing.amqp_8_0 import org.apache.qpid.framing.AMQMethodBody; import org.apache.qpid.framing.AMQShortString; import org.apache.qpid.framing.BasicPublishBody; +import org.apache.qpid.framing.BasicPublishBodyImpl; import org.apache.qpid.framing.abstraction.AbstractMethodConverter; import org.apache.qpid.framing.abstraction.MessagePublishInfo; import org.apache.qpid.framing.abstraction.MessagePublishInfoImpl; Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodRegistry_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/MethodRegistry_8_0.java?rev=1628074&r1=1628073&r2=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodRegistry_8_0.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodRegistry_8_0.java Sun Sep 28 15:22:03 2014 @@ -27,17 +27,15 @@ package org.apache.qpid.framing.amqp_8_0; -import org.apache.qpid.framing.*; -import org.apache.qpid.protocol.AMQConstant; - +import java.io.IOException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; - -import org.apache.qpid.framing.abstraction.ProtocolVersionMethodConverter; import org.apache.qpid.codec.MarkableDataInput; +import org.apache.qpid.framing.*; +import org.apache.qpid.framing.abstraction.ProtocolVersionMethodConverter; +import org.apache.qpid.protocol.AMQConstant; public class MethodRegistry_8_0 extends MethodRegistry @@ -47,7 +45,7 @@ public class MethodRegistry_8_0 extends private ProtocolVersionMethodConverter _protocolVersionConverter = new MethodConverter_8_0(); - private final AMQMethodBodyInstanceFactory[][] _factories = new AMQMethodBodyInstanceFactory[121][]; + private final AMQMethodBodyInstanceFactory[][] _factories = new AMQMethodBodyInstanceFactory[91][]; public MethodRegistry_8_0() { @@ -152,43 +150,6 @@ public class MethodRegistry_8_0 extends - // Register method body instance factories for the File class. - - _factories[70] = new AMQMethodBodyInstanceFactory[101]; - - _factories[70][10] = FileQosBodyImpl.getFactory(); - _factories[70][11] = FileQosOkBodyImpl.getFactory(); - _factories[70][20] = FileConsumeBodyImpl.getFactory(); - _factories[70][21] = FileConsumeOkBodyImpl.getFactory(); - _factories[70][30] = FileCancelBodyImpl.getFactory(); - _factories[70][31] = FileCancelOkBodyImpl.getFactory(); - _factories[70][40] = FileOpenBodyImpl.getFactory(); - _factories[70][41] = FileOpenOkBodyImpl.getFactory(); - _factories[70][50] = FileStageBodyImpl.getFactory(); - _factories[70][60] = FilePublishBodyImpl.getFactory(); - _factories[70][70] = FileReturnBodyImpl.getFactory(); - _factories[70][80] = FileDeliverBodyImpl.getFactory(); - _factories[70][90] = FileAckBodyImpl.getFactory(); - _factories[70][100] = FileRejectBodyImpl.getFactory(); - - - - // Register method body instance factories for the Stream class. - - _factories[80] = new AMQMethodBodyInstanceFactory[61]; - - _factories[80][10] = StreamQosBodyImpl.getFactory(); - _factories[80][11] = StreamQosOkBodyImpl.getFactory(); - _factories[80][20] = StreamConsumeBodyImpl.getFactory(); - _factories[80][21] = StreamConsumeOkBodyImpl.getFactory(); - _factories[80][30] = StreamCancelBodyImpl.getFactory(); - _factories[80][31] = StreamCancelOkBodyImpl.getFactory(); - _factories[80][40] = StreamPublishBodyImpl.getFactory(); - _factories[80][50] = StreamReturnBodyImpl.getFactory(); - _factories[80][60] = StreamDeliverBodyImpl.getFactory(); - - - // Register method body instance factories for the Tx class. _factories[90] = new AMQMethodBodyInstanceFactory[32]; @@ -200,39 +161,6 @@ public class MethodRegistry_8_0 extends _factories[90][30] = TxRollbackBodyImpl.getFactory(); _factories[90][31] = TxRollbackOkBodyImpl.getFactory(); - - - // Register method body instance factories for the Dtx class. - - _factories[100] = new AMQMethodBodyInstanceFactory[22]; - - _factories[100][10] = DtxSelectBodyImpl.getFactory(); - _factories[100][11] = DtxSelectOkBodyImpl.getFactory(); - _factories[100][20] = DtxStartBodyImpl.getFactory(); - _factories[100][21] = DtxStartOkBodyImpl.getFactory(); - - - - // Register method body instance factories for the Tunnel class. - - _factories[110] = new AMQMethodBodyInstanceFactory[11]; - - _factories[110][10] = TunnelRequestBodyImpl.getFactory(); - - - - // Register method body instance factories for the Test class. - - _factories[120] = new AMQMethodBodyInstanceFactory[42]; - - _factories[120][10] = TestIntegerBodyImpl.getFactory(); - _factories[120][11] = TestIntegerOkBodyImpl.getFactory(); - _factories[120][20] = TestStringBodyImpl.getFactory(); - _factories[120][21] = TestStringOkBodyImpl.getFactory(); - _factories[120][30] = TestTableBodyImpl.getFactory(); - _factories[120][31] = TestTableOkBodyImpl.getFactory(); - _factories[120][40] = TestContentBodyImpl.getFactory(); - _factories[120][41] = TestContentOkBodyImpl.getFactory(); } public AMQMethodBody convertToBody(MarkableDataInput in, long size) @@ -922,303 +850,6 @@ public class MethodRegistry_8_0 extends } - - - public FileQosBody createFileQosBody( - final long prefetchSize, - final int prefetchCount, - final boolean global - ) - { - return new FileQosBodyImpl( - prefetchSize, - prefetchCount, - global - ); - } - - public FileQosOkBody createFileQosOkBody( - ) - { - return new FileQosOkBodyImpl( - ); - } - - public FileConsumeBody createFileConsumeBody( - final int ticket, - final AMQShortString queue, - final AMQShortString consumerTag, - final boolean noLocal, - final boolean noAck, - final boolean exclusive, - final boolean nowait - ) - { - return new FileConsumeBodyImpl( - ticket, - queue, - consumerTag, - noLocal, - noAck, - exclusive, - nowait - ); - } - - public FileConsumeOkBody createFileConsumeOkBody( - final AMQShortString consumerTag - ) - { - return new FileConsumeOkBodyImpl( - consumerTag - ); - } - - public FileCancelBody createFileCancelBody( - final AMQShortString consumerTag, - final boolean nowait - ) - { - return new FileCancelBodyImpl( - consumerTag, - nowait - ); - } - - public FileCancelOkBody createFileCancelOkBody( - final AMQShortString consumerTag - ) - { - return new FileCancelOkBodyImpl( - consumerTag - ); - } - - public FileOpenBody createFileOpenBody( - final AMQShortString identifier, - final long contentSize - ) - { - return new FileOpenBodyImpl( - identifier, - contentSize - ); - } - - public FileOpenOkBody createFileOpenOkBody( - final long stagedSize - ) - { - return new FileOpenOkBodyImpl( - stagedSize - ); - } - - public FileStageBody createFileStageBody( - ) - { - return new FileStageBodyImpl( - ); - } - - public FilePublishBody createFilePublishBody( - final int ticket, - final AMQShortString exchange, - final AMQShortString routingKey, - final boolean mandatory, - final boolean immediate, - final AMQShortString identifier - ) - { - return new FilePublishBodyImpl( - ticket, - exchange, - routingKey, - mandatory, - immediate, - identifier - ); - } - - public FileReturnBody createFileReturnBody( - final int replyCode, - final AMQShortString replyText, - final AMQShortString exchange, - final AMQShortString routingKey - ) - { - return new FileReturnBodyImpl( - replyCode, - replyText, - exchange, - routingKey - ); - } - - public FileDeliverBody createFileDeliverBody( - final AMQShortString consumerTag, - final long deliveryTag, - final boolean redelivered, - final AMQShortString exchange, - final AMQShortString routingKey, - final AMQShortString identifier - ) - { - return new FileDeliverBodyImpl( - consumerTag, - deliveryTag, - redelivered, - exchange, - routingKey, - identifier - ); - } - - public FileAckBody createFileAckBody( - final long deliveryTag, - final boolean multiple - ) - { - return new FileAckBodyImpl( - deliveryTag, - multiple - ); - } - - public FileRejectBody createFileRejectBody( - final long deliveryTag, - final boolean requeue - ) - { - return new FileRejectBodyImpl( - deliveryTag, - requeue - ); - } - - - - - public StreamQosBody createStreamQosBody( - final long prefetchSize, - final int prefetchCount, - final long consumeRate, - final boolean global - ) - { - return new StreamQosBodyImpl( - prefetchSize, - prefetchCount, - consumeRate, - global - ); - } - - public StreamQosOkBody createStreamQosOkBody( - ) - { - return new StreamQosOkBodyImpl( - ); - } - - public StreamConsumeBody createStreamConsumeBody( - final int ticket, - final AMQShortString queue, - final AMQShortString consumerTag, - final boolean noLocal, - final boolean exclusive, - final boolean nowait - ) - { - return new StreamConsumeBodyImpl( - ticket, - queue, - consumerTag, - noLocal, - exclusive, - nowait - ); - } - - public StreamConsumeOkBody createStreamConsumeOkBody( - final AMQShortString consumerTag - ) - { - return new StreamConsumeOkBodyImpl( - consumerTag - ); - } - - public StreamCancelBody createStreamCancelBody( - final AMQShortString consumerTag, - final boolean nowait - ) - { - return new StreamCancelBodyImpl( - consumerTag, - nowait - ); - } - - public StreamCancelOkBody createStreamCancelOkBody( - final AMQShortString consumerTag - ) - { - return new StreamCancelOkBodyImpl( - consumerTag - ); - } - - public StreamPublishBody createStreamPublishBody( - final int ticket, - final AMQShortString exchange, - final AMQShortString routingKey, - final boolean mandatory, - final boolean immediate - ) - { - return new StreamPublishBodyImpl( - ticket, - exchange, - routingKey, - mandatory, - immediate - ); - } - - public StreamReturnBody createStreamReturnBody( - final int replyCode, - final AMQShortString replyText, - final AMQShortString exchange, - final AMQShortString routingKey - ) - { - return new StreamReturnBodyImpl( - replyCode, - replyText, - exchange, - routingKey - ); - } - - public StreamDeliverBody createStreamDeliverBody( - final AMQShortString consumerTag, - final long deliveryTag, - final AMQShortString exchange, - final AMQShortString queue - ) - { - return new StreamDeliverBodyImpl( - consumerTag, - deliveryTag, - exchange, - queue - ); - } - - - - public TxSelectBody createTxSelectBody( ) { @@ -1264,140 +895,6 @@ public class MethodRegistry_8_0 extends - public DtxSelectBody createDtxSelectBody( - ) - { - return new DtxSelectBodyImpl( - ); - } - - public DtxSelectOkBody createDtxSelectOkBody( - ) - { - return new DtxSelectOkBodyImpl( - ); - } - - public DtxStartBody createDtxStartBody( - final AMQShortString dtxIdentifier - ) - { - return new DtxStartBodyImpl( - dtxIdentifier - ); - } - - public DtxStartOkBody createDtxStartOkBody( - ) - { - return new DtxStartOkBodyImpl( - ); - } - - - - - public TunnelRequestBody createTunnelRequestBody( - final FieldTable metaData - ) - { - return new TunnelRequestBodyImpl( - metaData - ); - } - - - - - public TestIntegerBody createTestIntegerBody( - final short integer1, - final int integer2, - final long integer3, - final long integer4, - final short operation - ) - { - return new TestIntegerBodyImpl( - integer1, - integer2, - integer3, - integer4, - operation - ); - } - - public TestIntegerOkBody createTestIntegerOkBody( - final long result - ) - { - return new TestIntegerOkBodyImpl( - result - ); - } - - public TestStringBody createTestStringBody( - final AMQShortString string1, - final byte[] string2, - final short operation - ) - { - return new TestStringBodyImpl( - string1, - string2, - operation - ); - } - - public TestStringOkBody createTestStringOkBody( - final byte[] result - ) - { - return new TestStringOkBodyImpl( - result - ); - } - - public TestTableBody createTestTableBody( - final FieldTable table, - final short integerOp, - final short stringOp - ) - { - return new TestTableBodyImpl( - table, - integerOp, - stringOp - ); - } - - public TestTableOkBody createTestTableOkBody( - final long integerResult, - final byte[] stringResult - ) - { - return new TestTableOkBodyImpl( - integerResult, - stringResult - ); - } - - public TestContentBody createTestContentBody( - ) - { - return new TestContentBodyImpl( - ); - } - - public TestContentOkBody createTestContentOkBody( - final long contentChecksum - ) - { - return new TestContentOkBodyImpl( - contentChecksum - ); - } - - public ProtocolVersionMethodConverter getProtocolVersionMethodConverter() { Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ServerMethodDispatcher_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/ServerMethodDispatcher_8_0.java?rev=1628074&r1=1628073&r2=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ServerMethodDispatcher_8_0.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ServerMethodDispatcher_8_0.java Sun Sep 28 15:22:03 2014 @@ -35,58 +35,5 @@ public interface ServerMethodDispatcher_ { public boolean dispatchAccessRequest(AccessRequestBody body, int channelId) throws AMQException; - public boolean dispatchBasicAck(BasicAckBody body, int channelId) throws AMQException; - public boolean dispatchBasicCancel(BasicCancelBody body, int channelId) throws AMQException; - public boolean dispatchBasicConsume(BasicConsumeBody body, int channelId) throws AMQException; - public boolean dispatchBasicGet(BasicGetBody body, int channelId) throws AMQException; - public boolean dispatchBasicPublish(BasicPublishBody body, int channelId) throws AMQException; - public boolean dispatchBasicQos(BasicQosBody body, int channelId) throws AMQException; - public boolean dispatchBasicRecover(BasicRecoverBody body, int channelId) throws AMQException; - public boolean dispatchBasicReject(BasicRejectBody body, int channelId) throws AMQException; - public boolean dispatchChannelClose(ChannelCloseBody body, int channelId) throws AMQException; - public boolean dispatchChannelCloseOk(ChannelCloseOkBody body, int channelId) throws AMQException; - public boolean dispatchChannelFlow(ChannelFlowBody body, int channelId) throws AMQException; - public boolean dispatchChannelFlowOk(ChannelFlowOkBody body, int channelId) throws AMQException; - public boolean dispatchChannelOpen(ChannelOpenBody body, int channelId) throws AMQException; - public boolean dispatchConnectionClose(ConnectionCloseBody body, int channelId) throws AMQException; - public boolean dispatchConnectionCloseOk(ConnectionCloseOkBody body, int channelId) throws AMQException; - public boolean dispatchConnectionOpen(ConnectionOpenBody body, int channelId) throws AMQException; - public boolean dispatchConnectionSecureOk(ConnectionSecureOkBody body, int channelId) throws AMQException; - public boolean dispatchConnectionStartOk(ConnectionStartOkBody body, int channelId) throws AMQException; - public boolean dispatchConnectionTuneOk(ConnectionTuneOkBody body, int channelId) throws AMQException; - public boolean dispatchDtxSelect(DtxSelectBody body, int channelId) throws AMQException; - public boolean dispatchDtxStart(DtxStartBody body, int channelId) throws AMQException; - public boolean dispatchExchangeBound(ExchangeBoundBody body, int channelId) throws AMQException; - public boolean dispatchExchangeDeclare(ExchangeDeclareBody body, int channelId) throws AMQException; - public boolean dispatchExchangeDelete(ExchangeDeleteBody body, int channelId) throws AMQException; - public boolean dispatchFileAck(FileAckBody body, int channelId) throws AMQException; - public boolean dispatchFileCancel(FileCancelBody body, int channelId) throws AMQException; - public boolean dispatchFileConsume(FileConsumeBody body, int channelId) throws AMQException; - public boolean dispatchFileOpen(FileOpenBody body, int channelId) throws AMQException; - public boolean dispatchFileOpenOk(FileOpenOkBody body, int channelId) throws AMQException; - public boolean dispatchFilePublish(FilePublishBody body, int channelId) throws AMQException; - public boolean dispatchFileQos(FileQosBody body, int channelId) throws AMQException; - public boolean dispatchFileReject(FileRejectBody body, int channelId) throws AMQException; - public boolean dispatchFileStage(FileStageBody body, int channelId) throws AMQException; - public boolean dispatchQueueBind(QueueBindBody body, int channelId) throws AMQException; - public boolean dispatchQueueDeclare(QueueDeclareBody body, int channelId) throws AMQException; - public boolean dispatchQueueDelete(QueueDeleteBody body, int channelId) throws AMQException; - public boolean dispatchQueuePurge(QueuePurgeBody body, int channelId) throws AMQException; - public boolean dispatchStreamCancel(StreamCancelBody body, int channelId) throws AMQException; - public boolean dispatchStreamConsume(StreamConsumeBody body, int channelId) throws AMQException; - public boolean dispatchStreamPublish(StreamPublishBody body, int channelId) throws AMQException; - public boolean dispatchStreamQos(StreamQosBody body, int channelId) throws AMQException; - public boolean dispatchTestContent(TestContentBody body, int channelId) throws AMQException; - public boolean dispatchTestContentOk(TestContentOkBody body, int channelId) throws AMQException; - public boolean dispatchTestInteger(TestIntegerBody body, int channelId) throws AMQException; - public boolean dispatchTestIntegerOk(TestIntegerOkBody body, int channelId) throws AMQException; - public boolean dispatchTestString(TestStringBody body, int channelId) throws AMQException; - public boolean dispatchTestStringOk(TestStringOkBody body, int channelId) throws AMQException; - public boolean dispatchTestTable(TestTableBody body, int channelId) throws AMQException; - public boolean dispatchTestTableOk(TestTableOkBody body, int channelId) throws AMQException; - public boolean dispatchTunnelRequest(TunnelRequestBody body, int channelId) throws AMQException; - public boolean dispatchTxCommit(TxCommitBody body, int channelId) throws AMQException; - public boolean dispatchTxRollback(TxRollbackBody body, int channelId) throws AMQException; - public boolean dispatchTxSelect(TxSelectBody body, int channelId) throws AMQException; -} \ No newline at end of file +} Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java?rev=1628074&r1=1628073&r2=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java Sun Sep 28 15:22:03 2014 @@ -42,7 +42,7 @@ import org.apache.qpid.framing.BasicCont import org.apache.qpid.framing.ContentHeaderBody; import org.apache.qpid.framing.FieldTable; import org.apache.qpid.framing.abstraction.MessagePublishInfo; -import org.apache.qpid.framing.amqp_8_0.BasicConsumeBodyImpl; +import org.apache.qpid.framing.BasicConsumeBodyImpl; import org.apache.qpid.server.configuration.updater.TaskExecutor; import org.apache.qpid.server.configuration.updater.TaskExecutorImpl; import org.apache.qpid.server.connection.SessionPrincipal; 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=1628074&r1=1628073&r2=1628074&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 Sun Sep 28 15:22:03 2014 @@ -54,8 +54,8 @@ 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.ConnectionStartOkBodyImpl; -import org.apache.qpid.framing.amqp_0_91.ConnectionTuneOkBodyImpl; +import org.apache.qpid.framing.ConnectionStartOkBodyImpl; +import org.apache.qpid.framing.ConnectionTuneOkBodyImpl; import org.apache.qpid.framing.amqp_0_91.MethodRegistry_0_91; import org.apache.qpid.jms.BrokerDetails; import org.apache.qpid.server.model.AuthenticationProvider; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
