Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_0_91.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_0_91.java?rev=1628074&r1=1628073&r2=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_0_91.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_0_91.java Sun Sep 28 15:22:03 2014 @@ -43,114 +43,14 @@ public class ClientMethodDispatcherImpl_ throw new AMQMethodNotImplementedException(body); } - public boolean dispatchChannelOk(ChannelOkBody body, int channelId) throws AMQException - { - return false; - } - - public boolean dispatchChannelPing(ChannelPingBody body, int channelId) throws AMQException - { - return false; - } - - public boolean dispatchChannelPong(ChannelPongBody body, int channelId) throws AMQException - { - return false; - } - - public boolean dispatchChannelResume(ChannelResumeBody body, int channelId) throws AMQException - { - throw new AMQMethodNotImplementedException(body); - } - - public boolean dispatchMessageAppend(MessageAppendBody body, int channelId) throws AMQException - { - return false; - } - - public boolean dispatchMessageCancel(MessageCancelBody body, int channelId) throws AMQException - { - throw new AMQMethodNotImplementedException(body); - } - - public boolean dispatchMessageCheckpoint(MessageCheckpointBody body, int channelId) throws AMQException - { - return false; - } - - public boolean dispatchMessageClose(MessageCloseBody body, int channelId) throws AMQException - { - return false; - } - - public boolean dispatchMessageConsume(MessageConsumeBody body, int channelId) throws AMQException - { - throw new AMQMethodNotImplementedException(body); - } - - public boolean dispatchMessageEmpty(MessageEmptyBody body, int channelId) throws AMQException - { - return false; - } - - public boolean dispatchMessageGet(MessageGetBody body, int channelId) throws AMQException - { - throw new AMQMethodNotImplementedException(body); - } - - public boolean dispatchMessageOffset(MessageOffsetBody body, int channelId) throws AMQException - { - return false; - } - - public boolean dispatchMessageOk(MessageOkBody body, int channelId) throws AMQException - { - return false; - } - - public boolean dispatchMessageOpen(MessageOpenBody body, int channelId) throws AMQException - { - return false; - } - - public boolean dispatchMessageQos(MessageQosBody body, int channelId) throws AMQException - { - throw new AMQMethodNotImplementedException(body); - } - - public boolean dispatchMessageRecover(MessageRecoverBody body, int channelId) throws AMQException - { - throw new AMQMethodNotImplementedException(body); - } - - public boolean dispatchMessageReject(MessageRejectBody body, int channelId) throws AMQException - { - return false; - } - - public boolean dispatchMessageResume(MessageResumeBody body, int channelId) throws AMQException - { - return false; - } - - public boolean dispatchMessageTransfer(MessageTransferBody body, int channelId) throws AMQException - { - return false; - } - public boolean dispatchQueueUnbind(QueueUnbindBody body, int channelId) throws AMQException { throw new AMQMethodNotImplementedException(body); } - public boolean dispatchBasicRecoverOk(BasicRecoverOkBody body, int channelId) throws AMQException - { - return false; - } - public boolean dispatchQueueUnbindOk(QueueUnbindOkBody body, int channelId) throws AMQException { return false; } -} \ No newline at end of file +}
Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_8_0.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_8_0.java?rev=1628074&r1=1628073&r2=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_8_0.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_8_0.java Sun Sep 28 15:22:03 2014 @@ -24,14 +24,6 @@ import org.apache.qpid.AMQException; import org.apache.qpid.client.protocol.AMQProtocolSession; import org.apache.qpid.framing.BasicRecoverOkBody; import org.apache.qpid.framing.ChannelAlertBody; -import org.apache.qpid.framing.TestContentBody; -import org.apache.qpid.framing.TestContentOkBody; -import org.apache.qpid.framing.TestIntegerBody; -import org.apache.qpid.framing.TestIntegerOkBody; -import org.apache.qpid.framing.TestStringBody; -import org.apache.qpid.framing.TestStringOkBody; -import org.apache.qpid.framing.TestTableBody; -import org.apache.qpid.framing.TestTableOkBody; import org.apache.qpid.framing.amqp_8_0.MethodDispatcher_8_0; public class ClientMethodDispatcherImpl_8_0 extends ClientMethodDispatcherImpl implements MethodDispatcher_8_0 @@ -51,43 +43,4 @@ public class ClientMethodDispatcherImpl_ return false; } - public boolean dispatchTestContent(TestContentBody body, int channelId) throws AMQException - { - return false; - } - - public boolean dispatchTestContentOk(TestContentOkBody body, int channelId) throws AMQException - { - return false; - } - - public boolean dispatchTestInteger(TestIntegerBody body, int channelId) throws AMQException - { - return false; - } - - public boolean dispatchTestIntegerOk(TestIntegerOkBody body, int channelId) throws AMQException - { - return false; - } - - public boolean dispatchTestString(TestStringBody body, int channelId) throws AMQException - { - return false; - } - - public boolean dispatchTestStringOk(TestStringOkBody body, int channelId) throws AMQException - { - return false; - } - - public boolean dispatchTestTable(TestTableBody body, int channelId) throws AMQException - { - return false; - } - - public boolean dispatchTestTableOk(TestTableOkBody body, int channelId) throws AMQException - { - return false; - } } Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java?rev=1628074&r1=1628073&r2=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java Sun Sep 28 15:22:03 2014 @@ -47,6 +47,7 @@ import org.apache.qpid.framing.FieldTabl import org.apache.qpid.framing.HeartbeatBody; import org.apache.qpid.framing.MethodDispatcher; import org.apache.qpid.framing.MethodRegistry; +import org.apache.qpid.framing.MethodRegistrySource; import org.apache.qpid.framing.ProtocolInitiation; import org.apache.qpid.framing.ProtocolVersion; import org.apache.qpid.protocol.AMQConstant; @@ -60,7 +61,7 @@ import org.apache.qpid.transport.Transpo * <p> * The underlying protocol session is still available but clients should not use it to obtain session attributes. */ -public class AMQProtocolSession implements AMQVersionAwareProtocolSession +public class AMQProtocolSession implements AMQVersionAwareProtocolSession, MethodRegistrySource { protected static final int LAST_WRITE_FUTURE_JOIN_TIMEOUT = 1000 * 60 * 2; Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/client/src/test/java/org/apache/qpid/client/AMQSession_0_8Test.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/client/src/test/java/org/apache/qpid/client/AMQSession_0_8Test.java?rev=1628074&r1=1628073&r2=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/client/src/test/java/org/apache/qpid/client/AMQSession_0_8Test.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/client/src/test/java/org/apache/qpid/client/AMQSession_0_8Test.java Sun Sep 28 15:22:03 2014 @@ -23,7 +23,7 @@ package org.apache.qpid.client; import org.apache.qpid.AMQException; import org.apache.qpid.client.transport.TestNetworkConnection; import org.apache.qpid.framing.AMQShortString; -import org.apache.qpid.framing.amqp_0_91.QueueDeclareOkBodyImpl; +import org.apache.qpid.framing.QueueDeclareOkBodyImpl; import org.apache.qpid.test.utils.QpidTestCase; import org.apache.qpid.transport.network.NetworkConnection; import org.apache.qpid.url.AMQBindingURL; Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/AMQChannelException.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/AMQChannelException.java?rev=1628074&r1=1628073&r2=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/AMQChannelException.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/AMQChannelException.java Sun Sep 28 15:22:03 2014 @@ -23,7 +23,6 @@ package org.apache.qpid; import org.apache.qpid.framing.AMQFrame; import org.apache.qpid.framing.AMQShortString; import org.apache.qpid.framing.MethodRegistry; -import org.apache.qpid.framing.ProtocolVersion; import org.apache.qpid.protocol.AMQConstant; /** @@ -34,23 +33,25 @@ public class AMQChannelException extends private final int _classId; private final int _methodId; /* AMQP version for which exception ocurred */ - private final byte major; - private final byte minor; + private final MethodRegistry _methodRegistry; - public AMQChannelException(AMQConstant errorCode, String msg, int classId, int methodId, byte major, byte minor, - Throwable cause) + + public AMQChannelException(AMQConstant errorCode, + String msg, + int classId, + int methodId, + MethodRegistry methodRegistry) { - super(errorCode, msg, cause); + super(errorCode, msg); _classId = classId; _methodId = methodId; - this.major = major; - this.minor = minor; + _methodRegistry = methodRegistry; + } public AMQFrame getCloseFrame(int channel) { - MethodRegistry reg = MethodRegistry.getMethodRegistry(new ProtocolVersion(major,minor)); - return new AMQFrame(channel, reg.createChannelCloseBody(getErrorCode() == null ? AMQConstant.INTERNAL_ERROR.getCode() : getErrorCode().getCode(), + return new AMQFrame(channel, _methodRegistry.createChannelCloseBody(getErrorCode() == null ? AMQConstant.INTERNAL_ERROR.getCode() : getErrorCode().getCode(), AMQShortString.validValueOf(getMessage()),_classId,_methodId)); } Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/AMQConnectionException.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/AMQConnectionException.java?rev=1628074&r1=1628073&r2=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/AMQConnectionException.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/AMQConnectionException.java Sun Sep 28 15:22:03 2014 @@ -22,6 +22,7 @@ package org.apache.qpid; import org.apache.qpid.framing.AMQFrame; +import org.apache.qpid.framing.AMQMethodBody; import org.apache.qpid.framing.AMQShortString; import org.apache.qpid.framing.MethodRegistry; import org.apache.qpid.framing.ProtocolVersion; @@ -35,32 +36,36 @@ public class AMQConnectionException exte private final int _classId; private final int _methodId; - /** AMQP version for which exception ocurred, major code. */ - private final byte major; - - /** AMQP version for which exception ocurred, minor code. */ - private final byte minor; - - private boolean _closeConnetion; + private final MethodRegistry _methodRegistry; public AMQConnectionException(AMQConstant errorCode, String msg, int classId, int methodId, byte major, byte minor, Throwable cause) { + this(errorCode, msg, classId, methodId, MethodRegistry.getMethodRegistry(new ProtocolVersion(major,minor)), cause); + } + + public AMQConnectionException(AMQConstant errorCode, String msg, AMQMethodBody body, MethodRegistry methodRegistry) + { + this(errorCode, msg, body.getClazz(), body.getMethod(), methodRegistry, null); + } + + public AMQConnectionException(AMQConstant errorCode, String msg, int classId, int methodId, MethodRegistry methodRegistry, + Throwable cause) + { super(errorCode, msg, cause); _classId = classId; _methodId = methodId; - this.major = major; - this.minor = minor; + _methodRegistry = methodRegistry; + } - public AMQFrame getCloseFrame(int channel) + public AMQFrame getCloseFrame() { - MethodRegistry reg = MethodRegistry.getMethodRegistry(new ProtocolVersion(major,minor)); return new AMQFrame(0, - reg.createConnectionCloseBody(getErrorCode().getCode(), - AMQShortString.validValueOf(getMessage()), - _classId, - _methodId)); + _methodRegistry.createConnectionCloseBody(getErrorCode().getCode(), + AMQShortString.validValueOf(getMessage()), + _classId, + _methodId)); } Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/AMQException.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/AMQException.java?rev=1628074&r1=1628073&r2=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/AMQException.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/AMQException.java Sun Sep 28 15:22:03 2014 @@ -20,7 +20,6 @@ */ package org.apache.qpid; -import org.apache.qpid.framing.AMQShortString; import org.apache.qpid.protocol.AMQConstant; /** @@ -72,7 +71,6 @@ public class AMQException extends Except this(null, (msg == null) ? "" : msg); } - @Deprecated public AMQException(AMQConstant errorCode, String msg) { this(errorCode, (msg == null) ? "" : msg, null); Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/codec/AMQDecoder.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/codec/AMQDecoder.java?rev=1628074&r1=1628073&r2=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/codec/AMQDecoder.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/codec/AMQDecoder.java Sun Sep 28 15:22:03 2014 @@ -38,8 +38,8 @@ import org.apache.qpid.framing.AMQProtoc import org.apache.qpid.framing.AMQShortString; import org.apache.qpid.framing.ByteArrayDataInput; import org.apache.qpid.framing.EncodingUtils; +import org.apache.qpid.framing.MethodRegistrySource; import org.apache.qpid.framing.ProtocolInitiation; -import org.apache.qpid.protocol.AMQVersionAwareProtocolSession; /** * AMQDecoder delegates the decoding of AMQP either to a data block decoder, or in the case of new connections, to a @@ -74,16 +74,15 @@ public class AMQDecoder * Creates a new AMQP decoder. * * @param expectProtocolInitiation <tt>true</tt> if this decoder needs to handle protocol initiation. - * @param session protocol session (connection) + * @param registrySource method registry source */ - public AMQDecoder(boolean expectProtocolInitiation, AMQVersionAwareProtocolSession session) + public AMQDecoder(boolean expectProtocolInitiation, MethodRegistrySource registrySource) { _expectProtocolInitiation = expectProtocolInitiation; - _bodyFactory = new AMQMethodBodyFactory(session); + _bodyFactory = new AMQMethodBodyFactory(registrySource); } - /** * Sets the protocol initation flag, that determines whether decoding is handled by the data decoder of the protocol * initation decoder. This method is expected to be called with <tt>false</tt> once protocol initation completes. Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBody.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBody.java?rev=1628074&r1=1628073&r2=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBody.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBody.java Sun Sep 28 15:22:03 2014 @@ -20,28 +20,18 @@ */ package org.apache.qpid.framing; +import java.io.DataOutput; +import java.io.IOException; + import org.apache.qpid.AMQChannelException; import org.apache.qpid.AMQConnectionException; import org.apache.qpid.AMQException; import org.apache.qpid.protocol.AMQConstant; -import java.io.DataOutput; -import java.io.IOException; - public interface AMQMethodBody extends AMQBody { public static final byte TYPE = 1; - /** AMQP major version - * @return the major version*/ - public byte getMajor(); - - /** AMQP minor version - * @return the minor version*/ - public byte getMinor(); - - - /** @return unsigned short */ public int getClazz(); @@ -66,18 +56,18 @@ public interface AMQMethodBody extends A * * @param channelId The channel id that is not found * + * @param methodRegistry * @return new AMQChannelException */ - public AMQChannelException getChannelNotFoundException(int channelId); - - public AMQChannelException getChannelException(AMQConstant code, String message); - - public AMQChannelException getChannelException(AMQConstant code, String message, Throwable cause); - - public AMQConnectionException getConnectionException(AMQConstant code, String message); - + public AMQChannelException getChannelNotFoundException(int channelId, final MethodRegistry methodRegistry); - public AMQConnectionException getConnectionException(AMQConstant code, String message, Throwable cause); + public AMQChannelException getChannelException(AMQConstant code, + String message, + final MethodRegistry methodRegistry); + + public AMQConnectionException getConnectionException(AMQConstant code, + String message, + final MethodRegistry methodRegistry); public boolean execute(MethodDispatcher methodDispatcher, int channelId) throws AMQException; Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyFactory.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyFactory.java?rev=1628074&r1=1628073&r2=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyFactory.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyFactory.java Sun Sep 28 15:22:03 2014 @@ -20,27 +20,26 @@ */ package org.apache.qpid.framing; +import java.io.IOException; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.qpid.codec.MarkableDataInput; -import org.apache.qpid.protocol.AMQVersionAwareProtocolSession; - -import java.io.IOException; public class AMQMethodBodyFactory implements BodyFactory { private static final Logger _log = LoggerFactory.getLogger(AMQMethodBodyFactory.class); - private final AMQVersionAwareProtocolSession _protocolSession; + private final MethodRegistrySource _registrySource; - public AMQMethodBodyFactory(AMQVersionAwareProtocolSession protocolSession) + public AMQMethodBodyFactory(MethodRegistrySource registrySource) { - _protocolSession = protocolSession; + _registrySource = registrySource; } public AMQBody createBody(MarkableDataInput in, long bodySize) throws AMQFrameDecodingException, IOException { - return _protocolSession.getMethodRegistry().convertToBody(in, bodySize); + return _registrySource.getMethodRegistry().convertToBody(in, bodySize); } } Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyImpl.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyImpl.java?rev=1628074&r1=1628073&r2=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyImpl.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyImpl.java Sun Sep 28 15:22:03 2014 @@ -21,6 +21,10 @@ package org.apache.qpid.framing; +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; + import org.apache.qpid.AMQChannelException; import org.apache.qpid.AMQConnectionException; import org.apache.qpid.AMQException; @@ -28,10 +32,6 @@ import org.apache.qpid.codec.MarkableDat import org.apache.qpid.protocol.AMQConstant; import org.apache.qpid.protocol.AMQVersionAwareProtocolSession; -import java.io.DataInput; -import java.io.DataOutput; -import java.io.IOException; - public abstract class AMQMethodBodyImpl implements AMQMethodBody { public static final byte TYPE = 1; @@ -67,31 +67,26 @@ public abstract class AMQMethodBodyImpl * * @param channelId The channel id that is not found * + * @param methodRegistry * @return new AMQChannelException */ - public AMQChannelException getChannelNotFoundException(int channelId) - { - return getChannelException(AMQConstant.NOT_FOUND, "Channel not found for id:" + channelId); - } - - public AMQChannelException getChannelException(AMQConstant code, String message) + public AMQChannelException getChannelNotFoundException(int channelId, final MethodRegistry methodRegistry) { - return new AMQChannelException(code, message, getClazz(), getMethod(), getMajor(), getMinor(), null); + return getChannelException(AMQConstant.NOT_FOUND, "Channel not found for id:" + channelId, methodRegistry); } - public AMQChannelException getChannelException(AMQConstant code, String message, Throwable cause) + public AMQChannelException getChannelException(AMQConstant code, + String message, + final MethodRegistry methodRegistry) { - return new AMQChannelException(code, message, getClazz(), getMethod(), getMajor(), getMinor(), cause); + return new AMQChannelException(code, message, getClazz(), getMethod(), methodRegistry); } - public AMQConnectionException getConnectionException(AMQConstant code, String message) + public AMQConnectionException getConnectionException(AMQConstant code, + String message, + final MethodRegistry methodRegistry) { - return new AMQConnectionException(code, message, getClazz(), getMethod(), getMajor(), getMinor(), null); - } - - public AMQConnectionException getConnectionException(AMQConstant code, String message, Throwable cause) - { - return new AMQConnectionException(code, message, getClazz(), getMethod(), getMajor(), getMinor(), cause); + return new AMQConnectionException(code, message, this, methodRegistry); } public void handle(final int channelId, final AMQVersionAwareProtocolSession session) throws AMQException @@ -198,20 +193,6 @@ public abstract class AMQMethodBodyImpl EncodingUtils.writeShort(buffer, s); } - protected Content readContent(DataInput buffer) - { - return null; - } - - protected int getSizeOf(Content body) - { - return 0; - } - - protected void writeContent(DataOutput buffer, Content body) - { - } - protected byte readBitfield(DataInput buffer) throws IOException { return readByte(buffer); Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicAckBodyImpl.java (from r1628068, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicAckBodyImpl.java) URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicAckBodyImpl.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicAckBodyImpl.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicAckBodyImpl.java&r1=1628068&r2=1628074&rev=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicAckBodyImpl.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicAckBodyImpl.java Sun Sep 28 15:22:03 2014 @@ -25,16 +25,15 @@ * 8-0 */ -package org.apache.qpid.framing.amqp_8_0; +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 BasicAckBodyImpl extends AMQMethodBody_8_0 implements BasicAckBody +public class BasicAckBodyImpl extends AMQMethodBodyImpl implements BasicAckBody { private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() { @@ -110,7 +109,7 @@ public class BasicAckBodyImpl extends AM public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException { - return ((MethodDispatcher_8_0)dispatcher).dispatchBasicAck(this, channelId); + return dispatcher.dispatchBasicAck(this, channelId); } public String toString() Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicCancelBodyImpl.java (from r1628068, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicCancelBodyImpl.java) URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicCancelBodyImpl.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicCancelBodyImpl.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicCancelBodyImpl.java&r1=1628068&r2=1628074&rev=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicCancelBodyImpl.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicCancelBodyImpl.java Sun Sep 28 15:22:03 2014 @@ -25,16 +25,15 @@ * 8-0 */ -package org.apache.qpid.framing.amqp_8_0; +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 BasicCancelBodyImpl extends AMQMethodBody_8_0 implements BasicCancelBody +public class BasicCancelBodyImpl extends AMQMethodBodyImpl implements BasicCancelBody { private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() { @@ -111,7 +110,7 @@ public class BasicCancelBodyImpl extends public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException { - return ((MethodDispatcher_8_0)dispatcher).dispatchBasicCancel(this, channelId); + return dispatcher.dispatchBasicCancel(this, channelId); } public String toString() Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicCancelOkBodyImpl.java (from r1628068, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicCancelOkBodyImpl.java) URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicCancelOkBodyImpl.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicCancelOkBodyImpl.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicCancelOkBodyImpl.java&r1=1628068&r2=1628074&rev=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicCancelOkBodyImpl.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicCancelOkBodyImpl.java Sun Sep 28 15:22:03 2014 @@ -25,16 +25,15 @@ * 8-0 */ -package org.apache.qpid.framing.amqp_8_0; +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 BasicCancelOkBodyImpl extends AMQMethodBody_8_0 implements BasicCancelOkBody +public class BasicCancelOkBodyImpl extends AMQMethodBodyImpl implements BasicCancelOkBody { private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() { @@ -97,7 +96,7 @@ public class BasicCancelOkBodyImpl exten public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException { - return ((MethodDispatcher_8_0)dispatcher).dispatchBasicCancelOk(this, channelId); + return dispatcher.dispatchBasicCancelOk(this, channelId); } public String toString() Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicConsumeBodyImpl.java (from r1628068, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicConsumeBodyImpl.java) URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicConsumeBodyImpl.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicConsumeBodyImpl.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicConsumeBodyImpl.java&r1=1628068&r2=1628074&rev=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicConsumeBodyImpl.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicConsumeBodyImpl.java Sun Sep 28 15:22:03 2014 @@ -25,16 +25,15 @@ * 8-0 */ -package org.apache.qpid.framing.amqp_8_0; +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 BasicConsumeBodyImpl extends AMQMethodBody_8_0 implements BasicConsumeBody +public class BasicConsumeBodyImpl extends AMQMethodBodyImpl implements BasicConsumeBody { private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() { @@ -171,7 +170,7 @@ public class BasicConsumeBodyImpl extend public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException { - return ((MethodDispatcher_8_0)dispatcher).dispatchBasicConsume(this, channelId); + return dispatcher.dispatchBasicConsume(this, channelId); } public String toString() Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicConsumeOkBodyImpl.java (from r1628068, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicConsumeOkBodyImpl.java) URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicConsumeOkBodyImpl.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicConsumeOkBodyImpl.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicConsumeOkBodyImpl.java&r1=1628068&r2=1628074&rev=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicConsumeOkBodyImpl.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicConsumeOkBodyImpl.java Sun Sep 28 15:22:03 2014 @@ -25,16 +25,15 @@ * 8-0 */ -package org.apache.qpid.framing.amqp_8_0; +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 BasicConsumeOkBodyImpl extends AMQMethodBody_8_0 implements BasicConsumeOkBody +public class BasicConsumeOkBodyImpl extends AMQMethodBodyImpl implements BasicConsumeOkBody { private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() { @@ -97,7 +96,7 @@ public class BasicConsumeOkBodyImpl exte public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException { - return ((MethodDispatcher_8_0)dispatcher).dispatchBasicConsumeOk(this, channelId); + return dispatcher.dispatchBasicConsumeOk(this, channelId); } public String toString() Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicDeliverBodyImpl.java (from r1628068, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicDeliverBodyImpl.java) URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicDeliverBodyImpl.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicDeliverBodyImpl.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicDeliverBodyImpl.java&r1=1628068&r2=1628074&rev=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicDeliverBodyImpl.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicDeliverBodyImpl.java Sun Sep 28 15:22:03 2014 @@ -25,16 +25,15 @@ * 8-0 */ -package org.apache.qpid.framing.amqp_8_0; +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 BasicDeliverBodyImpl extends AMQMethodBody_8_0 implements BasicDeliverBody +public class BasicDeliverBodyImpl extends AMQMethodBodyImpl implements BasicDeliverBody { private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() { @@ -141,7 +140,7 @@ public class BasicDeliverBodyImpl extend public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException { - return ((MethodDispatcher_8_0)dispatcher).dispatchBasicDeliver(this, channelId); + return dispatcher.dispatchBasicDeliver(this, channelId); } public String toString() Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicGetBodyImpl.java (from r1628068, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicGetBodyImpl.java) URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicGetBodyImpl.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicGetBodyImpl.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicGetBodyImpl.java&r1=1628068&r2=1628074&rev=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicGetBodyImpl.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicGetBodyImpl.java Sun Sep 28 15:22:03 2014 @@ -25,16 +25,15 @@ * 8-0 */ -package org.apache.qpid.framing.amqp_8_0; +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 BasicGetBodyImpl extends AMQMethodBody_8_0 implements BasicGetBody +public class BasicGetBodyImpl extends AMQMethodBodyImpl implements BasicGetBody { private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() { @@ -120,7 +119,7 @@ public class BasicGetBodyImpl extends AM public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException { - return ((MethodDispatcher_8_0)dispatcher).dispatchBasicGet(this, channelId); + return dispatcher.dispatchBasicGet(this, channelId); } public String toString() Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicGetEmptyBodyImpl.java (from r1628068, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicGetEmptyBodyImpl.java) URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicGetEmptyBodyImpl.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicGetEmptyBodyImpl.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicGetEmptyBodyImpl.java&r1=1628068&r2=1628074&rev=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicGetEmptyBodyImpl.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicGetEmptyBodyImpl.java Sun Sep 28 15:22:03 2014 @@ -25,16 +25,15 @@ * 8-0 */ -package org.apache.qpid.framing.amqp_8_0; +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 BasicGetEmptyBodyImpl extends AMQMethodBody_8_0 implements BasicGetEmptyBody +public class BasicGetEmptyBodyImpl extends AMQMethodBodyImpl implements BasicGetEmptyBody { private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() { @@ -97,7 +96,7 @@ public class BasicGetEmptyBodyImpl exten public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException { - return ((MethodDispatcher_8_0)dispatcher).dispatchBasicGetEmpty(this, channelId); + return dispatcher.dispatchBasicGetEmpty(this, channelId); } public String toString() Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicGetOkBodyImpl.java (from r1628068, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicGetOkBodyImpl.java) URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicGetOkBodyImpl.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicGetOkBodyImpl.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicGetOkBodyImpl.java&r1=1628068&r2=1628074&rev=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicGetOkBodyImpl.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicGetOkBodyImpl.java Sun Sep 28 15:22:03 2014 @@ -25,16 +25,15 @@ * 8-0 */ -package org.apache.qpid.framing.amqp_8_0; +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 BasicGetOkBodyImpl extends AMQMethodBody_8_0 implements BasicGetOkBody +public class BasicGetOkBodyImpl extends AMQMethodBodyImpl implements BasicGetOkBody { private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() { @@ -140,7 +139,7 @@ public class BasicGetOkBodyImpl extends public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException { - return ((MethodDispatcher_8_0)dispatcher).dispatchBasicGetOk(this, channelId); + return dispatcher.dispatchBasicGetOk(this, channelId); } public String toString() Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicPublishBodyImpl.java (from r1628068, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicPublishBodyImpl.java) URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicPublishBodyImpl.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicPublishBodyImpl.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicPublishBodyImpl.java&r1=1628068&r2=1628074&rev=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicPublishBodyImpl.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicPublishBodyImpl.java Sun Sep 28 15:22:03 2014 @@ -25,16 +25,15 @@ * 8-0 */ -package org.apache.qpid.framing.amqp_8_0; +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 BasicPublishBodyImpl extends AMQMethodBody_8_0 implements BasicPublishBody +public class BasicPublishBodyImpl extends AMQMethodBodyImpl implements BasicPublishBody { private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() { @@ -140,7 +139,7 @@ public class BasicPublishBodyImpl extend public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException { - return ((MethodDispatcher_8_0)dispatcher).dispatchBasicPublish(this, channelId); + return dispatcher.dispatchBasicPublish(this, channelId); } public String toString() Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicQosBodyImpl.java (from r1628068, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicQosBodyImpl.java) URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicQosBodyImpl.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicQosBodyImpl.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicQosBodyImpl.java&r1=1628068&r2=1628074&rev=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicQosBodyImpl.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicQosBodyImpl.java Sun Sep 28 15:22:03 2014 @@ -25,16 +25,15 @@ * 8-0 */ -package org.apache.qpid.framing.amqp_8_0; +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 BasicQosBodyImpl extends AMQMethodBody_8_0 implements BasicQosBody +public class BasicQosBodyImpl extends AMQMethodBodyImpl implements BasicQosBody { private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() { @@ -119,7 +118,7 @@ public class BasicQosBodyImpl extends AM public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException { - return ((MethodDispatcher_8_0)dispatcher).dispatchBasicQos(this, channelId); + return dispatcher.dispatchBasicQos(this, channelId); } public String toString() Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicQosOkBodyImpl.java (from r1628068, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicQosOkBodyImpl.java) URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicQosOkBodyImpl.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicQosOkBodyImpl.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicQosOkBodyImpl.java&r1=1628068&r2=1628074&rev=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicQosOkBodyImpl.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicQosOkBodyImpl.java Sun Sep 28 15:22:03 2014 @@ -25,16 +25,15 @@ * 8-0 */ -package org.apache.qpid.framing.amqp_8_0; +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 BasicQosOkBodyImpl extends AMQMethodBody_8_0 implements BasicQosOkBody +public class BasicQosOkBodyImpl extends AMQMethodBodyImpl implements BasicQosOkBody { private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() { @@ -87,7 +86,7 @@ public class BasicQosOkBodyImpl extends public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException { - return ((MethodDispatcher_8_0)dispatcher).dispatchBasicQosOk(this, channelId); + return dispatcher.dispatchBasicQosOk(this, channelId); } public String toString() Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverBodyImpl.java (from r1628068, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicRecoverBodyImpl.java) URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverBodyImpl.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverBodyImpl.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicRecoverBodyImpl.java&r1=1628068&r2=1628074&rev=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicRecoverBodyImpl.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverBodyImpl.java Sun Sep 28 15:22:03 2014 @@ -25,16 +25,15 @@ * 8-0 */ -package org.apache.qpid.framing.amqp_8_0; +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 BasicRecoverBodyImpl extends AMQMethodBody_8_0 implements BasicRecoverBody +public class BasicRecoverBodyImpl extends AMQMethodBodyImpl implements BasicRecoverBody { private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() { @@ -101,7 +100,7 @@ public class BasicRecoverBodyImpl extend public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException { - return ((MethodDispatcher_8_0)dispatcher).dispatchBasicRecover(this, channelId); + return dispatcher.dispatchBasicRecover(this, channelId); } public String toString() Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicRejectBodyImpl.java (from r1628068, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicRejectBodyImpl.java) URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicRejectBodyImpl.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicRejectBodyImpl.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicRejectBodyImpl.java&r1=1628068&r2=1628074&rev=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicRejectBodyImpl.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicRejectBodyImpl.java Sun Sep 28 15:22:03 2014 @@ -25,16 +25,15 @@ * 8-0 */ -package org.apache.qpid.framing.amqp_8_0; +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 BasicRejectBodyImpl extends AMQMethodBody_8_0 implements BasicRejectBody +public class BasicRejectBodyImpl extends AMQMethodBodyImpl implements BasicRejectBody { private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() { @@ -110,7 +109,7 @@ public class BasicRejectBodyImpl extends public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException { - return ((MethodDispatcher_8_0)dispatcher).dispatchBasicReject(this, channelId); + return dispatcher.dispatchBasicReject(this, channelId); } public String toString() Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicReturnBodyImpl.java (from r1628068, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicReturnBodyImpl.java) URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicReturnBodyImpl.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicReturnBodyImpl.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicReturnBodyImpl.java&r1=1628068&r2=1628074&rev=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicReturnBodyImpl.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicReturnBodyImpl.java Sun Sep 28 15:22:03 2014 @@ -25,16 +25,15 @@ * 8-0 */ -package org.apache.qpid.framing.amqp_8_0; +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 BasicReturnBodyImpl extends AMQMethodBody_8_0 implements BasicReturnBody +public class BasicReturnBodyImpl extends AMQMethodBodyImpl implements BasicReturnBody { private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() { @@ -126,7 +125,7 @@ public class BasicReturnBodyImpl extends public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException { - return ((MethodDispatcher_8_0)dispatcher).dispatchBasicReturn(this, channelId); + return dispatcher.dispatchBasicReturn(this, channelId); } public String toString() Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelCloseBodyImpl.java (from r1628068, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelCloseBodyImpl.java) URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelCloseBodyImpl.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelCloseBodyImpl.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelCloseBodyImpl.java&r1=1628068&r2=1628074&rev=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelCloseBodyImpl.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelCloseBodyImpl.java Sun Sep 28 15:22:03 2014 @@ -25,16 +25,15 @@ * 8-0 */ -package org.apache.qpid.framing.amqp_8_0; +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 ChannelCloseBodyImpl extends AMQMethodBody_8_0 implements ChannelCloseBody +public class ChannelCloseBodyImpl extends AMQMethodBodyImpl implements ChannelCloseBody { private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() { @@ -124,7 +123,7 @@ public class ChannelCloseBodyImpl extend public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException { - return ((MethodDispatcher_8_0)dispatcher).dispatchChannelClose(this, channelId); + return dispatcher.dispatchChannelClose(this, channelId); } public String toString() Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelCloseOkBodyImpl.java (from r1628068, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelCloseOkBodyImpl.java) URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelCloseOkBodyImpl.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelCloseOkBodyImpl.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelCloseOkBodyImpl.java&r1=1628068&r2=1628074&rev=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelCloseOkBodyImpl.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelCloseOkBodyImpl.java Sun Sep 28 15:22:03 2014 @@ -25,16 +25,15 @@ * 8-0 */ -package org.apache.qpid.framing.amqp_8_0; +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 ChannelCloseOkBodyImpl extends AMQMethodBody_8_0 implements ChannelCloseOkBody +public class ChannelCloseOkBodyImpl extends AMQMethodBodyImpl implements ChannelCloseOkBody { private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() { @@ -87,7 +86,7 @@ public class ChannelCloseOkBodyImpl exte public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException { - return ((MethodDispatcher_8_0)dispatcher).dispatchChannelCloseOk(this, channelId); + return dispatcher.dispatchChannelCloseOk(this, channelId); } public String toString() Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelFlowBodyImpl.java (from r1628068, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelFlowBodyImpl.java) URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelFlowBodyImpl.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelFlowBodyImpl.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelFlowBodyImpl.java&r1=1628068&r2=1628074&rev=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelFlowBodyImpl.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelFlowBodyImpl.java Sun Sep 28 15:22:03 2014 @@ -25,16 +25,15 @@ * 8-0 */ -package org.apache.qpid.framing.amqp_8_0; +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 ChannelFlowBodyImpl extends AMQMethodBody_8_0 implements ChannelFlowBody +public class ChannelFlowBodyImpl extends AMQMethodBodyImpl implements ChannelFlowBody { private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() { @@ -101,7 +100,7 @@ public class ChannelFlowBodyImpl extends public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException { - return ((MethodDispatcher_8_0)dispatcher).dispatchChannelFlow(this, channelId); + return dispatcher.dispatchChannelFlow(this, channelId); } public String toString() Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelFlowOkBodyImpl.java (from r1628068, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelFlowOkBodyImpl.java) URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelFlowOkBodyImpl.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelFlowOkBodyImpl.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelFlowOkBodyImpl.java&r1=1628068&r2=1628074&rev=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelFlowOkBodyImpl.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelFlowOkBodyImpl.java Sun Sep 28 15:22:03 2014 @@ -25,16 +25,15 @@ * 8-0 */ -package org.apache.qpid.framing.amqp_8_0; +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 ChannelFlowOkBodyImpl extends AMQMethodBody_8_0 implements ChannelFlowOkBody +public class ChannelFlowOkBodyImpl extends AMQMethodBodyImpl implements ChannelFlowOkBody { private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() { @@ -101,7 +100,7 @@ public class ChannelFlowOkBodyImpl exten public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException { - return ((MethodDispatcher_8_0)dispatcher).dispatchChannelFlowOk(this, channelId); + return dispatcher.dispatchChannelFlowOk(this, channelId); } public String toString() Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelOpenBodyImpl.java (from r1628068, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelOpenBodyImpl.java) URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelOpenBodyImpl.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelOpenBodyImpl.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelOpenBodyImpl.java&r1=1628068&r2=1628074&rev=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelOpenBodyImpl.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelOpenBodyImpl.java Sun Sep 28 15:22:03 2014 @@ -25,16 +25,15 @@ * 8-0 */ -package org.apache.qpid.framing.amqp_8_0; +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 ChannelOpenBodyImpl extends AMQMethodBody_8_0 implements ChannelOpenBody +public class ChannelOpenBodyImpl extends AMQMethodBodyImpl implements ChannelOpenBody { private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() { @@ -97,7 +96,7 @@ public class ChannelOpenBodyImpl extends public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException { - return ((MethodDispatcher_8_0)dispatcher).dispatchChannelOpen(this, channelId); + return dispatcher.dispatchChannelOpen(this, channelId); } public String toString() Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionOpenBodyImpl.java (from r1628068, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionOpenBodyImpl.java) URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionOpenBodyImpl.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionOpenBodyImpl.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionOpenBodyImpl.java&r1=1628068&r2=1628074&rev=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionOpenBodyImpl.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionOpenBodyImpl.java Sun Sep 28 15:22:03 2014 @@ -25,16 +25,15 @@ * 8-0 */ -package org.apache.qpid.framing.amqp_8_0; +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 ConnectionOpenBodyImpl extends AMQMethodBody_8_0 implements ConnectionOpenBody +public class ConnectionOpenBodyImpl extends AMQMethodBodyImpl implements ConnectionOpenBody { private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() { @@ -121,7 +120,7 @@ public class ConnectionOpenBodyImpl exte public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException { - return ((MethodDispatcher_8_0)dispatcher).dispatchConnectionOpen(this, channelId); + return dispatcher.dispatchConnectionOpen(this, channelId); } public String toString() Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionOpenOkBodyImpl.java (from r1628068, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionOpenOkBodyImpl.java) URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionOpenOkBodyImpl.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionOpenOkBodyImpl.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionOpenOkBodyImpl.java&r1=1628068&r2=1628074&rev=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionOpenOkBodyImpl.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionOpenOkBodyImpl.java Sun Sep 28 15:22:03 2014 @@ -25,16 +25,15 @@ * 8-0 */ -package org.apache.qpid.framing.amqp_8_0; +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 ConnectionOpenOkBodyImpl extends AMQMethodBody_8_0 implements ConnectionOpenOkBody +public class ConnectionOpenOkBodyImpl extends AMQMethodBodyImpl implements ConnectionOpenOkBody { private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() { @@ -97,7 +96,7 @@ public class ConnectionOpenOkBodyImpl ex public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException { - return ((MethodDispatcher_8_0)dispatcher).dispatchConnectionOpenOk(this, channelId); + return dispatcher.dispatchConnectionOpenOk(this, channelId); } public String toString() Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionSecureBodyImpl.java (from r1628068, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionSecureBodyImpl.java) URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionSecureBodyImpl.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionSecureBodyImpl.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionSecureBodyImpl.java&r1=1628068&r2=1628074&rev=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionSecureBodyImpl.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionSecureBodyImpl.java Sun Sep 28 15:22:03 2014 @@ -25,16 +25,15 @@ * 8-0 */ -package org.apache.qpid.framing.amqp_8_0; +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 ConnectionSecureBodyImpl extends AMQMethodBody_8_0 implements ConnectionSecureBody +public class ConnectionSecureBodyImpl extends AMQMethodBodyImpl implements ConnectionSecureBody { private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() { @@ -97,7 +96,7 @@ public class ConnectionSecureBodyImpl ex public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException { - return ((MethodDispatcher_8_0)dispatcher).dispatchConnectionSecure(this, channelId); + return dispatcher.dispatchConnectionSecure(this, channelId); } public String toString() Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionSecureOkBodyImpl.java (from r1628068, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionSecureOkBodyImpl.java) URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionSecureOkBodyImpl.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionSecureOkBodyImpl.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionSecureOkBodyImpl.java&r1=1628068&r2=1628074&rev=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionSecureOkBodyImpl.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionSecureOkBodyImpl.java Sun Sep 28 15:22:03 2014 @@ -25,16 +25,15 @@ * 8-0 */ -package org.apache.qpid.framing.amqp_8_0; +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 ConnectionSecureOkBodyImpl extends AMQMethodBody_8_0 implements ConnectionSecureOkBody +public class ConnectionSecureOkBodyImpl extends AMQMethodBodyImpl implements ConnectionSecureOkBody { private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() { @@ -97,7 +96,7 @@ public class ConnectionSecureOkBodyImpl public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException { - return ((MethodDispatcher_8_0)dispatcher).dispatchConnectionSecureOk(this, channelId); + return dispatcher.dispatchConnectionSecureOk(this, channelId); } public String toString() Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionStartBodyImpl.java (from r1628068, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionStartBodyImpl.java) URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionStartBodyImpl.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionStartBodyImpl.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionStartBodyImpl.java&r1=1628068&r2=1628074&rev=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionStartBodyImpl.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionStartBodyImpl.java Sun Sep 28 15:22:03 2014 @@ -25,16 +25,15 @@ * 8-0 */ -package org.apache.qpid.framing.amqp_8_0; +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 ConnectionStartBodyImpl extends AMQMethodBody_8_0 implements ConnectionStartBody +public class ConnectionStartBodyImpl extends AMQMethodBodyImpl implements ConnectionStartBody { private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() { @@ -135,7 +134,7 @@ public class ConnectionStartBodyImpl ext public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException { - return ((MethodDispatcher_8_0)dispatcher).dispatchConnectionStart(this, channelId); + return dispatcher.dispatchConnectionStart(this, channelId); } public String toString() Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionStartOkBodyImpl.java (from r1628068, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionStartOkBodyImpl.java) URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionStartOkBodyImpl.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionStartOkBodyImpl.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionStartOkBodyImpl.java&r1=1628068&r2=1628074&rev=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionStartOkBodyImpl.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionStartOkBodyImpl.java Sun Sep 28 15:22:03 2014 @@ -25,16 +25,15 @@ * 8-0 */ -package org.apache.qpid.framing.amqp_8_0; +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 ConnectionStartOkBodyImpl extends AMQMethodBody_8_0 implements ConnectionStartOkBody +public class ConnectionStartOkBodyImpl extends AMQMethodBodyImpl implements ConnectionStartOkBody { private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() { @@ -127,7 +126,7 @@ public class ConnectionStartOkBodyImpl e public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException { - return ((MethodDispatcher_8_0)dispatcher).dispatchConnectionStartOk(this, channelId); + return dispatcher.dispatchConnectionStartOk(this, channelId); } public String toString() Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionTuneBodyImpl.java (from r1628068, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionTuneBodyImpl.java) URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionTuneBodyImpl.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionTuneBodyImpl.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionTuneBodyImpl.java&r1=1628068&r2=1628074&rev=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionTuneBodyImpl.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionTuneBodyImpl.java Sun Sep 28 15:22:03 2014 @@ -25,16 +25,15 @@ * 8-0 */ -package org.apache.qpid.framing.amqp_8_0; +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 ConnectionTuneBodyImpl extends AMQMethodBody_8_0 implements ConnectionTuneBody +public class ConnectionTuneBodyImpl extends AMQMethodBodyImpl implements ConnectionTuneBody { private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() { @@ -114,7 +113,7 @@ public class ConnectionTuneBodyImpl exte public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException { - return ((MethodDispatcher_8_0)dispatcher).dispatchConnectionTune(this, channelId); + return dispatcher.dispatchConnectionTune(this, channelId); } public String toString() Copied: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionTuneOkBodyImpl.java (from r1628068, qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionTuneOkBodyImpl.java) URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionTuneOkBodyImpl.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionTuneOkBodyImpl.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionTuneOkBodyImpl.java&r1=1628068&r2=1628074&rev=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionTuneOkBodyImpl.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionTuneOkBodyImpl.java Sun Sep 28 15:22:03 2014 @@ -25,16 +25,15 @@ * 8-0 */ -package org.apache.qpid.framing.amqp_8_0; +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 ConnectionTuneOkBodyImpl extends AMQMethodBody_8_0 implements ConnectionTuneOkBody +public class ConnectionTuneOkBodyImpl extends AMQMethodBodyImpl implements ConnectionTuneOkBody { private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new AMQMethodBodyInstanceFactory() { @@ -114,7 +113,7 @@ public class ConnectionTuneOkBodyImpl ex public boolean execute(MethodDispatcher dispatcher, int channelId) throws AMQException { - return ((MethodDispatcher_8_0)dispatcher).dispatchConnectionTuneOk(this, channelId); + return dispatcher.dispatchConnectionTuneOk(this, channelId); } public String toString() Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderPropertiesFactory.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderPropertiesFactory.java?rev=1628074&r1=1628073&r2=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderPropertiesFactory.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderPropertiesFactory.java Sun Sep 28 15:22:03 2014 @@ -20,8 +20,6 @@ */ package org.apache.qpid.framing; -import org.apache.qpid.framing.amqp_8_0.BasicConsumeBodyImpl; - import java.io.DataInput; import java.io.IOException; Modified: qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java URL: http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java?rev=1628074&r1=1628073&r2=1628074&view=diff ============================================================================== --- qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java (original) +++ qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java Sun Sep 28 15:22:03 2014 @@ -20,15 +20,15 @@ */ package org.apache.qpid.framing; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; import java.nio.ByteBuffer; import java.nio.charset.Charset; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + public class EncodingUtils { private static final Logger _logger = LoggerFactory.getLogger(EncodingUtils.class); @@ -218,12 +218,6 @@ public class EncodingUtils } } - public static int encodedContentLength(Content table) - { - // TODO: New Content class required for AMQP 0-9. - return 0; - } - public static void writeShortStringBytes(DataOutput buffer, String s) throws IOException { if (s != null) @@ -374,11 +368,6 @@ public class EncodingUtils } } - public static void writeContentBytes(DataOutput buffer, Content content) - { - // TODO: New Content class required for AMQP 0-9. - } - public static void writeBooleans(DataOutput buffer, boolean[] values) throws IOException { byte packedValue = 0; @@ -656,12 +645,6 @@ public class EncodingUtils } } - public static Content readContent(DataInput buffer) throws AMQFrameDecodingException - { - // TODO: New Content class required for AMQP 0-9. - return null; - } - public static AMQShortString readAMQShortString(DataInput buffer) throws IOException { return AMQShortString.readFromBuffer(buffer); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
