Modified: incubator/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Uint64.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Uint64.java?rev=718949&r1=718948&r2=718949&view=diff ============================================================================== --- incubator/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Uint64.java (original) +++ incubator/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Uint64.java Wed Nov 19 04:59:28 2008 @@ -20,8 +20,8 @@ */ package org.apache.qpid.management.domain.model.type; -import org.apache.qpid.management.messages.AmqpCoDec; -import org.apache.qpid.transport.codec.ManagementDecoder; +import org.apache.qpid.transport.codec.Decoder; +import org.apache.qpid.transport.codec.Encoder; public class Uint64 extends Type { @@ -31,14 +31,14 @@ } @Override - public Object decode (ManagementDecoder decoder) + public Object decode (Decoder decoder) { return new Long(decoder.readUint64()); } @Override - public void encode (Object value, AmqpCoDec encoder) + public void encode (Object value, Encoder encoder) { - encoder.pack64((Long)value); + encoder.writeUint64((Long)value); } } \ No newline at end of file
Modified: incubator/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Uint8.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Uint8.java?rev=718949&r1=718948&r2=718949&view=diff ============================================================================== --- incubator/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Uint8.java (original) +++ incubator/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Uint8.java Wed Nov 19 04:59:28 2008 @@ -20,8 +20,8 @@ */ package org.apache.qpid.management.domain.model.type; -import org.apache.qpid.management.messages.AmqpCoDec; -import org.apache.qpid.transport.codec.ManagementDecoder; +import org.apache.qpid.transport.codec.Decoder; +import org.apache.qpid.transport.codec.Encoder; public class Uint8 extends Type { @@ -31,14 +31,14 @@ } @Override - public Object decode (ManagementDecoder decoder) + public Object decode (Decoder decoder) { return new Short(decoder.readUint8()); } @Override - public void encode (Object value, AmqpCoDec encoder) + public void encode (Object value, Encoder encoder) { - encoder.pack8((Short)value); + encoder.writeUint8((Short)value); } } \ No newline at end of file Modified: incubator/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Uuid.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Uuid.java?rev=718949&r1=718948&r2=718949&view=diff ============================================================================== --- incubator/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Uuid.java (original) +++ incubator/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/model/type/Uuid.java Wed Nov 19 04:59:28 2008 @@ -22,8 +22,8 @@ import java.util.UUID; -import org.apache.qpid.management.messages.AmqpCoDec; -import org.apache.qpid.transport.codec.ManagementDecoder; +import org.apache.qpid.transport.codec.Decoder; +import org.apache.qpid.transport.codec.Encoder; public class Uuid extends Type { @@ -33,15 +33,14 @@ } @Override - public Object decode (ManagementDecoder decoder) + public Object decode (Decoder decoder) { return decoder.readUuid(); } @Override - public void encode (Object value, AmqpCoDec encoder) + public void encode (Object value, Encoder encoder) { - throw new RuntimeException("Not yet implemented encode for UUID type."); -// encoder.writeUuid((UUID)value); + encoder.writeUuid((UUID)value); } } \ No newline at end of file Modified: incubator/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/services/BrokerMessageListener.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/services/BrokerMessageListener.java?rev=718949&r1=718948&r2=718949&view=diff ============================================================================== --- incubator/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/services/BrokerMessageListener.java (original) +++ incubator/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/services/BrokerMessageListener.java Wed Nov 19 04:59:28 2008 @@ -33,7 +33,7 @@ import org.apache.qpid.management.domain.handler.base.IMessageHandler; import org.apache.qpid.management.domain.model.DomainModel; import org.apache.qpid.nclient.util.MessageListener; -import org.apache.qpid.transport.codec.ManagementDecoder; +import org.apache.qpid.transport.codec.BBDecoder; import org.apache.qpid.transport.util.Logger; /** @@ -162,7 +162,7 @@ IMessageHandler handler = _handlers.get(opcode); if (handler != null) { - ManagementDecoder decoder = new ManagementDecoder(); + BBDecoder decoder = new BBDecoder(); decoder.init(buffer); LOGGER.debug(Messages.QMAN_200003_MESSAGE_FORWARDING,opcode,handler); Modified: incubator/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/services/MessageTokenizer.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/services/MessageTokenizer.java?rev=718949&r1=718948&r2=718949&view=diff ============================================================================== --- incubator/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/services/MessageTokenizer.java (original) +++ incubator/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/services/MessageTokenizer.java Wed Nov 19 04:59:28 2008 @@ -9,7 +9,7 @@ import org.apache.qpid.management.Messages; import org.apache.qpid.management.Protocol; import org.apache.qpid.nclient.util.ByteBufferMessage; -import org.apache.qpid.transport.codec.ManagementDecoder; +import org.apache.qpid.transport.codec.BBDecoder; import org.apache.qpid.transport.util.Logger; /** @@ -101,7 +101,7 @@ int startIndex = 0; int indexOfMagicNumber = 0; - ManagementDecoder decoder = new ManagementDecoder(); + BBDecoder decoder = new BBDecoder(); decoder.init(compoundMessage.readData()); byte [] source = decoder.readReaminingBytes(); Modified: incubator/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/messages/ManagementMessage.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/messages/ManagementMessage.java?rev=718949&r1=718948&r2=718949&view=diff ============================================================================== --- incubator/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/messages/ManagementMessage.java (original) +++ incubator/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/messages/ManagementMessage.java Wed Nov 19 04:59:28 2008 @@ -29,6 +29,7 @@ import org.apache.qpid.transport.DeliveryProperties; import org.apache.qpid.transport.Header; import org.apache.qpid.transport.MessageProperties; +import org.apache.qpid.transport.codec.BBEncoder; /** * Message implementation used for specific management purposes. @@ -63,17 +64,18 @@ IDataBuilderStrategy ACCUMULATING = new IDataBuilderStrategy() { public ByteBuffer getData() { - _codec.pack8((byte)opcode()); - _codec.pack32(sequenceNumber()); + _codec.writeInt8((byte)opcode()); + _codec.writeSequenceNo(sequenceNumber()); specificMessageEncoding(); - _data =_codec.getEncodedBuffer(); + + _data =_codec.segment(); _reader = READING; return _data; } }; - protected AmqpCoDec _codec; + protected BBEncoder _codec; protected ByteBuffer _data; private int _messageTransferId; private IDataBuilderStrategy _reader = ACCUMULATING; @@ -83,7 +85,8 @@ */ ManagementMessage() { - _codec = new AmqpCoDec(); + _codec = new BBEncoder(100); + _codec.writeMagicNumber(); } /** Modified: incubator/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/messages/MethodInvocationRequestMessage.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/messages/MethodInvocationRequestMessage.java?rev=718949&r1=718948&r2=718949&view=diff ============================================================================== --- incubator/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/messages/MethodInvocationRequestMessage.java (original) +++ incubator/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/messages/MethodInvocationRequestMessage.java Wed Nov 19 04:59:28 2008 @@ -150,12 +150,12 @@ void specificMessageEncoding () { objectId().encode(_codec); - _codec.packStr8(packageName()); - _codec.packStr8(className()); + _codec.writeStr8(packageName()); + _codec.writeStr8(className()); schemaHash().encode(_codec); QpidMethod method = method(); - _codec.packStr8(method.getName()); + _codec.writeStr8(method.getName()); method.encodeParameters(parameters(), _codec); } } Modified: incubator/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/messages/SchemaRequestMessage.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/messages/SchemaRequestMessage.java?rev=718949&r1=718948&r2=718949&view=diff ============================================================================== --- incubator/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/messages/SchemaRequestMessage.java (original) +++ incubator/qpid/trunk/qpid/java/management/client/src/main/java/org/apache/qpid/management/messages/SchemaRequestMessage.java Wed Nov 19 04:59:28 2008 @@ -61,8 +61,8 @@ @Override final void specificMessageEncoding () { - _codec.packStr8(packageName()); - _codec.packStr8(className()); + _codec.writeStr8(packageName()); + _codec.writeStr8(className()); schemaHash().encode(_codec); } } Modified: incubator/qpid/trunk/qpid/java/management/client/src/test/java/org/apache/qpid/management/configuration/ConfigurationTest.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/client/src/test/java/org/apache/qpid/management/configuration/ConfigurationTest.java?rev=718949&r1=718948&r2=718949&view=diff ============================================================================== --- incubator/qpid/trunk/qpid/java/management/client/src/test/java/org/apache/qpid/management/configuration/ConfigurationTest.java (original) +++ incubator/qpid/trunk/qpid/java/management/client/src/test/java/org/apache/qpid/management/configuration/ConfigurationTest.java Wed Nov 19 04:59:28 2008 @@ -74,11 +74,11 @@ { 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 @@ { 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 @@ 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()); } Modified: incubator/qpid/trunk/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/model/BaseDomainModelTestCase.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/model/BaseDomainModelTestCase.java?rev=718949&r1=718948&r2=718949&view=diff ============================================================================== --- incubator/qpid/trunk/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/model/BaseDomainModelTestCase.java (original) +++ incubator/qpid/trunk/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/model/BaseDomainModelTestCase.java Wed Nov 19 04:59:28 2008 @@ -29,7 +29,7 @@ * * @author Andrea Gazzarini */ -public class BaseDomainModelTestCase extends TestCase +public abstract class BaseDomainModelTestCase extends TestCase { /** * Set up fixture for this test case. Modified: incubator/qpid/trunk/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/model/OptionalPropertiesTest.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/model/OptionalPropertiesTest.java?rev=718949&r1=718948&r2=718949&view=diff ============================================================================== --- incubator/qpid/trunk/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/model/OptionalPropertiesTest.java (original) +++ incubator/qpid/trunk/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/model/OptionalPropertiesTest.java Wed Nov 19 04:59:28 2008 @@ -27,7 +27,7 @@ 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 @@ 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 @@ 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 @@ } } buffer.rewind(); - ManagementDecoder decoder = new ManagementDecoder(); + BBDecoder decoder = new BBDecoder(); decoder.init(buffer); int index = 0; Modified: incubator/qpid/trunk/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/services/BrokerMessageListenerTest.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/services/BrokerMessageListenerTest.java?rev=718949&r1=718948&r2=718949&view=diff ============================================================================== --- incubator/qpid/trunk/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/services/BrokerMessageListenerTest.java (original) +++ incubator/qpid/trunk/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/services/BrokerMessageListenerTest.java Wed Nov 19 04:59:28 2008 @@ -32,7 +32,7 @@ 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 @@ // 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 @@ // 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 @@ IMessageHandler wrongMessageHandler = new IMessageHandler() { - public void process (ManagementDecoder decoder, int sequenceNumber) + public void process (Decoder decoder, int sequenceNumber) { } @@ -148,7 +148,7 @@ 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 @@ this._opcode = opcode; } - public void process (ManagementDecoder decoder, int sequenceNumber) + public void process (Decoder decoder, int sequenceNumber) { handlersMap.remove(_opcode); } Modified: incubator/qpid/trunk/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/services/MessageTokenizerTest.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/services/MessageTokenizerTest.java?rev=718949&r1=718948&r2=718949&view=diff ============================================================================== --- incubator/qpid/trunk/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/services/MessageTokenizerTest.java (original) +++ incubator/qpid/trunk/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/services/MessageTokenizerTest.java Wed Nov 19 04:59:28 2008 @@ -2,16 +2,13 @@ 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 @@ 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));
