Repository: qpid-broker-j Updated Branches: refs/heads/7.0.x 8ea3b655f -> dc2fa863d
QPID-7830: [Broker-J] [AMQP 0-8..0-91] Mechanically refactor AMQPShortString introducing factory methods and hiding constructors (cherry picked from commit 0a3dfc883b7af756fbdf076665eaae4ad8202bf7) Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/83c6dfeb Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/83c6dfeb Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/83c6dfeb Branch: refs/heads/7.0.x Commit: 83c6dfebc3c815157ed3f04403a6968cc05eabae Parents: 8ea3b65 Author: Keith Wall <kw...@apache.org> Authored: Thu Apr 26 10:40:38 2018 +0100 Committer: Alex Rudyy <oru...@apache.org> Committed: Fri May 11 16:05:46 2018 +0100 ---------------------------------------------------------------------- .../berkeleydb/AMQShortStringEncoding.java | 2 +- .../berkeleydb/upgrade/UpgradeFrom4To5.java | 2 +- .../berkeleydb/AMQShortStringEncodingTest.java | 4 +- .../store/berkeleydb/BDBMessageStoreTest.java | 4 +- .../server/protocol/v0_8/AMQShortString.java | 92 +++++--------------- .../protocol/v0_8/AMQShortStringTest.java | 31 ++++--- .../server/protocol/v0_8/FieldTableTest.java | 2 +- .../qpid/server/protocol/v0_8/AMQChannel.java | 9 +- .../transport/BasicContentHeaderProperties.java | 2 +- .../protocol/v0_8/AMQPConnection_0_8Test.java | 6 +- .../transport/MessagePublishInfoImplTest.java | 8 +- .../MessageConverter_0_10_to_0_8.java | 10 +-- .../v0_8_v1_0/MessageConverter_1_0_to_v0_8.java | 10 +-- 13 files changed, 67 insertions(+), 115 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/83c6dfeb/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AMQShortStringEncoding.java ---------------------------------------------------------------------- diff --git a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AMQShortStringEncoding.java b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AMQShortStringEncoding.java index ce004b4..8782f65 100644 --- a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AMQShortStringEncoding.java +++ b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AMQShortStringEncoding.java @@ -42,7 +42,7 @@ public class AMQShortStringEncoding { byte[] stringBytes = new byte[length]; tupleInput.readFast(stringBytes); - return new AMQShortString(stringBytes); + return AMQShortString.createAMQShortString(stringBytes); } } http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/83c6dfeb/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java ---------------------------------------------------------------------- diff --git a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java index 9cc604d..b310081 100644 --- a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java +++ b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java @@ -307,7 +307,7 @@ public class UpgradeFrom4To5 extends AbstractStoreUpgrade @Override public void run(Database newQueueDatabase, Database newBindingsDatabase, Transaction transaction) { - AMQShortString queueNameAMQ = new AMQShortString(queueName); + AMQShortString queueNameAMQ = AMQShortString.createAMQShortString(queueName); QueueRecord record = new QueueRecord(queueNameAMQ, null, false, null); DatabaseEntry key = new DatabaseEntry(); http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/83c6dfeb/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/AMQShortStringEncodingTest.java ---------------------------------------------------------------------- diff --git a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/AMQShortStringEncodingTest.java b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/AMQShortStringEncodingTest.java index 83d307f..cfa6674 100644 --- a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/AMQShortStringEncodingTest.java +++ b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/AMQShortStringEncodingTest.java @@ -61,7 +61,7 @@ public class AMQShortStringEncodingTest extends QpidTestCase public void testWriteReadShortStringWithLengthLess127() { - AMQShortString value = new AMQShortString("test"); + AMQShortString value = AMQShortString.createAMQShortString("test"); // write into tuple output TupleOutput tupleOutput = new TupleOutput(); @@ -81,7 +81,7 @@ public class AMQShortStringEncodingTest extends QpidTestCase { sb.append(ch); } - return new AMQShortString(sb.toString()); + return AMQShortString.createAMQShortString(sb.toString()); } } http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/83c6dfeb/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java ---------------------------------------------------------------------- diff --git a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java index 91f698a..8b3442b 100644 --- a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java +++ b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java @@ -65,8 +65,8 @@ public class BDBMessageStoreTest extends MessageStoreTestCase private MessagePublishInfo createPublishInfoBody_0_8() { - return new MessagePublishInfo(new AMQShortString("exchange12345"), false, true, - new AMQShortString("routingKey12345")); + return new MessagePublishInfo(AMQShortString.createAMQShortString("exchange12345"), false, true, + AMQShortString.createAMQShortString("routingKey12345")); } http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/83c6dfeb/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQShortString.java ---------------------------------------------------------------------- diff --git a/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQShortString.java b/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQShortString.java index b5aa4d7..41a4322 100644 --- a/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQShortString.java +++ b/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQShortString.java @@ -42,8 +42,6 @@ public final class AMQShortString implements Comparable<AMQShortString> * The maximum number of octets in AMQ short string as defined in AMQP specification */ public static final int MAX_LENGTH = 255; - private static final byte MINUS = (byte)'-'; - private static final byte ZERO = (byte) '0'; private static final Logger LOGGER = LoggerFactory.getLogger(AMQShortString.class); @@ -53,11 +51,10 @@ public final class AMQShortString implements Comparable<AMQShortString> private String _asString = null; private final int _length; - private static final char[] EMPTY_CHAR_ARRAY = new char[0]; - public static final AMQShortString EMPTY_STRING = new AMQShortString((String)null); + public static final AMQShortString EMPTY_STRING = createAMQShortString((String)null); - public AMQShortString(byte[] data) + private AMQShortString(byte[] data) { if (data == null) { @@ -72,7 +69,7 @@ public final class AMQShortString implements Comparable<AMQShortString> _offset = 0; } - public AMQShortString(String string) + private AMQShortString(String string) { final byte[] data = EncodingUtils.asUTF8Bytes(string); final int length = data.length; @@ -96,31 +93,20 @@ public final class AMQShortString implements Comparable<AMQShortString> _asString = string == null ? "" : string; } - public static AMQShortString readAMQShortString(ByteBuffer buffer) + private AMQShortString(byte[] data, final int offset, final int length) { - int length = ((int) buffer.get()) & 0xff; - if(length == 0) + if (length > MAX_LENGTH) { - return null; + throw new IllegalArgumentException("Cannot create AMQShortString with number of octets over 255!"); } - else + if (data == null) { - if (length > MAX_LENGTH) - { - throw new IllegalArgumentException("Cannot create AMQShortString with number of octets over 255!"); - } - if(length > buffer.remaining()) - { - throw new IllegalArgumentException("Cannot create AMQShortString with length " - + length + " from a ByteBuffer with only " - + buffer.remaining() - + " bytes."); - - } - byte[] data = new byte[length]; - buffer.get(data); - return new AMQShortString(data, 0, length); + throw new NullPointerException("Cannot create AMQShortString with null data[]"); } + + _offset = offset; + _length = length; + _data = data; } public static AMQShortString readAMQShortString(QpidByteBuffer buffer) @@ -150,21 +136,14 @@ public final class AMQShortString implements Comparable<AMQShortString> } } - - public AMQShortString(byte[] data, final int offset, final int length) + public static AMQShortString createAMQShortString(byte[] data) { - if (length > MAX_LENGTH) - { - throw new IllegalArgumentException("Cannot create AMQShortString with number of octets over 255!"); - } - if (data == null) - { - throw new NullPointerException("Cannot create AMQShortString with null data[]"); - } + return new AMQShortString(data); + } - _offset = offset; - _length = length; - _data = data; + public static AMQShortString createAMQShortString(String string) + { + return new AMQShortString(string); } /** @@ -348,37 +327,6 @@ public final class AMQShortString implements Comparable<AMQShortString> } } - public int toIntValue() - { - int pos = _offset; - int val = 0; - - - boolean isNegative = (_data[pos] == MINUS); - if(isNegative) - { - pos++; - } - - final int end = _length + _offset; - - while(pos < end) - { - int digit = (int) (_data[pos++] - ZERO); - if((digit < 0) || (digit > 9)) - { - throw new NumberFormatException("\""+toString()+"\" is not a valid number"); - } - val = val * 10; - val += digit; - } - if(isNegative) - { - val = val * -1; - } - return val; - } - public boolean contains(final byte b) { final int end = _length + _offset; @@ -422,7 +370,7 @@ public final class AMQShortString implements Comparable<AMQShortString> } } - return new AMQShortString(bytes); + return createAMQShortString(bytes); } } @@ -439,7 +387,7 @@ public final class AMQShortString implements Comparable<AMQShortString> } else { - return new AMQShortString(obj); + return createAMQShortString(obj); } } http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/83c6dfeb/broker-core/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQShortStringTest.java ---------------------------------------------------------------------- diff --git a/broker-core/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQShortStringTest.java b/broker-core/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQShortStringTest.java index 26fc7dd..659d3e8 100644 --- a/broker-core/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQShortStringTest.java +++ b/broker-core/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQShortStringTest.java @@ -27,18 +27,18 @@ import java.nio.charset.StandardCharsets; public class AMQShortStringTest extends QpidTestCase { - public static final AMQShortString HELLO = new AMQShortString("Hello"); - public static final AMQShortString HELL = new AMQShortString("Hell"); - public static final AMQShortString GOODBYE = new AMQShortString("Goodbye"); - public static final AMQShortString GOOD = new AMQShortString("Good"); - public static final AMQShortString BYE = new AMQShortString("BYE"); + public static final AMQShortString HELLO = AMQShortString.createAMQShortString("Hello"); + public static final AMQShortString HELL = AMQShortString.createAMQShortString("Hell"); + public static final AMQShortString GOODBYE = AMQShortString.createAMQShortString("Goodbye"); + public static final AMQShortString GOOD = AMQShortString.createAMQShortString("Good"); + public static final AMQShortString BYE = AMQShortString.createAMQShortString("BYE"); public void testEquals() { - assertEquals(GOODBYE, new AMQShortString("Goodbye")); - assertEquals(new AMQShortString("A"), new AMQShortString("A")); - assertFalse(new AMQShortString("A").equals(new AMQShortString("a"))); + assertEquals(GOODBYE, AMQShortString.createAMQShortString("Goodbye")); + assertEquals(AMQShortString.createAMQShortString("A"), AMQShortString.createAMQShortString("A")); + assertFalse(AMQShortString.createAMQShortString("A").equals(AMQShortString.createAMQShortString("a"))); } /** @@ -48,8 +48,10 @@ public class AMQShortStringTest extends QpidTestCase public void testCreateAMQShortStringByteArray() { byte[] bytes = "test".getBytes(StandardCharsets.UTF_8); - AMQShortString string = new AMQShortString(bytes); - assertEquals("constructed amq short string length differs from expected", 4, string.length()); + AMQShortString string = AMQShortString.createAMQShortString(bytes); + assertEquals("constructed amq short string length differs from expected", + (long) 4, + (long) string.length()); assertTrue("constructed amq short string differs from expected", string.toString().equals("test")); } @@ -62,8 +64,9 @@ public class AMQShortStringTest extends QpidTestCase */ public void testCreateAMQShortStringString() { - AMQShortString string = new AMQShortString("test"); - assertEquals("constructed amq short string length differs from expected", 4, string.length()); + AMQShortString string = AMQShortString.createAMQShortString("test"); + assertEquals("constructed amq short string length differs from expected", (long) 4, (long) string.length + ()); assertTrue("constructed amq short string differs from expected", string.toString().equals("test")); } @@ -80,7 +83,7 @@ public class AMQShortStringTest extends QpidTestCase byte[] bytes = test.getBytes(StandardCharsets.UTF_8); try { - new AMQShortString(bytes); + AMQShortString.createAMQShortString(bytes); fail("It should not be possible to create AMQShortString with length over 255"); } catch (IllegalArgumentException e) @@ -101,7 +104,7 @@ public class AMQShortStringTest extends QpidTestCase String test = buildString('a', 256); try { - new AMQShortString(test); + AMQShortString.createAMQShortString(test); fail("It should not be possible to create AMQShortString with length over 255"); } catch (IllegalArgumentException e) http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/83c6dfeb/broker-core/src/test/java/org/apache/qpid/server/protocol/v0_8/FieldTableTest.java ---------------------------------------------------------------------- diff --git a/broker-core/src/test/java/org/apache/qpid/server/protocol/v0_8/FieldTableTest.java b/broker-core/src/test/java/org/apache/qpid/server/protocol/v0_8/FieldTableTest.java index 40241c9..410f27a 100644 --- a/broker-core/src/test/java/org/apache/qpid/server/protocol/v0_8/FieldTableTest.java +++ b/broker-core/src/test/java/org/apache/qpid/server/protocol/v0_8/FieldTableTest.java @@ -906,7 +906,7 @@ public class FieldTableTest extends QpidTestCase */ public void testAddingAllFromFieldTableCreatedUsingEncodedBytes() throws Exception { - AMQShortString myBooleanTestProperty = new AMQShortString("myBooleanTestProperty"); + AMQShortString myBooleanTestProperty = AMQShortString.createAMQShortString("myBooleanTestProperty"); //Create a new FieldTable and use it to encode data into a byte array. FieldTable encodeTable = new FieldTable(); http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/83c6dfeb/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java ---------------------------------------------------------------------- diff --git a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java index 6418ea9..d2b340b 100644 --- a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java +++ b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java @@ -175,7 +175,8 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0 private List<MessageConsumerAssociation> _resendList = new ArrayList<>(); private static final - AMQShortString IMMEDIATE_DELIVERY_REPLY_TEXT = new AMQShortString("Immediate delivery is not possible."); + AMQShortString IMMEDIATE_DELIVERY_REPLY_TEXT = + AMQShortString.createAMQShortString("Immediate delivery is not possible."); private final ClientDeliveryMethod _clientDeliveryMethod; @@ -564,7 +565,7 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0 { if (tag == null) { - tag = new AMQShortString("sgen_" + getNextConsumerTag()); + tag = AMQShortString.createAMQShortString("sgen_" + getNextConsumerTag()); } if (_tag2SubscriptionTargetMap.containsKey(tag)) @@ -2538,7 +2539,7 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0 if (isDefaultExchange(exchangeName)) { - if (!new AMQShortString(ExchangeDefaults.DIRECT_EXCHANGE_CLASS).equals(type)) + if (!AMQShortString.createAMQShortString(ExchangeDefaults.DIRECT_EXCHANGE_CLASS).equals(type)) { _connection.sendConnectionClose(ErrorCodes.NOT_ALLOWED, "Attempt to redeclare default exchange: " + " of type " @@ -2886,7 +2887,7 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0 // if we aren't given a queue name, we create one which we return to the client if ((queueStr == null) || (queueStr.length() == 0)) { - queueName = new AMQShortString("tmp_" + UUID.randomUUID()); + queueName = AMQShortString.createAMQShortString("tmp_" + UUID.randomUUID()); } else { http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/83c6dfeb/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicContentHeaderProperties.java ---------------------------------------------------------------------- diff --git a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicContentHeaderProperties.java b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicContentHeaderProperties.java index 9b18a1e..6d3a55e 100644 --- a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicContentHeaderProperties.java +++ b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/transport/BasicContentHeaderProperties.java @@ -790,7 +790,7 @@ public class BasicContentHeaderProperties public void setMessageId(String messageId) { - setMessageId(messageId == null ? null : new AMQShortString(messageId)); + setMessageId(messageId == null ? null : AMQShortString.createAMQShortString(messageId)); } public synchronized void setMessageId(AMQShortString messageId) http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/83c6dfeb/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Test.java ---------------------------------------------------------------------- diff --git a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Test.java b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Test.java index 2631eaa..a677045 100644 --- a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Test.java +++ b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Test.java @@ -69,8 +69,8 @@ public class AMQPConnection_0_8Test extends QpidTestCase { private static final String VIRTUAL_HOST_NAME = "vhost"; private static final byte[] SASL_RESPONSE = "response".getBytes(); - private static final AMQShortString LOCALE = new AMQShortString("en_US"); - private static final AMQShortString SASL_MECH = new AMQShortString("MECH"); + private static final AMQShortString LOCALE = AMQShortString.createAMQShortString("en_US"); + private static final AMQShortString SASL_MECH = AMQShortString.createAMQShortString("MECH"); private TaskExecutorImpl _taskExecutor; private Broker _broker; @@ -216,7 +216,7 @@ public class AMQPConnection_0_8Test extends QpidTestCase conn.receiveConnectionStartOk(new FieldTable(), SASL_MECH, SASL_RESPONSE, LOCALE); int maxChannels = 10; conn.receiveConnectionTuneOk(maxChannels, 65535, 0); - conn.receiveConnectionOpen(new AMQShortString(VIRTUAL_HOST_NAME), AMQShortString.EMPTY_STRING, false); + conn.receiveConnectionOpen(AMQShortString.createAMQShortString(VIRTUAL_HOST_NAME), AMQShortString.EMPTY_STRING, false); // check the channel count is correct int channelCount = conn.getSessionModels().size(); http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/83c6dfeb/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/transport/MessagePublishInfoImplTest.java ---------------------------------------------------------------------- diff --git a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/transport/MessagePublishInfoImplTest.java b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/transport/MessagePublishInfoImplTest.java index fa14fc1..0012600 100644 --- a/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/transport/MessagePublishInfoImplTest.java +++ b/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/transport/MessagePublishInfoImplTest.java @@ -26,8 +26,8 @@ import org.apache.qpid.test.utils.QpidTestCase; public class MessagePublishInfoImplTest extends QpidTestCase { private MessagePublishInfo _mpi; - private final AMQShortString _exchange = new AMQShortString("exchange"); - private final AMQShortString _routingKey = new AMQShortString("routingKey"); + private final AMQShortString _exchange = AMQShortString.createAMQShortString("exchange"); + private final AMQShortString _routingKey = AMQShortString.createAMQShortString("routingKey"); @Override public void setUp() throws Exception @@ -40,7 +40,7 @@ public class MessagePublishInfoImplTest extends QpidTestCase public void testExchange() { assertEquals(_exchange, _mpi.getExchange()); - AMQShortString newExchange = new AMQShortString("newExchange"); + AMQShortString newExchange = AMQShortString.createAMQShortString("newExchange"); //Check we can update the exchange _mpi.setExchange(newExchange); assertEquals(newExchange, _mpi.getExchange()); @@ -88,7 +88,7 @@ public class MessagePublishInfoImplTest extends QpidTestCase public void testRoutingKey() { assertEquals(_routingKey, _mpi.getRoutingKey()); - AMQShortString newRoutingKey = new AMQShortString("newRoutingKey"); + AMQShortString newRoutingKey = AMQShortString.createAMQShortString("newRoutingKey"); //Check we can update the routingKey _mpi.setRoutingKey(newRoutingKey); http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/83c6dfeb/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_10_to_0_8.java ---------------------------------------------------------------------- diff --git a/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_10_to_0_8.java b/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_10_to_0_8.java index 7a2c82c..ab23155 100644 --- a/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_10_to_0_8.java +++ b/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_10_to_0_8.java @@ -99,7 +99,7 @@ public class MessageConverter_0_10_to_0_8 implements MessageConverter<MessageTra { try { - props.setAppId(new AMQShortString(messageProps.getAppId())); + props.setAppId(AMQShortString.createAMQShortString(messageProps.getAppId())); } catch (IllegalArgumentException e) { @@ -114,7 +114,7 @@ public class MessageConverter_0_10_to_0_8 implements MessageConverter<MessageTra { try { - props.setCorrelationId(new AMQShortString(messageProps.getCorrelationId())); + props.setCorrelationId(AMQShortString.createAMQShortString(messageProps.getCorrelationId())); } catch (IllegalArgumentException e) { @@ -165,7 +165,7 @@ public class MessageConverter_0_10_to_0_8 implements MessageConverter<MessageTra { try { - props.setUserId(new AMQShortString(messageProps.getUserId())); + props.setUserId(AMQShortString.createAMQShortString(messageProps.getUserId())); } catch (IllegalArgumentException e) { @@ -319,10 +319,10 @@ public class MessageConverter_0_10_to_0_8 implements MessageConverter<MessageTra DeliveryProperties delvProps = message.getHeader().getDeliveryProperties(); final AMQShortString exchangeName = (delvProps == null || delvProps.getExchange() == null) ? null - : new AMQShortString(delvProps.getExchange()); + : AMQShortString.createAMQShortString(delvProps.getExchange()); final AMQShortString routingKey = (delvProps == null || delvProps.getRoutingKey() == null) ? null - : new AMQShortString(delvProps.getRoutingKey()); + : AMQShortString.createAMQShortString(delvProps.getRoutingKey()); final boolean immediate = delvProps != null && delvProps.getImmediate(); final boolean mandatory = delvProps != null && !delvProps.getDiscardUnroutable(); http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/83c6dfeb/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_1_0_to_v0_8.java ---------------------------------------------------------------------- diff --git a/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_1_0_to_v0_8.java b/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_1_0_to_v0_8.java index e8a02fd..0576b33 100644 --- a/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_1_0_to_v0_8.java +++ b/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_1_0_to_v0_8.java @@ -296,7 +296,7 @@ public class MessageConverter_1_0_to_v0_8 implements MessageConverter<Message_1_ { try { - return new AMQShortString(userId.getArray()); + return AMQShortString.createAMQShortString(userId.getArray()); } catch (IllegalArgumentException e) { @@ -313,11 +313,11 @@ public class MessageConverter_1_0_to_v0_8 implements MessageConverter<Message_1_ { if (messageId instanceof Binary) { - return new AMQShortString(((Binary) messageId).getArray()); + return AMQShortString.createAMQShortString(((Binary) messageId).getArray()); } else if (messageId instanceof byte[]) { - return new AMQShortString(((byte[]) messageId)); + return AMQShortString.createAMQShortString(((byte[]) messageId)); } else { @@ -388,11 +388,11 @@ public class MessageConverter_1_0_to_v0_8 implements MessageConverter<Message_1_ { if (correlationIdObject instanceof Binary) { - correlationId = new AMQShortString(((Binary) correlationIdObject).getArray()); + correlationId = AMQShortString.createAMQShortString(((Binary) correlationIdObject).getArray()); } else if (correlationIdObject instanceof byte[]) { - correlationId = new AMQShortString(((byte[]) correlationIdObject)); + correlationId = AMQShortString.createAMQShortString(((byte[]) correlationIdObject)); } else { --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
