Author: rgodfrey
Date: Mon Sep 29 23:20:39 2014
New Revision: 1628336
URL: http://svn.apache.org/r1628336
Log:
Merge method body implementation classes
Added:
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/AccessRequestBody.java
- copied, changed from r1628074,
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/AccessRequestBodyImpl.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/AccessRequestOkBody.java
- copied, changed from r1628074,
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/AccessRequestOkBodyImpl.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverSyncBody.java
- copied, changed from r1628074,
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicRecoverSyncBodyImpl.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverSyncOkBody.java
- copied, changed from r1628074,
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicRecoverSyncOkBodyImpl.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelAlertBody.java
- copied, changed from r1628074,
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelAlertBodyImpl.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelOpenOkBody.java
- copied, changed from r1628074,
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelOpenOkBodyImpl.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionCloseBody.java
- copied, changed from r1628074,
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionCloseBodyImpl.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionCloseOkBody.java
- copied, changed from r1628074,
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionCloseOkBodyImpl.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionRedirectBody.java
- copied, changed from r1628074,
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionRedirectBodyImpl.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueUnbindBody.java
- copied, changed from r1628074,
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueUnbindBodyImpl.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueUnbindOkBody.java
- copied, changed from r1628074,
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueUnbindOkBodyImpl.java
Removed:
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyInstanceFactory.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverOkBody.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/abstraction/AbstractMethodConverter.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/abstraction/ProtocolVersionMethodConverter.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/AccessRequestBodyImpl.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/AccessRequestOkBodyImpl.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicRecoverSyncBodyImpl.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/BasicRecoverSyncOkBodyImpl.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ChannelOpenOkBodyImpl.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionCloseBodyImpl.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionCloseOkBodyImpl.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/ConnectionRedirectBodyImpl.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodConverter_0_9.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodRegistry_0_9.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueUnbindBodyImpl.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/QueueUnbindOkBodyImpl.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicRecoverSyncBodyImpl.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicRecoverSyncOkBodyImpl.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ChannelOpenOkBodyImpl.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionCloseBodyImpl.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/ConnectionCloseOkBodyImpl.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodConverter_0_91.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodRegistry_0_91.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueUnbindBodyImpl.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/QueueUnbindOkBodyImpl.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/AccessRequestBodyImpl.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/AccessRequestOkBodyImpl.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/BasicRecoverOkBodyImpl.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelAlertBodyImpl.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ChannelOpenOkBodyImpl.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionCloseBodyImpl.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionCloseOkBodyImpl.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ConnectionRedirectBodyImpl.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodConverter_8_0.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodRegistry_8_0.java
Modified:
qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/AccessRequestHandler.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicPublishMethodHandler.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicRecoverMethodHandler.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicRecoverSyncMethodHandler.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelOpenHandler.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueUnbindHandler.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl_8_0.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_8_0.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicAckBody.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicCancelBody.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicCancelOkBody.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicConsumeBody.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicConsumeOkBody.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicDeliverBody.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicGetBody.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicGetEmptyBody.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicGetOkBody.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicPublishBody.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicQosBody.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicQosOkBody.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverBody.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicRejectBody.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicReturnBody.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelCloseBody.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelCloseOkBody.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelFlowBody.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelFlowOkBody.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ChannelOpenBody.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ClientMethodDispatcher.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionOpenBody.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionOpenOkBody.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionSecureBody.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionSecureOkBody.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionStartBody.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionStartOkBody.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionTuneBody.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ConnectionTuneOkBody.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeBoundBody.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeBoundOkBody.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeclareBody.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeclareOkBody.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeleteBody.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ExchangeDeleteOkBody.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/MethodRegistry.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueBindBody.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueBindOkBody.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueDeclareBody.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueDeclareOkBody.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueDeleteBody.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueueDeleteOkBody.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueuePurgeBody.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/QueuePurgeOkBody.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/ServerMethodDispatcher.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxCommitBody.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxCommitOkBody.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxRollbackBody.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxRollbackOkBody.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxSelectBody.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/TxSelectOkBody.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/ClientMethodDispatcher_8_0.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/test/java/org/apache/qpid/server/logging/ExchangeLoggingTest.java
qpid/branches/QPID-6125-ProtocolRefactoring/java/systests/src/test/java/org/apache/qpid/transport/MaxFrameSizeTest.java
Modified:
qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java?rev=1628336&r1=1628335&r2=1628336&view=diff
==============================================================================
---
qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
(original)
+++
qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
Mon Sep 29 23:20:39 2014
@@ -1407,7 +1407,11 @@ public class AMQProtocolEngine implement
MethodRegistry methodRegistry =
MethodRegistry.getMethodRegistry(getProtocolVersion());
- ConnectionCloseBody closeBody =
methodRegistry.createConnectionCloseBody(200,
AMQShortString.validValueOf(throwable.getMessage()),0,0);
+ ConnectionCloseBody closeBody =
methodRegistry.createConnectionCloseBody(200,
+
AMQShortString.validValueOf(
+
throwable.getMessage()),
+
0,
+
0);
writeFrame(closeBody.generateFrame(0));
Modified:
qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/AccessRequestHandler.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/AccessRequestHandler.java?rev=1628336&r1=1628335&r2=1628336&view=diff
==============================================================================
---
qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/AccessRequestHandler.java
(original)
+++
qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/AccessRequestHandler.java
Mon Sep 29 23:20:39 2014
@@ -25,8 +25,7 @@ import org.apache.qpid.AMQException;
import org.apache.qpid.framing.AccessRequestBody;
import org.apache.qpid.framing.AccessRequestOkBody;
import org.apache.qpid.framing.MethodRegistry;
-import org.apache.qpid.framing.amqp_0_9.MethodRegistry_0_9;
-import org.apache.qpid.framing.amqp_8_0.MethodRegistry_8_0;
+import org.apache.qpid.framing.ProtocolVersion;
import org.apache.qpid.protocol.AMQConstant;
import org.apache.qpid.server.protocol.v0_8.AMQChannel;
import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
@@ -63,22 +62,14 @@ public class AccessRequestHandler implem
MethodRegistry methodRegistry = connection.getMethodRegistry();
- // We don't implement access control class, but to keep clients happy
that expect it
- // always use the "0" ticket.
- AccessRequestOkBody response;
- if(methodRegistry instanceof MethodRegistry_0_9)
- {
- response =
((MethodRegistry_0_9)methodRegistry).createAccessRequestOkBody(0);
- }
- else if(methodRegistry instanceof MethodRegistry_8_0)
- {
- response =
((MethodRegistry_8_0)methodRegistry).createAccessRequestOkBody(0);
- }
- else
+ if(ProtocolVersion.v0_91.equals(connection.getProtocolVersion()) )
{
throw new AMQException(AMQConstant.COMMAND_INVALID, "AccessRequest
not present in AMQP versions other than 0-8, 0-9");
}
+ // We don't implement access control class, but to keep clients happy
that expect it
+ // always use the "0" ticket.
+ AccessRequestOkBody response =
methodRegistry.createAccessRequestOkBody(0);
channel.sync();
connection.writeFrame(response.generateFrame(channelId));
}
Modified:
qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicPublishMethodHandler.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicPublishMethodHandler.java?rev=1628336&r1=1628335&r2=1628336&view=diff
==============================================================================
---
qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicPublishMethodHandler.java
(original)
+++
qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicPublishMethodHandler.java
Mon Sep 29 23:20:39 2014
@@ -28,6 +28,7 @@ import org.apache.qpid.AMQException;
import org.apache.qpid.framing.AMQShortString;
import org.apache.qpid.framing.BasicPublishBody;
import org.apache.qpid.framing.abstraction.MessagePublishInfo;
+import org.apache.qpid.framing.abstraction.MessagePublishInfoImpl;
import org.apache.qpid.protocol.AMQConstant;
import org.apache.qpid.server.message.MessageDestination;
import org.apache.qpid.server.protocol.v0_8.AMQChannel;
@@ -94,7 +95,10 @@ public class BasicPublishMethodHandler i
throw body.getChannelNotFoundException(channelId,
connection.getMethodRegistry());
}
- MessagePublishInfo info =
connection.getMethodRegistry().getProtocolVersionMethodConverter().convertToInfo(body);
+ MessagePublishInfo info = new
MessagePublishInfoImpl(body.getExchange(),
+
body.getImmediate(),
+
body.getMandatory(),
+
body.getRoutingKey());
info.setExchange(exchangeName);
try
{
Modified:
qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicRecoverMethodHandler.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicRecoverMethodHandler.java?rev=1628336&r1=1628335&r2=1628336&view=diff
==============================================================================
---
qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicRecoverMethodHandler.java
(original)
+++
qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicRecoverMethodHandler.java
Mon Sep 29 23:20:39 2014
@@ -25,8 +25,8 @@ import org.apache.log4j.Logger;
import org.apache.qpid.AMQException;
import org.apache.qpid.framing.AMQMethodBody;
import org.apache.qpid.framing.BasicRecoverBody;
+import org.apache.qpid.framing.MethodRegistry;
import org.apache.qpid.framing.ProtocolVersion;
-import org.apache.qpid.framing.amqp_8_0.MethodRegistry_8_0;
import org.apache.qpid.server.protocol.v0_8.AMQChannel;
import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
@@ -61,8 +61,8 @@ public class BasicRecoverMethodHandler i
// In Qpid 0-9 we create a separate sync-recover, sync-recover-ok pair
to be "more" compliant
if(connection.getProtocolVersion().equals(ProtocolVersion.v8_0))
{
- MethodRegistry_8_0 methodRegistry = (MethodRegistry_8_0)
connection.getMethodRegistry();
- AMQMethodBody recoverOk =
methodRegistry.createBasicRecoverOkBody();
+ MethodRegistry methodRegistry = connection.getMethodRegistry();
+ AMQMethodBody recoverOk =
methodRegistry.createBasicRecoverSyncOkBody();
channel.sync();
connection.writeFrame(recoverOk.generateFrame(channelId));
Modified:
qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicRecoverSyncMethodHandler.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicRecoverSyncMethodHandler.java?rev=1628336&r1=1628335&r2=1628336&view=diff
==============================================================================
---
qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicRecoverSyncMethodHandler.java
(original)
+++
qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/BasicRecoverSyncMethodHandler.java
Mon Sep 29 23:20:39 2014
@@ -26,9 +26,7 @@ import org.apache.log4j.Logger;
import org.apache.qpid.AMQException;
import org.apache.qpid.framing.AMQMethodBody;
import org.apache.qpid.framing.BasicRecoverSyncBody;
-import org.apache.qpid.framing.ProtocolVersion;
-import org.apache.qpid.framing.amqp_0_9.MethodRegistry_0_9;
-import org.apache.qpid.framing.amqp_0_91.MethodRegistry_0_91;
+import org.apache.qpid.framing.MethodRegistry;
import org.apache.qpid.server.protocol.v0_8.AMQChannel;
import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
@@ -60,22 +58,9 @@ public class BasicRecoverSyncMethodHandl
channel.sync();
channel.resend();
- // Qpid 0-8 hacks a synchronous -ok onto recover.
- // In Qpid 0-9 we create a separate sync-recover, sync-recover-ok pair
to be "more" compliant
- if(connection.getProtocolVersion().equals(ProtocolVersion.v0_9))
- {
- MethodRegistry_0_9 methodRegistry = (MethodRegistry_0_9)
connection.getMethodRegistry();
- AMQMethodBody recoverOk =
methodRegistry.createBasicRecoverSyncOkBody();
- connection.writeFrame(recoverOk.generateFrame(channelId));
-
- }
- else if(connection.getProtocolVersion().equals(ProtocolVersion.v0_91))
- {
- MethodRegistry_0_91 methodRegistry = (MethodRegistry_0_91)
connection.getMethodRegistry();
- AMQMethodBody recoverOk =
methodRegistry.createBasicRecoverSyncOkBody();
- connection.writeFrame(recoverOk.generateFrame(channelId));
-
- }
+ MethodRegistry methodRegistry = connection.getMethodRegistry();
+ AMQMethodBody recoverOk =
methodRegistry.createBasicRecoverSyncOkBody();
+ connection.writeFrame(recoverOk.generateFrame(channelId));
}
}
Modified:
qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelOpenHandler.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelOpenHandler.java?rev=1628336&r1=1628335&r2=1628336&view=diff
==============================================================================
---
qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelOpenHandler.java
(original)
+++
qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ChannelOpenHandler.java
Mon Sep 29 23:20:39 2014
@@ -20,26 +20,15 @@
*/
package org.apache.qpid.server.protocol.v0_8.handler;
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.UUID;
-
import org.apache.log4j.Logger;
import org.apache.qpid.AMQException;
import org.apache.qpid.framing.ChannelOpenBody;
import org.apache.qpid.framing.ChannelOpenOkBody;
-import org.apache.qpid.framing.MethodRegistry;
-import org.apache.qpid.framing.ProtocolVersion;
-import org.apache.qpid.framing.amqp_0_9.MethodRegistry_0_9;
-import org.apache.qpid.framing.amqp_0_91.MethodRegistry_0_91;
-import org.apache.qpid.framing.amqp_8_0.MethodRegistry_8_0;
import org.apache.qpid.protocol.AMQConstant;
import org.apache.qpid.server.protocol.v0_8.AMQChannel;
import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
import org.apache.qpid.server.protocol.v0_8.state.StateAwareMethodListener;
-import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
import org.apache.qpid.server.virtualhost.VirtualHostImpl;
public class ChannelOpenHandler implements
StateAwareMethodListener<ChannelOpenBody>
@@ -76,66 +65,9 @@ public class ChannelOpenHandler implemen
ChannelOpenOkBody response;
- ProtocolVersion pv = connection.getProtocolVersion();
- if(pv.equals(ProtocolVersion.v8_0))
- {
- MethodRegistry_8_0 methodRegistry = (MethodRegistry_8_0)
MethodRegistry.getMethodRegistry(ProtocolVersion.v8_0);
- response = methodRegistry.createChannelOpenOkBody();
+ response = connection.getMethodRegistry().createChannelOpenOkBody();
- }
- else if(pv.equals(ProtocolVersion.v0_9))
- {
- MethodRegistry_0_9 methodRegistry = (MethodRegistry_0_9)
MethodRegistry.getMethodRegistry(ProtocolVersion.v0_9);
- UUID uuid = UUID.randomUUID();
- ByteArrayOutputStream output = new ByteArrayOutputStream();
- DataOutputStream dataOut = new DataOutputStream(output);
- try
- {
- dataOut.writeLong(uuid.getMostSignificantBits());
- dataOut.writeLong(uuid.getLeastSignificantBits());
- dataOut.flush();
- dataOut.close();
- }
- catch (IOException e)
- {
- // This *really* shouldn't happen as we're not doing any I/O
- throw new ConnectionScopedRuntimeException("I/O exception when
writing to byte array", e);
- }
-
- // should really associate this channelId to the session
- byte[] channelName = output.toByteArray();
-
- response = methodRegistry.createChannelOpenOkBody(channelName);
- }
- else if(pv.equals(ProtocolVersion.v0_91))
- {
- MethodRegistry_0_91 methodRegistry = (MethodRegistry_0_91)
MethodRegistry.getMethodRegistry(ProtocolVersion.v0_91);
- UUID uuid = UUID.randomUUID();
- ByteArrayOutputStream output = new ByteArrayOutputStream();
- DataOutputStream dataOut = new DataOutputStream(output);
- try
- {
- dataOut.writeLong(uuid.getMostSignificantBits());
- dataOut.writeLong(uuid.getLeastSignificantBits());
- dataOut.flush();
- dataOut.close();
- }
- catch (IOException e)
- {
- // This *really* shouldn't happen as we're not doing any I/O
- throw new ConnectionScopedRuntimeException("I/O exception when
writing to byte array", e);
- }
-
- // should really associate this channelId to the session
- byte[] channelName = output.toByteArray();
-
- response = methodRegistry.createChannelOpenOkBody(channelName);
- }
- else
- {
- throw new AMQException(AMQConstant.INTERNAL_ERROR, "Got channel
open for protocol version not catered for: " + pv, null);
- }
connection.writeFrame(response.generateFrame(channelId));
Modified:
qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueUnbindHandler.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueUnbindHandler.java?rev=1628336&r1=1628335&r2=1628336&view=diff
==============================================================================
---
qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueUnbindHandler.java
(original)
+++
qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/QueueUnbindHandler.java
Mon Sep 29 23:20:39 2014
@@ -27,10 +27,8 @@ import org.apache.log4j.Logger;
import org.apache.qpid.AMQException;
import org.apache.qpid.framing.AMQMethodBody;
import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.MethodRegistry;
+import org.apache.qpid.framing.ProtocolVersion;
import org.apache.qpid.framing.QueueUnbindBody;
-import org.apache.qpid.framing.amqp_0_9.MethodRegistry_0_9;
-import org.apache.qpid.framing.amqp_0_91.MethodRegistry_0_91;
import org.apache.qpid.protocol.AMQConstant;
import org.apache.qpid.server.exchange.ExchangeImpl;
import org.apache.qpid.server.protocol.v0_8.AMQChannel;
@@ -58,6 +56,13 @@ public class QueueUnbindHandler implemen
QueueUnbindBody body,
int channelId) throws AMQException
{
+
+ if (ProtocolVersion.v8_0.equals(connection.getProtocolVersion()))
+ {
+ // 0-8 does not support QueueUnbind
+ throw new AMQException(AMQConstant.COMMAND_INVALID, "QueueUnbind
not present in AMQP version: " + connection.getProtocolVersion(), null);
+ }
+
VirtualHostImpl virtualHost = connection.getVirtualHost();
final AMQQueue queue;
@@ -133,21 +138,8 @@ public class QueueUnbindHandler implemen
_log.info("Binding queue " + queue + " to exchange " + exch + "
with routing key " + routingKey);
}
- final MethodRegistry registry = connection.getMethodRegistry();
- final AMQMethodBody responseBody;
- if (registry instanceof MethodRegistry_0_9)
- {
- responseBody =
((MethodRegistry_0_9)registry).createQueueUnbindOkBody();
- }
- else if (registry instanceof MethodRegistry_0_91)
- {
- responseBody =
((MethodRegistry_0_91)registry).createQueueUnbindOkBody();
- }
- else
- {
- // 0-8 does not support QueueUnbind
- throw new AMQException(AMQConstant.COMMAND_INVALID, "QueueUnbind
not present in AMQP version: " + connection.getProtocolVersion(), null);
- }
+
+ final AMQMethodBody responseBody =
connection.getMethodRegistry().createQueueUnbindOkBody();
channel.sync();
connection.writeFrame(responseBody.generateFrame(channelId));
}
Modified:
qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl.java?rev=1628336&r1=1628335&r2=1628336&view=diff
==============================================================================
---
qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl.java
(original)
+++
qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl.java
Mon Sep 29 23:20:39 2014
@@ -186,6 +186,21 @@ public class ServerMethodDispatcherImpl
throw new UnexpectedMethodException(body);
}
+ @Override
+ public boolean dispatchQueueUnbindOk(final QueueUnbindOkBody body, final
int channelId)
+ throws AMQException
+ {
+ throw new UnexpectedMethodException(body);
+ }
+
+ @Override
+ public boolean dispatchBasicRecoverSyncOk(final BasicRecoverSyncOkBody
body,
+ final int channelId)
+ throws AMQException
+ {
+ throw new UnexpectedMethodException(body);
+ }
+
public boolean dispatchBasicCancelOk(BasicCancelOkBody body, int
channelId) throws AMQException
{
throw new UnexpectedMethodException(body);
@@ -434,7 +449,11 @@ public class ServerMethodDispatcherImpl
return true;
}
-
+ @Override
+ public boolean dispatchQueueUnbind(final QueueUnbindBody queueUnbindBody,
final int channelId) throws AMQException
+ {
+ return false;
+ }
}
Modified:
qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl_8_0.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl_8_0.java?rev=1628336&r1=1628335&r2=1628336&view=diff
==============================================================================
---
qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl_8_0.java
(original)
+++
qpid/branches/QPID-6125-ProtocolRefactoring/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/handler/ServerMethodDispatcherImpl_8_0.java
Mon Sep 29 23:20:39 2014
@@ -21,8 +21,10 @@
package org.apache.qpid.server.protocol.v0_8.handler;
import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.BasicRecoverOkBody;
+import org.apache.qpid.framing.BasicRecoverSyncOkBody;
import org.apache.qpid.framing.ChannelAlertBody;
+import org.apache.qpid.framing.QueueUnbindBody;
+import org.apache.qpid.framing.QueueUnbindOkBody;
import org.apache.qpid.framing.amqp_8_0.MethodDispatcher_8_0;
import org.apache.qpid.server.protocol.v0_8.AMQProtocolSession;
@@ -35,14 +37,27 @@ public class ServerMethodDispatcherImpl_
super(connection);
}
- public boolean dispatchBasicRecoverOk(BasicRecoverOkBody body, int
channelId) throws AMQException
+ public boolean dispatchChannelAlert(ChannelAlertBody body, int channelId)
throws AMQException
{
throw new UnexpectedMethodException(body);
}
- public boolean dispatchChannelAlert(ChannelAlertBody body, int channelId)
throws AMQException
+ @Override
+ public boolean dispatchQueueUnbindOk(final QueueUnbindOkBody
queueUnbindOkBody, final int channelId)
+ {
+ return false;
+ }
+
+ @Override
+ public boolean dispatchBasicRecoverSyncOk(final BasicRecoverSyncOkBody
body,
+ final int channelId) throws
AMQException
{
throw new UnexpectedMethodException(body);
}
+ @Override
+ public boolean dispatchQueueUnbind(final QueueUnbindBody queueUnbindBody,
final int channelId) throws AMQException
+ {
+ return false;
+ }
}
Modified:
qpid/branches/QPID-6125-ProtocolRefactoring/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java?rev=1628336&r1=1628335&r2=1628336&view=diff
==============================================================================
---
qpid/branches/QPID-6125-ProtocolRefactoring/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java
(original)
+++
qpid/branches/QPID-6125-ProtocolRefactoring/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java
Mon Sep 29 23:20:39 2014
@@ -61,8 +61,6 @@ import org.apache.qpid.client.state.list
import org.apache.qpid.common.AMQPFilterTypes;
import org.apache.qpid.configuration.ClientProperties;
import org.apache.qpid.framing.*;
-import org.apache.qpid.framing.amqp_0_9.MethodRegistry_0_9;
-import org.apache.qpid.framing.amqp_0_91.MethodRegistry_0_91;
import org.apache.qpid.jms.Session;
import org.apache.qpid.protocol.AMQConstant;
import org.apache.qpid.protocol.AMQMethodEvent;
@@ -314,21 +312,12 @@ public class AMQSession_0_8 extends AMQS
if(getProtocolHandler().getProtocolVersion().equals(ProtocolVersion.v8_0))
{
BasicRecoverBody body =
getMethodRegistry().createBasicRecoverBody(false);
-
getAMQConnection().getProtocolHandler().syncWrite(body.generateFrame(getChannelId()),
BasicRecoverOkBody.class);
- }
- else if(getProtocolVersion().equals(ProtocolVersion.v0_9))
- {
- BasicRecoverSyncBody body =
((MethodRegistry_0_9)getMethodRegistry()).createBasicRecoverSyncBody(false);
-
getAMQConnection().getProtocolHandler().syncWrite(body.generateFrame(getChannelId()),
BasicRecoverSyncOkBody.class);
- }
- else if(getProtocolVersion().equals(ProtocolVersion.v0_91))
- {
- BasicRecoverSyncBody body =
((MethodRegistry_0_91)getMethodRegistry()).createBasicRecoverSyncBody(false);
getAMQConnection().getProtocolHandler().syncWrite(body.generateFrame(getChannelId()),
BasicRecoverSyncOkBody.class);
}
else
{
- throw new RuntimeException("Unsupported version of the AMQP
Protocol: " + getProtocolVersion());
+ BasicRecoverSyncBody body =
getMethodRegistry().createBasicRecoverSyncBody(false);
+
getAMQConnection().getProtocolHandler().syncWrite(body.generateFrame(getChannelId()),
BasicRecoverSyncOkBody.class);
}
}
}
@@ -1145,33 +1134,22 @@ public class AMQSession_0_8 extends AMQS
if (isBound(null, AMQShortString.valueOf(queue), null))
{
- MethodRegistry methodRegistry =
getProtocolHandler().getMethodRegistry();
- AMQMethodBody body;
- if (methodRegistry instanceof MethodRegistry_0_9)
+
+ if(ProtocolVersion.v8_0.equals(getProtocolVersion()))
{
- String bindingKey = binding.getBindingKey() == null ?
queue : binding.getBindingKey();
+ throw new AMQException(AMQConstant.NOT_IMPLEMENTED,
"Cannot unbind a queue in AMQP 0-8");
+ }
- MethodRegistry_0_9 methodRegistry_0_9 =
(MethodRegistry_0_9) methodRegistry;
- body =
methodRegistry_0_9.createQueueUnbindBody(getTicket(),
+ MethodRegistry methodRegistry =
getProtocolHandler().getMethodRegistry();
+
+ String bindingKey = binding.getBindingKey() == null ?
queue : binding.getBindingKey();
+
+ AMQMethodBody body =
methodRegistry.createQueueUnbindBody(getTicket(),
AMQShortString.valueOf(queue),
AMQShortString.valueOf(exchange),
AMQShortString.valueOf(bindingKey),
null);
- }
- else if (methodRegistry instanceof MethodRegistry_0_91)
- {
- MethodRegistry_0_91 methodRegistry_0_91 =
(MethodRegistry_0_91) methodRegistry;
- body =
methodRegistry_0_91.createQueueUnbindBody(getTicket(),
-
AMQShortString.valueOf(queue),
-
AMQShortString.valueOf(exchange),
-
AMQShortString.valueOf(binding.getBindingKey()),
- null);
- }
- else
- {
- throw new AMQException(AMQConstant.NOT_IMPLEMENTED,
"Cannot unbind a queue in AMQP 0-8");
- }
getProtocolHandler().syncWrite(body.generateFrame(getChannelId()),
QueueUnbindOkBody.class);
return null;
}
Modified:
qpid/branches/QPID-6125-ProtocolRefactoring/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl.java?rev=1628336&r1=1628335&r2=1628336&view=diff
==============================================================================
---
qpid/branches/QPID-6125-ProtocolRefactoring/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl.java
(original)
+++
qpid/branches/QPID-6125-ProtocolRefactoring/java/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl.java
Mon Sep 29 23:20:39 2014
@@ -125,6 +125,21 @@ public class ClientMethodDispatcherImpl
return false;
}
+ @Override
+ public boolean dispatchQueueUnbindOk(final QueueUnbindOkBody body, final
int channelId)
+ throws AMQException
+ {
+ throw new AMQMethodNotImplementedException(body);
+ }
+
+ @Override
+ public boolean dispatchBasicRecoverSyncOk(final BasicRecoverSyncOkBody
basicRecoverSyncOkBody,
+ final int channelId)
+ throws AMQException
+ {
+ return false;
+ }
+
public boolean dispatchBasicCancelOk(BasicCancelOkBody body, int
channelId) throws AMQException
{
_basicCancelOkMethodHandler.methodReceived(_session, body, channelId);
@@ -365,6 +380,12 @@ public class ClientMethodDispatcherImpl
throw new AMQMethodNotImplementedException(body);
}
+ @Override
+ public boolean dispatchQueueUnbind(final QueueUnbindBody queueUnbindBody,
final int channelId) throws AMQException
+ {
+ return false;
+ }
+
public boolean dispatchExchangeBoundOk(ExchangeBoundOkBody body, int
channelId) throws AMQException
{
_exchangeBoundOkMethodHandler.methodReceived(_session, body,
channelId);
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=1628336&r1=1628335&r2=1628336&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
Mon Sep 29 23:20:39 2014
@@ -22,8 +22,11 @@
import org.apache.qpid.AMQException;
import org.apache.qpid.client.protocol.AMQProtocolSession;
-import org.apache.qpid.framing.BasicRecoverOkBody;
+import org.apache.qpid.client.state.AMQMethodNotImplementedException;
+import org.apache.qpid.framing.BasicRecoverSyncOkBody;
import org.apache.qpid.framing.ChannelAlertBody;
+import org.apache.qpid.framing.QueueUnbindBody;
+import org.apache.qpid.framing.QueueUnbindOkBody;
import org.apache.qpid.framing.amqp_8_0.MethodDispatcher_8_0;
public class ClientMethodDispatcherImpl_8_0 extends ClientMethodDispatcherImpl
implements MethodDispatcher_8_0
@@ -33,14 +36,27 @@ public class ClientMethodDispatcherImpl_
super(session);
}
- public boolean dispatchBasicRecoverOk(BasicRecoverOkBody body, int
channelId) throws AMQException
+ public boolean dispatchChannelAlert(ChannelAlertBody body, int channelId)
throws AMQException
{
return false;
}
- public boolean dispatchChannelAlert(ChannelAlertBody body, int channelId)
throws AMQException
+ @Override
+ public boolean dispatchQueueUnbindOk(final QueueUnbindOkBody
queueUnbindOkBody, final int channelId)
+ {
+ return false;
+ }
+
+ @Override
+ public boolean dispatchBasicRecoverSyncOk(final BasicRecoverSyncOkBody
basicRecoverSyncOkBody,
+ final int channelId)
{
return false;
}
+ @Override
+ public boolean dispatchQueueUnbind(final QueueUnbindBody body, final int
channelId) throws AMQException
+ {
+ throw new AMQMethodNotImplementedException(body);
+ }
}
Modified:
qpid/branches/QPID-6125-ProtocolRefactoring/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java?rev=1628336&r1=1628335&r2=1628336&view=diff
==============================================================================
---
qpid/branches/QPID-6125-ProtocolRefactoring/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
(original)
+++
qpid/branches/QPID-6125-ProtocolRefactoring/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
Mon Sep 29 23:20:39 2014
@@ -753,8 +753,12 @@ public class AMQProtocolHandler implemen
// Connection is already closed then don't do a syncWrite
try
{
- final ConnectionCloseBody body =
_protocolSession.getMethodRegistry().createConnectionCloseBody(AMQConstant.REPLY_SUCCESS.getCode(),
// replyCode
- new AMQShortString("JMS client is closing the
connection."), 0, 0);
+ final ConnectionCloseBody body =
_protocolSession.getMethodRegistry().createConnectionCloseBody(
+ AMQConstant.REPLY_SUCCESS.getCode(),
+ // replyCode
+ new AMQShortString("JMS client is closing the
connection."),
+ 0,
+ 0);
final AMQFrame frame = body.generateFrame(0);
syncWrite(frame, ConnectionCloseOkBody.class, timeout);
Modified:
qpid/branches/QPID-6125-ProtocolRefactoring/java/client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java?rev=1628336&r1=1628335&r2=1628336&view=diff
==============================================================================
---
qpid/branches/QPID-6125-ProtocolRefactoring/java/client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java
(original)
+++
qpid/branches/QPID-6125-ProtocolRefactoring/java/client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java
Mon Sep 29 23:20:39 2014
@@ -20,6 +20,9 @@
*/
package org.apache.qpid.client.protocol;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
import junit.framework.TestCase;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -32,12 +35,10 @@ import org.apache.qpid.client.transport.
import org.apache.qpid.framing.AMQBody;
import org.apache.qpid.framing.AMQFrame;
import org.apache.qpid.framing.AMQMethodBody;
-import org.apache.qpid.framing.amqp_8_0.BasicRecoverOkBodyImpl;
+import org.apache.qpid.framing.BasicRecoverSyncOkBody;
+import org.apache.qpid.framing.ProtocolVersion;
import org.apache.qpid.protocol.AMQConstant;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
/**
* This is a test address QPID-1431 where frame listeners would fail to be
notified of an incomming exception.
*
@@ -75,7 +76,7 @@ public class AMQProtocolHandlerTest exte
//Create a new ProtocolHandler with a fake connection.
_handler = new AMQProtocolHandler(new
MockAMQConnection("amqp://guest:guest@client/test?brokerlist='tcp://localhost:1'"));
_handler.setNetworkConnection(new TestNetworkConnection());
- AMQBody body = BasicRecoverOkBodyImpl.getFactory().newInstance(null,
1);
+ AMQBody body = new BasicRecoverSyncOkBody(ProtocolVersion.v8_0);
_blockFrame = new AMQFrame(0, body);
_handleCountDown = new CountDownLatch(1);
Copied:
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/AccessRequestBody.java
(from r1628074,
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/AccessRequestBody.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/AccessRequestBody.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/AccessRequestBodyImpl.java&r1=1628074&r2=1628336&rev=1628336&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/AccessRequestBody.java
Mon Sep 29 23:20:39 2014
@@ -25,35 +25,16 @@
* 8-0
*/
-package org.apache.qpid.framing.amqp_8_0;
+package org.apache.qpid.framing;
import java.io.DataOutput;
import java.io.IOException;
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 AMQMethodBodyImpl implements
AccessRequestBody
+public class AccessRequestBody extends AMQMethodBodyImpl implements
EncodableAMQDataBlock, AMQMethodBody
{
- private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new
AMQMethodBodyInstanceFactory()
- {
- public AMQMethodBody newInstance(MarkableDataInput in, long size)
throws AMQFrameDecodingException, IOException
- {
- return new AccessRequestBodyImpl(in);
- }
- };
-
- public static AMQMethodBodyInstanceFactory getFactory()
- {
- return FACTORY_INSTANCE;
- }
public static final int CLASS_ID = 30;
public static final int METHOD_ID = 10;
@@ -63,19 +44,19 @@ public class AccessRequestBodyImpl exten
private final byte _bitfield0; // [exclusive, passive, active, write, read]
// Constructor
- public AccessRequestBodyImpl(MarkableDataInput buffer) throws
AMQFrameDecodingException, IOException
+ public AccessRequestBody(MarkableDataInput buffer) throws
AMQFrameDecodingException, IOException
{
_realm = readAMQShortString( buffer );
_bitfield0 = readBitfield( buffer );
}
- public AccessRequestBodyImpl(
- AMQShortString realm,
- boolean exclusive,
- boolean passive,
- boolean active,
- boolean write,
- boolean read
+ public AccessRequestBody(
+ AMQShortString realm,
+ boolean exclusive,
+ boolean passive,
+ boolean active,
+ boolean write,
+ boolean read
)
{
_realm = realm;
@@ -157,7 +138,7 @@ public class AccessRequestBodyImpl exten
public boolean execute(MethodDispatcher dispatcher, int channelId) throws
AMQException
{
- return ((MethodDispatcher_8_0)dispatcher).dispatchAccessRequest(this,
channelId);
+ return dispatcher.dispatchAccessRequest(this, channelId);
}
public String toString()
Copied:
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/AccessRequestOkBody.java
(from r1628074,
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/AccessRequestOkBody.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/AccessRequestOkBody.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/AccessRequestOkBodyImpl.java&r1=1628074&r2=1628336&rev=1628336&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/AccessRequestOkBody.java
Mon Sep 29 23:20:39 2014
@@ -25,29 +25,16 @@
* 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 AccessRequestOkBodyImpl extends AMQMethodBodyImpl implements
AccessRequestOkBody
+public class AccessRequestOkBody extends AMQMethodBodyImpl implements
EncodableAMQDataBlock, AMQMethodBody
{
- private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new
AMQMethodBodyInstanceFactory()
- {
- public AMQMethodBody newInstance(MarkableDataInput in, long size)
throws AMQFrameDecodingException, IOException
- {
- return new AccessRequestOkBodyImpl(in);
- }
- };
-
- public static AMQMethodBodyInstanceFactory getFactory()
- {
- return FACTORY_INSTANCE;
- }
public static final int CLASS_ID = 30;
public static final int METHOD_ID = 11;
@@ -56,14 +43,14 @@ public class AccessRequestOkBodyImpl ext
private final int _ticket; // [ticket]
// Constructor
- public AccessRequestOkBodyImpl(MarkableDataInput buffer) throws
AMQFrameDecodingException, IOException
+ public AccessRequestOkBody(MarkableDataInput buffer) throws
AMQFrameDecodingException, IOException
{
_ticket = readUnsignedShort( buffer );
}
- public AccessRequestOkBodyImpl(
- int ticket
- )
+ public AccessRequestOkBody(
+ int ticket
+ )
{
_ticket = ticket;
}
@@ -96,7 +83,7 @@ public class AccessRequestOkBodyImpl ext
public boolean execute(MethodDispatcher dispatcher, int channelId) throws
AMQException
{
- return ((MethodDispatcher_8_0)dispatcher).dispatchAccessRequestOk(this,
channelId);
+ return dispatcher.dispatchAccessRequestOk(this, channelId);
}
public String toString()
Modified:
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicAckBody.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicAckBody.java?rev=1628336&r1=1628335&r2=1628336&view=diff
==============================================================================
---
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicAckBody.java
(original)
+++
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicAckBody.java
Mon Sep 29 23:20:39 2014
@@ -35,18 +35,6 @@ import org.apache.qpid.codec.MarkableDat
public class BasicAckBody extends AMQMethodBodyImpl implements
EncodableAMQDataBlock, AMQMethodBody
{
- private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new
AMQMethodBodyInstanceFactory()
- {
- public AMQMethodBody newInstance(MarkableDataInput in, long size)
throws AMQFrameDecodingException, IOException
- {
- return new BasicAckBody(in);
- }
- };
-
- public static AMQMethodBodyInstanceFactory getFactory()
- {
- return FACTORY_INSTANCE;
- }
public static final int CLASS_ID = 60;
public static final int METHOD_ID = 80;
Modified:
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicCancelBody.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicCancelBody.java?rev=1628336&r1=1628335&r2=1628336&view=diff
==============================================================================
---
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicCancelBody.java
(original)
+++
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicCancelBody.java
Mon Sep 29 23:20:39 2014
@@ -35,18 +35,6 @@ import org.apache.qpid.codec.MarkableDat
public class BasicCancelBody extends AMQMethodBodyImpl implements
EncodableAMQDataBlock, AMQMethodBody
{
- private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new
AMQMethodBodyInstanceFactory()
- {
- public AMQMethodBody newInstance(MarkableDataInput in, long size)
throws AMQFrameDecodingException, IOException
- {
- return new BasicCancelBody(in);
- }
- };
-
- public static AMQMethodBodyInstanceFactory getFactory()
- {
- return FACTORY_INSTANCE;
- }
public static final int CLASS_ID = 60;
public static final int METHOD_ID = 30;
Modified:
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicCancelOkBody.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicCancelOkBody.java?rev=1628336&r1=1628335&r2=1628336&view=diff
==============================================================================
---
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicCancelOkBody.java
(original)
+++
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicCancelOkBody.java
Mon Sep 29 23:20:39 2014
@@ -35,18 +35,6 @@ import org.apache.qpid.codec.MarkableDat
public class BasicCancelOkBody extends AMQMethodBodyImpl implements
EncodableAMQDataBlock, AMQMethodBody
{
- private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new
AMQMethodBodyInstanceFactory()
- {
- public AMQMethodBody newInstance(MarkableDataInput in, long size)
throws AMQFrameDecodingException, IOException
- {
- return new BasicCancelOkBody(in);
- }
- };
-
- public static AMQMethodBodyInstanceFactory getFactory()
- {
- return FACTORY_INSTANCE;
- }
public static final int CLASS_ID = 60;
public static final int METHOD_ID = 31;
Modified:
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicConsumeBody.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicConsumeBody.java?rev=1628336&r1=1628335&r2=1628336&view=diff
==============================================================================
---
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicConsumeBody.java
(original)
+++
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicConsumeBody.java
Mon Sep 29 23:20:39 2014
@@ -35,18 +35,6 @@ import org.apache.qpid.codec.MarkableDat
public class BasicConsumeBody extends AMQMethodBodyImpl implements
EncodableAMQDataBlock, AMQMethodBody
{
- private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new
AMQMethodBodyInstanceFactory()
- {
- public AMQMethodBody newInstance(MarkableDataInput in, long size)
throws AMQFrameDecodingException, IOException
- {
- return new BasicConsumeBody(in);
- }
- };
-
- public static AMQMethodBodyInstanceFactory getFactory()
- {
- return FACTORY_INSTANCE;
- }
public static final int CLASS_ID = 60;
public static final int METHOD_ID = 20;
Modified:
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicConsumeOkBody.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicConsumeOkBody.java?rev=1628336&r1=1628335&r2=1628336&view=diff
==============================================================================
---
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicConsumeOkBody.java
(original)
+++
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicConsumeOkBody.java
Mon Sep 29 23:20:39 2014
@@ -35,18 +35,6 @@ import org.apache.qpid.codec.MarkableDat
public class BasicConsumeOkBody extends AMQMethodBodyImpl implements
EncodableAMQDataBlock, AMQMethodBody
{
- private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new
AMQMethodBodyInstanceFactory()
- {
- public AMQMethodBody newInstance(MarkableDataInput in, long size)
throws AMQFrameDecodingException, IOException
- {
- return new BasicConsumeOkBody(in);
- }
- };
-
- public static AMQMethodBodyInstanceFactory getFactory()
- {
- return FACTORY_INSTANCE;
- }
public static final int CLASS_ID = 60;
public static final int METHOD_ID = 21;
Modified:
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicDeliverBody.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicDeliverBody.java?rev=1628336&r1=1628335&r2=1628336&view=diff
==============================================================================
---
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicDeliverBody.java
(original)
+++
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicDeliverBody.java
Mon Sep 29 23:20:39 2014
@@ -35,18 +35,6 @@ import org.apache.qpid.codec.MarkableDat
public class BasicDeliverBody extends AMQMethodBodyImpl implements
EncodableAMQDataBlock, AMQMethodBody
{
- private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new
AMQMethodBodyInstanceFactory()
- {
- public AMQMethodBody newInstance(MarkableDataInput in, long size)
throws AMQFrameDecodingException, IOException
- {
- return new BasicDeliverBody(in);
- }
- };
-
- public static AMQMethodBodyInstanceFactory getFactory()
- {
- return FACTORY_INSTANCE;
- }
public static final int CLASS_ID = 60;
public static final int METHOD_ID = 60;
Modified:
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicGetBody.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicGetBody.java?rev=1628336&r1=1628335&r2=1628336&view=diff
==============================================================================
---
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicGetBody.java
(original)
+++
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicGetBody.java
Mon Sep 29 23:20:39 2014
@@ -35,18 +35,6 @@ import org.apache.qpid.codec.MarkableDat
public class BasicGetBody extends AMQMethodBodyImpl implements
EncodableAMQDataBlock, AMQMethodBody
{
- private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new
AMQMethodBodyInstanceFactory()
- {
- public AMQMethodBody newInstance(MarkableDataInput in, long size)
throws AMQFrameDecodingException, IOException
- {
- return new BasicGetBody(in);
- }
- };
-
- public static AMQMethodBodyInstanceFactory getFactory()
- {
- return FACTORY_INSTANCE;
- }
public static final int CLASS_ID = 60;
public static final int METHOD_ID = 70;
Modified:
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicGetEmptyBody.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicGetEmptyBody.java?rev=1628336&r1=1628335&r2=1628336&view=diff
==============================================================================
---
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicGetEmptyBody.java
(original)
+++
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicGetEmptyBody.java
Mon Sep 29 23:20:39 2014
@@ -35,18 +35,6 @@ import org.apache.qpid.codec.MarkableDat
public class BasicGetEmptyBody extends AMQMethodBodyImpl implements
EncodableAMQDataBlock, AMQMethodBody
{
- private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new
AMQMethodBodyInstanceFactory()
- {
- public AMQMethodBody newInstance(MarkableDataInput in, long size)
throws AMQFrameDecodingException, IOException
- {
- return new BasicGetEmptyBody(in);
- }
- };
-
- public static AMQMethodBodyInstanceFactory getFactory()
- {
- return FACTORY_INSTANCE;
- }
public static final int CLASS_ID = 60;
public static final int METHOD_ID = 72;
Modified:
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicGetOkBody.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicGetOkBody.java?rev=1628336&r1=1628335&r2=1628336&view=diff
==============================================================================
---
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicGetOkBody.java
(original)
+++
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicGetOkBody.java
Mon Sep 29 23:20:39 2014
@@ -35,18 +35,6 @@ import org.apache.qpid.codec.MarkableDat
public class BasicGetOkBody extends AMQMethodBodyImpl implements
EncodableAMQDataBlock, AMQMethodBody
{
- private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new
AMQMethodBodyInstanceFactory()
- {
- public AMQMethodBody newInstance(MarkableDataInput in, long size)
throws AMQFrameDecodingException, IOException
- {
- return new BasicGetOkBody(in);
- }
- };
-
- public static AMQMethodBodyInstanceFactory getFactory()
- {
- return FACTORY_INSTANCE;
- }
public static final int CLASS_ID = 60;
public static final int METHOD_ID = 71;
Modified:
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicPublishBody.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicPublishBody.java?rev=1628336&r1=1628335&r2=1628336&view=diff
==============================================================================
---
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicPublishBody.java
(original)
+++
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicPublishBody.java
Mon Sep 29 23:20:39 2014
@@ -35,18 +35,6 @@ import org.apache.qpid.codec.MarkableDat
public class BasicPublishBody extends AMQMethodBodyImpl implements
EncodableAMQDataBlock, AMQMethodBody
{
- private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new
AMQMethodBodyInstanceFactory()
- {
- public AMQMethodBody newInstance(MarkableDataInput in, long size)
throws AMQFrameDecodingException, IOException
- {
- return new BasicPublishBody(in);
- }
- };
-
- public static AMQMethodBodyInstanceFactory getFactory()
- {
- return FACTORY_INSTANCE;
- }
public static final int CLASS_ID = 60;
public static final int METHOD_ID = 40;
Modified:
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicQosBody.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicQosBody.java?rev=1628336&r1=1628335&r2=1628336&view=diff
==============================================================================
---
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicQosBody.java
(original)
+++
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicQosBody.java
Mon Sep 29 23:20:39 2014
@@ -35,18 +35,6 @@ import org.apache.qpid.codec.MarkableDat
public class BasicQosBody extends AMQMethodBodyImpl implements
EncodableAMQDataBlock, AMQMethodBody
{
- private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new
AMQMethodBodyInstanceFactory()
- {
- public AMQMethodBody newInstance(MarkableDataInput in, long size)
throws AMQFrameDecodingException, IOException
- {
- return new BasicQosBody(in);
- }
- };
-
- public static AMQMethodBodyInstanceFactory getFactory()
- {
- return FACTORY_INSTANCE;
- }
public static final int CLASS_ID = 60;
public static final int METHOD_ID = 10;
Modified:
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicQosOkBody.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicQosOkBody.java?rev=1628336&r1=1628335&r2=1628336&view=diff
==============================================================================
---
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicQosOkBody.java
(original)
+++
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicQosOkBody.java
Mon Sep 29 23:20:39 2014
@@ -35,18 +35,6 @@ import org.apache.qpid.codec.MarkableDat
public class BasicQosOkBody extends AMQMethodBodyImpl implements
EncodableAMQDataBlock, AMQMethodBody
{
- private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new
AMQMethodBodyInstanceFactory()
- {
- public AMQMethodBody newInstance(MarkableDataInput in, long size)
throws AMQFrameDecodingException, IOException
- {
- return new BasicQosOkBody(in);
- }
- };
-
- public static AMQMethodBodyInstanceFactory getFactory()
- {
- return FACTORY_INSTANCE;
- }
public static final int CLASS_ID = 60;
public static final int METHOD_ID = 11;
Modified:
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverBody.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverBody.java?rev=1628336&r1=1628335&r2=1628336&view=diff
==============================================================================
---
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverBody.java
(original)
+++
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverBody.java
Mon Sep 29 23:20:39 2014
@@ -35,18 +35,6 @@ import org.apache.qpid.codec.MarkableDat
public class BasicRecoverBody extends AMQMethodBodyImpl implements
EncodableAMQDataBlock, AMQMethodBody
{
- private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new
AMQMethodBodyInstanceFactory()
- {
- public AMQMethodBody newInstance(MarkableDataInput in, long size)
throws AMQFrameDecodingException, IOException
- {
- return new BasicRecoverBody(in);
- }
- };
-
- public static AMQMethodBodyInstanceFactory getFactory()
- {
- return FACTORY_INSTANCE;
- }
public static final int CLASS_ID = 60;
public static final int METHOD_ID = 100;
Copied:
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverSyncBody.java
(from r1628074,
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/BasicRecoverSyncBody.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverSyncBody.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicRecoverSyncBodyImpl.java&r1=1628074&r2=1628336&rev=1628336&view=diff
==============================================================================
---
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicRecoverSyncBodyImpl.java
(original)
+++
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverSyncBody.java
Mon Sep 29 23:20:39 2014
@@ -25,46 +25,37 @@
* 0-91
*/
-package org.apache.qpid.framing.amqp_0_91;
+package org.apache.qpid.framing;
-import org.apache.qpid.codec.MarkableDataInput;
import java.io.DataOutput;
import java.io.IOException;
-import org.apache.qpid.framing.*;
import org.apache.qpid.AMQException;
+import org.apache.qpid.codec.MarkableDataInput;
+import org.apache.qpid.framing.amqp_0_91.MethodDispatcher_0_91;
-public class BasicRecoverSyncBodyImpl extends AMQMethodBodyImpl implements
BasicRecoverSyncBody
+public class BasicRecoverSyncBody extends AMQMethodBodyImpl implements
EncodableAMQDataBlock, AMQMethodBody
{
- private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new
AMQMethodBodyInstanceFactory()
- {
- public AMQMethodBody newInstance(MarkableDataInput in, long size)
throws AMQFrameDecodingException, IOException
- {
- return new BasicRecoverSyncBodyImpl(in);
- }
- };
-
- public static AMQMethodBodyInstanceFactory getFactory()
- {
- return FACTORY_INSTANCE;
- }
+ private int _methodId;
public static final int CLASS_ID = 60;
- public static final int METHOD_ID = 110;
// Fields declared in specification
private final byte _bitfield0; // [requeue]
// Constructor
- public BasicRecoverSyncBodyImpl(MarkableDataInput buffer) throws
AMQFrameDecodingException, IOException
+ public BasicRecoverSyncBody(MarkableDataInput buffer, ProtocolVersion
protocolVersion) throws AMQFrameDecodingException, IOException
{
+ _methodId = ProtocolVersion.v0_9.equals(protocolVersion) ? 102 : 110;
_bitfield0 = readBitfield( buffer );
}
- public BasicRecoverSyncBodyImpl(
+ public BasicRecoverSyncBody(ProtocolVersion protocolVersion,
boolean requeue
- )
+ )
{
+ _methodId = ProtocolVersion.v0_9.equals(protocolVersion) ? 102 : 110;
+
byte bitfield0 = (byte)0;
if( requeue )
{
@@ -80,7 +71,7 @@ public class BasicRecoverSyncBodyImpl ex
public int getMethod()
{
- return METHOD_ID;
+ return _methodId;
}
public final boolean getRequeue()
Copied:
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverSyncOkBody.java
(from r1628074,
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/BasicRecoverSyncOkBody.java?p2=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverSyncOkBody.java&p1=qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicRecoverSyncOkBodyImpl.java&r1=1628074&r2=1628336&rev=1628336&view=diff
==============================================================================
---
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/BasicRecoverSyncOkBodyImpl.java
(original)
+++
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicRecoverSyncOkBody.java
Mon Sep 29 23:20:39 2014
@@ -25,44 +25,35 @@
* 0-91
*/
-package org.apache.qpid.framing.amqp_0_91;
+package org.apache.qpid.framing;
-import org.apache.qpid.codec.MarkableDataInput;
import java.io.DataOutput;
import java.io.IOException;
-import org.apache.qpid.framing.*;
import org.apache.qpid.AMQException;
+import org.apache.qpid.codec.MarkableDataInput;
-public class BasicRecoverSyncOkBodyImpl extends AMQMethodBodyImpl implements
BasicRecoverSyncOkBody
+public class BasicRecoverSyncOkBody extends AMQMethodBodyImpl implements
EncodableAMQDataBlock, AMQMethodBody
{
- private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new
AMQMethodBodyInstanceFactory()
- {
- public AMQMethodBody newInstance(MarkableDataInput in, long size)
throws AMQFrameDecodingException, IOException
- {
- return new BasicRecoverSyncOkBodyImpl(in);
- }
- };
-
- public static AMQMethodBodyInstanceFactory getFactory()
- {
- return FACTORY_INSTANCE;
- }
public static final int CLASS_ID = 60;
- public static final int METHOD_ID = 111;
+ public final int _ownMethodId;
// Fields declared in specification
// Constructor
- public BasicRecoverSyncOkBodyImpl(MarkableDataInput buffer) throws
AMQFrameDecodingException, IOException
+ public BasicRecoverSyncOkBody(ProtocolVersion protocolVersion)
{
+ if(ProtocolVersion.v0_91.equals(protocolVersion))
+ {
+ _ownMethodId = 111;
+ }
+ else
+ {
+ _ownMethodId = 101;
+ }
}
- public BasicRecoverSyncOkBodyImpl(
- )
- {
- }
public int getClazz()
{
@@ -71,14 +62,13 @@ public class BasicRecoverSyncOkBodyImpl
public int getMethod()
{
- return METHOD_ID;
+ return _ownMethodId;
}
protected int getBodySize()
{
- int size = 0;
- return size;
+ return 0;
}
public void writeMethodPayload(DataOutput buffer) throws IOException
@@ -87,14 +77,12 @@ public class BasicRecoverSyncOkBodyImpl
public boolean execute(MethodDispatcher dispatcher, int channelId) throws
AMQException
{
- return
((MethodDispatcher_0_91)dispatcher).dispatchBasicRecoverSyncOk(this, channelId);
+ return dispatcher.dispatchBasicRecoverSyncOk(this, channelId);
}
public String toString()
{
- StringBuilder buf = new StringBuilder("[BasicRecoverSyncOkBodyImpl: ");
- buf.append("]");
- return buf.toString();
+ return "[BasicRecoverSyncOkBody]";
}
}
Modified:
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicRejectBody.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicRejectBody.java?rev=1628336&r1=1628335&r2=1628336&view=diff
==============================================================================
---
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicRejectBody.java
(original)
+++
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicRejectBody.java
Mon Sep 29 23:20:39 2014
@@ -35,18 +35,6 @@ import org.apache.qpid.codec.MarkableDat
public class BasicRejectBody extends AMQMethodBodyImpl implements
EncodableAMQDataBlock, AMQMethodBody
{
- private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new
AMQMethodBodyInstanceFactory()
- {
- public AMQMethodBody newInstance(MarkableDataInput in, long size)
throws AMQFrameDecodingException, IOException
- {
- return new BasicRejectBody(in);
- }
- };
-
- public static AMQMethodBodyInstanceFactory getFactory()
- {
- return FACTORY_INSTANCE;
- }
public static final int CLASS_ID = 60;
public static final int METHOD_ID = 90;
Modified:
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicReturnBody.java
URL:
http://svn.apache.org/viewvc/qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicReturnBody.java?rev=1628336&r1=1628335&r2=1628336&view=diff
==============================================================================
---
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicReturnBody.java
(original)
+++
qpid/branches/QPID-6125-ProtocolRefactoring/java/common/src/main/java/org/apache/qpid/framing/BasicReturnBody.java
Mon Sep 29 23:20:39 2014
@@ -35,18 +35,6 @@ import org.apache.qpid.codec.MarkableDat
public class BasicReturnBody extends AMQMethodBodyImpl implements
EncodableAMQDataBlock, AMQMethodBody
{
- private static final AMQMethodBodyInstanceFactory FACTORY_INSTANCE = new
AMQMethodBodyInstanceFactory()
- {
- public AMQMethodBody newInstance(MarkableDataInput in, long size)
throws AMQFrameDecodingException, IOException
- {
- return new BasicReturnBody(in);
- }
- };
-
- public static AMQMethodBodyInstanceFactory getFactory()
- {
- return FACTORY_INSTANCE;
- }
public static final int CLASS_ID = 60;
public static final int METHOD_ID = 50;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
