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

2 files changed, 27 insertions, 14 deletions

diff --git a/qpid/java/common/src/test/java/org/apache/qpid/codec/AMQDecoderTest.java b/qpid/java/common/src/test/java/org/apache/qpid/codec/AMQDecoderTest.java
index cd810f6b3d..51f3ce1113 100644
--- a/qpid/java/common/src/test/java/org/apache/qpid/codec/AMQDecoderTest.java
+++ b/qpid/java/common/src/test/java/org/apache/qpid/codec/AMQDecoderTest.java
@@ -25,7 +25,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.nio.ByteBuffer;
-import java.util.ArrayList;
+import java.util.List;
 
 import junit.framework.TestCase;
 
@@ -33,17 +33,21 @@ import org.apache.qpid.framing.AMQDataBlock;
 import org.apache.qpid.framing.AMQFrame;
 import org.apache.qpid.framing.AMQFrameDecodingException;
 import org.apache.qpid.framing.AMQProtocolVersionException;
+import org.apache.qpid.framing.FrameCreatingMethodProcessor;
 import org.apache.qpid.framing.HeartbeatBody;
+import org.apache.qpid.framing.ProtocolVersion;
 
 public class AMQDecoderTest extends TestCase
 {
 
     private AMQDecoder _decoder;
+    private FrameCreatingMethodProcessor _methodProcessor;
 
 
     public void setUp()
     {
-        _decoder = new AMQDecoder(false, null);
+        _methodProcessor = new FrameCreatingMethodProcessor(ProtocolVersion.v0_91);
+        _decoder = new ClientDecoder(_methodProcessor);
     }
    
     
@@ -57,7 +61,8 @@ public class AMQDecoderTest extends TestCase
     public void testSingleFrameDecode() throws AMQProtocolVersionException, AMQFrameDecodingException, IOException
     {
         ByteBuffer msg = getHeartbeatBodyBuffer();
-        ArrayList<AMQDataBlock> frames = _decoder.decodeBuffer(msg);
+        _decoder.decodeBuffer(msg);
+        List<AMQDataBlock> frames = _methodProcessor.getProcessedMethods();
         if (frames.get(0) instanceof AMQFrame)
         {
             assertEquals(HeartbeatBody.FRAME.getBodyFrame().getFrameType(), ((AMQFrame) frames.get(0)).getBodyFrame().getFrameType());
@@ -77,9 +82,12 @@ public class AMQDecoderTest extends TestCase
         msgA.limit(msgaLimit);
         msg.position(msgbPos);
         ByteBuffer msgB = msg.slice();
-        ArrayList<AMQDataBlock> frames = _decoder.decodeBuffer(msgA);
+
+        _decoder.decodeBuffer(msgA);
+        List<AMQDataBlock> frames = _methodProcessor.getProcessedMethods();
         assertEquals(0, frames.size());
-        frames = _decoder.decodeBuffer(msgB);
+
+        _decoder.decodeBuffer(msgB);
         assertEquals(1, frames.size());
         if (frames.get(0) instanceof AMQFrame)
         {
@@ -99,7 +107,8 @@ public class AMQDecoderTest extends TestCase
         msg.put(msgA);
         msg.put(msgB);
         msg.flip();
-        ArrayList<AMQDataBlock> frames = _decoder.decodeBuffer(msg);
+        _decoder.decodeBuffer(msg);
+        List<AMQDataBlock> frames = _methodProcessor.getProcessedMethods();
         assertEquals(2, frames.size());
         for (AMQDataBlock frame : frames)
         {
@@ -136,12 +145,15 @@ public class AMQDecoderTest extends TestCase
         sliceB.put(msgC);
         sliceB.flip();
         msgC.limit(limit);
-        
-        ArrayList<AMQDataBlock> frames = _decoder.decodeBuffer(sliceA);
+
+        _decoder.decodeBuffer(sliceA);
+        List<AMQDataBlock> frames = _methodProcessor.getProcessedMethods();
         assertEquals(1, frames.size());
-        frames = _decoder.decodeBuffer(sliceB);
+        frames.clear();
+        _decoder.decodeBuffer(sliceB);
         assertEquals(1, frames.size());
-        frames = _decoder.decodeBuffer(msgC);
+        frames.clear();
+        _decoder.decodeBuffer(msgC);
         assertEquals(1, frames.size());
         for (AMQDataBlock frame : frames)
         {
diff --git a/qpid/java/common/src/test/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImplTest.java b/qpid/java/common/src/test/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImplTest.java
index 5a57db1650..aece8ed4e2 100644
--- a/qpid/java/common/src/test/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImplTest.java
+++ b/qpid/java/common/src/test/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImplTest.java
@@ -23,16 +23,17 @@ package org.apache.qpid.framing.abstraction;
 import junit.framework.TestCase;
 
 import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.framing.MessagePublishInfo;
 
 public class MessagePublishInfoImplTest extends TestCase
 {
-    private MessagePublishInfoImpl _mpi;
+    private MessagePublishInfo _mpi;
     private final AMQShortString _exchange = new AMQShortString("exchange");
     private final AMQShortString _routingKey = new AMQShortString("routingKey");
 
     public void setUp()
     {
-        _mpi = new MessagePublishInfoImpl(_exchange, true, true, _routingKey);
+        _mpi = new MessagePublishInfo(_exchange, true, true, _routingKey);
     }
 
     /** Test that we can update the exchange value. */
@@ -55,7 +56,7 @@ public class MessagePublishInfoImplTest extends TestCase
         //Check that the set value is correct
         assertTrue("Set value for immediate not as expected", _mpi.isImmediate());
 
-        MessagePublishInfoImpl mpi = new MessagePublishInfoImpl();
+        MessagePublishInfo mpi = new MessagePublishInfo();
 
         assertFalse("Default value for immediate should be false", mpi.isImmediate());
 
@@ -72,7 +73,7 @@ public class MessagePublishInfoImplTest extends TestCase
     {
         assertTrue("Set value for mandatory not as expected", _mpi.isMandatory());
 
-        MessagePublishInfoImpl mpi = new MessagePublishInfoImpl();
+        MessagePublishInfo mpi = new MessagePublishInfo();
 
         assertFalse("Default value for mandatory should be false", mpi.isMandatory());