QPID-6125 : [Java Broker] AMQP 0-8/9/9-1 protocol handler refactoring

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1632583 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 4 insertions, 36 deletions

diff --git a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java
index cff761b759..fb0c11f6e5 100644
--- a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java
+++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java
@@ -30,9 +30,7 @@ import java.util.Arrays;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.BasicContentHeaderProperties;
 import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.MethodRegistry;
-import org.apache.qpid.framing.ProtocolVersion;
-import org.apache.qpid.framing.abstraction.MessagePublishInfo;
+import org.apache.qpid.framing.MessagePublishInfo;
 import org.apache.qpid.server.model.VirtualHost;
 import org.apache.qpid.server.protocol.v0_10.MessageMetaDataType_0_10;
 import org.apache.qpid.server.protocol.v0_10.MessageMetaData_0_10;
@@ -234,44 +232,14 @@ public class BDBMessageStoreTest extends MessageStoreTestCase
 
     private MessagePublishInfo createPublishInfoBody_0_8()
     {
-        return new MessagePublishInfo()
-        {
-            public AMQShortString getExchange()
-            {
-                return new AMQShortString("exchange12345");
-            }
-
-            @Override
-            public void setExchange(AMQShortString exchange)
-            {
-            }
-
-            @Override
-            public boolean isImmediate()
-            {
-                return false;
-            }
-
-            @Override
-            public boolean isMandatory()
-            {
-                return true;
-            }
-
-            @Override
-            public AMQShortString getRoutingKey()
-            {
-                return new AMQShortString("routingKey12345");
-            }
-        };
+        return new MessagePublishInfo(new AMQShortString("exchange12345"), false, true,
+                                      new AMQShortString("routingKey12345"));
 
     }
 
     private ContentHeaderBody createContentHeaderBody_0_8(BasicContentHeaderProperties props, int length)
     {
-        MethodRegistry methodRegistry = MethodRegistry.getMethodRegistry(ProtocolVersion.v0_9);
-        int classForBasic = methodRegistry.createBasicQosOkBody().getClazz();
-        return new ContentHeaderBody(classForBasic, 1, props, length);
+        return new ContentHeaderBody(props, length);
     }
 
     private BasicContentHeaderProperties createContentHeaderProperties_0_8()