QPID-1463: Andrea's patches

- Added read / write methods on org.apache.qpid.transport.codec.Encoder / org.apache.qpid.transport.codec.Decoder;
- Added the corresponding implementation on org.apache.qpid.transport.codec.BBEncoder / org.apache.qpid.transport.codec.BBDecoder
- Added comments on org.apache.qpid.transport.codec.Encoder / org.apache.qpid.transport.codec.Decoder;
- Removed org.apache.qpid.transport.codec.ManagementEncoder / org.apache.qpid.transport.codec.ManagementDecoder.
- Added 6 data types (Int8, Int16, Int32, Int64, Double and Float);
- Added type mappings with the data types above according to management specifications;
- Removed all references to ManagementEncoder / Decoder classes; Now Qman is using (whenever is possible) Decoder / Encoder and when some specific method is needed then the BBDecoder / BBEncoder is used.
- Some test case adjustment;

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

5 files changed, 17 insertions, 21 deletions

diff --git a/qpid/java/management/client/src/test/java/org/apache/qpid/management/configuration/ConfigurationTest.java b/qpid/java/management/client/src/test/java/org/apache/qpid/management/configuration/ConfigurationTest.java
index ca6ae846a8..efd5990bd7 100644
--- a/qpid/java/management/client/src/test/java/org/apache/qpid/management/configuration/ConfigurationTest.java
+++ b/qpid/java/management/client/src/test/java/org/apache/qpid/management/configuration/ConfigurationTest.java
@@ -74,11 +74,11 @@ public class ConfigurationTest extends TestCase
     {
         try
         {
-            Configuration.getInstance().getType(TestConstants.VALID_CODE+1);
+            Configuration.getInstance().getType(Integer.MIN_VALUE);
             fail("If an unknwon code is supplied an exception must be thrown.");
         } catch (UnknownTypeCodeException expected)
         {
-            assertEquals(TestConstants.VALID_CODE+1,expected.getCode());
+            assertEquals(Integer.MIN_VALUE,expected.getCode());
         }        
     }
     
@@ -107,11 +107,11 @@ public class ConfigurationTest extends TestCase
     {
         try
         {
-            Configuration.getInstance().getAccessMode(TestConstants.VALID_CODE+1);
+            Configuration.getInstance().getAccessMode(Integer.MIN_VALUE);
             fail("If an unknwon code is supplied an exception must be thrown.");
         } catch (UnknownAccessCodeException expected)
         {
-            assertEquals(TestConstants.VALID_CODE+1,expected.getCode());
+            assertEquals(Integer.MIN_VALUE,expected.getCode());
         }        
     }    
     
@@ -199,7 +199,6 @@ public class ConfigurationTest extends TestCase
         
         Map<Character, IMessageHandler> handlerMappings = Configuration.getInstance().getManagementQueueHandlers();
         
-        assertEquals(2,handlerMappings.size());
         assertEquals(instrMessageHandlerClassName,handlerMappings.get(instrMapping.getOpcode()).getClass().getName());
         assertEquals(configMessageHandlerClassName,handlerMappings.get(configMapping.getOpcode()).getClass().getName());        
     }
diff --git a/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/model/BaseDomainModelTestCase.java b/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/model/BaseDomainModelTestCase.java
index 3ed9ed8a61..c528392a93 100644
--- a/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/model/BaseDomainModelTestCase.java
+++ b/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/model/BaseDomainModelTestCase.java
@@ -29,7 +29,7 @@ import junit.framework.TestCase;
  * 
  * @author Andrea Gazzarini
  */
-public class BaseDomainModelTestCase extends TestCase
+public abstract class BaseDomainModelTestCase extends TestCase
 {
     /**
      * Set up fixture for this test case.
diff --git a/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/model/OptionalPropertiesTest.java b/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/model/OptionalPropertiesTest.java
index a4e1e24ff3..553c1c21de 100644
--- a/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/model/OptionalPropertiesTest.java
+++ b/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/model/OptionalPropertiesTest.java
@@ -27,7 +27,7 @@ import java.util.List;
 import junit.framework.TestCase;
 
 import org.apache.qpid.management.domain.model.type.Uint64;
-import org.apache.qpid.transport.codec.ManagementDecoder;
+import org.apache.qpid.transport.codec.BBDecoder;
 
 public class OptionalPropertiesTest extends TestCase
 {
@@ -60,7 +60,7 @@ public class OptionalPropertiesTest extends TestCase
         QpidProperty property = new QpidProperty();
         
         // We don't need a decoder so in order to be sure that it won't be invoked set it to null.
-        ManagementDecoder nullDecoder = null;
+        BBDecoder nullDecoder = null;
         
         for (int i = 0; i < 8; i++)
         {
@@ -92,7 +92,7 @@ public class OptionalPropertiesTest extends TestCase
         ByteBuffer buffer = ByteBuffer.allocate(8);
         buffer.putLong(_44);
         buffer.rewind();
-        ManagementDecoder decoder = new ManagementDecoder();
+        BBDecoder decoder = new BBDecoder();
         
         decoder.init(buffer);
         assertEquals(_44,property.decodeValue(decoder, presenceBytes));
@@ -164,7 +164,7 @@ public class OptionalPropertiesTest extends TestCase
             }
         }
         buffer.rewind();
-        ManagementDecoder decoder = new ManagementDecoder();
+        BBDecoder decoder = new BBDecoder();
         
         decoder.init(buffer);
         int index = 0;
diff --git a/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/services/BrokerMessageListenerTest.java b/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/services/BrokerMessageListenerTest.java
index c489f7d767..805c039a6f 100644
--- a/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/services/BrokerMessageListenerTest.java
+++ b/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/services/BrokerMessageListenerTest.java
@@ -32,7 +32,7 @@ import org.apache.qpid.management.TestConstants;
 import org.apache.qpid.management.domain.handler.base.IMessageHandler;
 import org.apache.qpid.management.domain.model.DomainModel;
 import org.apache.qpid.nclient.util.ByteBufferMessage;
-import org.apache.qpid.transport.codec.ManagementDecoder;
+import org.apache.qpid.transport.codec.Decoder;
 
 /**
  * Test case for Broker Message Listener.
@@ -44,7 +44,7 @@ public class BrokerMessageListenerTest extends TestCase
     // An empty message handler user for test.
     private IMessageHandler _emptyMessageHandler = new IMessageHandler() 
     {
-        public void process (ManagementDecoder decoder, int sequenceNumber)
+        public void process (Decoder decoder, int sequenceNumber)
         {
         }
         public void setDomainModel (DomainModel domainModel) 
@@ -55,7 +55,7 @@ public class BrokerMessageListenerTest extends TestCase
     // Another empty message handler user for test.
     private IMessageHandler _anotherEmptyMessageHandler = new IMessageHandler() 
     {
-        public void process (ManagementDecoder decoder, int sequenceNumber)
+        public void process (Decoder decoder, int sequenceNumber)
         {
         }
         public void setDomainModel (DomainModel domainModel)
@@ -111,7 +111,7 @@ public class BrokerMessageListenerTest extends TestCase
         IMessageHandler wrongMessageHandler = new IMessageHandler()
         {
 
-            public void process (ManagementDecoder decoder, int sequenceNumber)
+            public void process (Decoder decoder, int sequenceNumber)
             {
             }
 
@@ -148,7 +148,7 @@ public class BrokerMessageListenerTest extends TestCase
         IMessageHandler neverCallMe = new IMessageHandler()
         {
 
-            public void process (ManagementDecoder decoder, int sequenceNumber)
+            public void process (Decoder decoder, int sequenceNumber)
             {
                 fail("This test shouldn't never arrive at this point...");
             }
@@ -189,7 +189,7 @@ public class BrokerMessageListenerTest extends TestCase
     			this._opcode = opcode;
 			}
     		
-            public void process (ManagementDecoder decoder, int sequenceNumber)
+            public void process (Decoder decoder, int sequenceNumber)
             {
             	handlersMap.remove(_opcode);
             }
diff --git a/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/services/MessageTokenizerTest.java b/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/services/MessageTokenizerTest.java
index 5da3db2933..66ed7cdc18 100644
--- a/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/services/MessageTokenizerTest.java
+++ b/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/services/MessageTokenizerTest.java
@@ -2,16 +2,13 @@ package org.apache.qpid.management.domain.services;
 

 import java.io.IOException;

 import java.nio.ByteBuffer;

-import java.util.ArrayList;

-import java.util.Arrays;

 import java.util.*;

-import java.util.Random;

 

 import junit.framework.TestCase;

 

 import org.apache.qpid.api.Message;

 import org.apache.qpid.nclient.util.ByteBufferMessage;

-import org.apache.qpid.transport.codec.ManagementDecoder;

+import org.apache.qpid.transport.codec.BBDecoder;

 

 /**

  * Tests case for messaeg tokenizer.

@@ -114,7 +111,7 @@ public class MessageTokenizerTest extends TestCase {
 	private void assertEquals(Message message, byte [] expected) throws IOException 

 	{

 		ByteBuffer messageContent = message.readData();

-		ManagementDecoder decoder = new ManagementDecoder();

+		BBDecoder decoder = new BBDecoder();

 		decoder.init(messageContent);

 		byte [] content = decoder.readReaminingBytes();	

 		assertTrue(Arrays.equals(content, expected));