Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ConnectionCloseBody.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ConnectionCloseBody.java?rev=1683186&r1=1683185&r2=1683186&view=diff ============================================================================== --- qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ConnectionCloseBody.java (original) +++ qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ConnectionCloseBody.java Tue Jun 2 20:53:49 2015 @@ -48,7 +48,7 @@ public class ConnectionCloseBody extends // Constructor public ConnectionCloseBody(MarkableDataInput buffer, ProtocolVersion protocolVersion) throws AMQFrameDecodingException, IOException { - _ownMethodId = ProtocolVersion.v8_0.equals(protocolVersion) ? 60 : 50; + _ownMethodId = ProtocolVersion.v0_8.equals(protocolVersion) ? 60 : 50; _replyCode = buffer.readUnsignedShort(); _replyText = buffer.readAMQShortString(); _classId = buffer.readUnsignedShort(); @@ -62,7 +62,7 @@ public class ConnectionCloseBody extends int methodId ) { - _ownMethodId = ProtocolVersion.v8_0.equals(protocolVersion) ? 60 : 50; + _ownMethodId = ProtocolVersion.v0_8.equals(protocolVersion) ? 60 : 50; _replyCode = replyCode; _replyText = replyText; _classId = classId;
Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ConnectionRedirectBody.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ConnectionRedirectBody.java?rev=1683186&r1=1683185&r2=1683186&view=diff ============================================================================== --- qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ConnectionRedirectBody.java (original) +++ qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ConnectionRedirectBody.java Tue Jun 2 20:53:49 2015 @@ -46,14 +46,14 @@ public class ConnectionRedirectBody exte // Constructor public ConnectionRedirectBody(MarkableDataInput buffer, ProtocolVersion protocolVersion) throws AMQFrameDecodingException, IOException { - _ownMethodId = ProtocolVersion.v8_0.equals(protocolVersion) ? 50 : 42; + _ownMethodId = ProtocolVersion.v0_8.equals(protocolVersion) ? 50 : 42; _host = buffer.readAMQShortString(); _knownHosts = buffer.readAMQShortString(); } public ConnectionRedirectBody(ProtocolVersion protocolVersion, AMQShortString host, AMQShortString knownHosts) { - _ownMethodId = ProtocolVersion.v8_0.equals(protocolVersion) ? 50 : 42; + _ownMethodId = ProtocolVersion.v0_8.equals(protocolVersion) ? 50 : 42; _host = host; _knownHosts = knownHosts; } Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java?rev=1683186&r1=1683185&r2=1683186&view=diff ============================================================================== --- qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java (original) +++ qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java Tue Jun 2 20:53:49 2015 @@ -25,6 +25,7 @@ import java.io.DataOutput; import java.io.IOException; import java.nio.ByteBuffer; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -53,7 +54,12 @@ public class EncodingUtils } else { - return (short) (1 + s.length()); + int size = 1 + getUTF8Length(s); + if(size > 256) + { + throw new IllegalArgumentException("String '"+s+"' is too long - over 255 octets to encode"); + } + return (short) size; } } @@ -218,28 +224,20 @@ public class EncodingUtils } } - public static void writeShortStringBytes(DataOutput buffer, String s) throws IOException + public static void writeLongAsShortString(DataOutput buffer, long l) throws IOException { - if (s != null) + String s = Long.toString(l); + byte[] encodedString = new byte[1+s.length()]; + char[] cha = s.toCharArray(); + encodedString[0] = (byte) s.length(); + for (int i = 0; i < cha.length; i++) { - byte[] encodedString = new byte[s.length()]; - char[] cha = s.toCharArray(); - for (int i = 0; i < cha.length; i++) - { - encodedString[i] = (byte) cha[i]; - } + encodedString[i+1] = (byte) cha[i]; + } + buffer.write(encodedString); - // TODO: check length fits in an unsigned byte - writeUnsignedByte(buffer, (short)encodedString.length); - buffer.write(encodedString); - } - else - { - // really writing out unsigned byte - buffer.write((byte) 0); - } } public static void writeShortStringBytes(DataOutput buffer, AMQShortString s) throws IOException @@ -260,49 +258,10 @@ public class EncodingUtils { if (s != null) { - int len = s.length(); - writeUnsignedInteger(buffer, s.length()); - byte[] encodedString = new byte[len]; - char[] cha = s.toCharArray(); - for (int i = 0; i < cha.length; i++) - { - encodedString[i] = (byte) cha[i]; - } + int len = getUTF8Length(s); + writeUnsignedInteger(buffer, len); + buffer.write(asUTF8Bytes(s)); - buffer.write(encodedString); - } - else - { - writeUnsignedInteger(buffer, 0); - } - } - - public static void writeLongStringBytes(DataOutput buffer, char[] s) throws IOException - { - if (s != null) - { - int len = s.length; - writeUnsignedInteger(buffer, s.length); - byte[] encodedString = new byte[len]; - for (int i = 0; i < s.length; i++) - { - encodedString[i] = (byte) s[i]; - } - - buffer.write(encodedString); - } - else - { - writeUnsignedInteger(buffer, 0); - } - } - - public static void writeLongStringBytes(DataOutput buffer, byte[] bytes) throws IOException - { - if (bytes != null) - { - writeUnsignedInteger(buffer, bytes.length); - buffer.write(bytes); } else { @@ -686,20 +645,10 @@ public class EncodingUtils } else { - // this may seem rather odd to declare two array but testing has shown - // that constructing a string from a byte array is 5 (five) times slower - // than constructing one from a char array. - // this approach here is valid since we know that all the chars are - // ASCII (0-127) byte[] stringBytes = new byte[(int) length]; buffer.readFully(stringBytes, 0, (int) length); - char[] stringChars = new char[(int) length]; - for (int i = 0; i < stringChars.length; i++) - { - stringChars[i] = (char) stringBytes[i]; - } - return new String(stringChars); + return new String(stringBytes, StandardCharsets.UTF_8); } } @@ -1010,4 +959,90 @@ public class EncodingUtils return l; } + public static byte[] asUTF8Bytes(CharSequence string) + { + byte[] bytes = new byte[getUTF8Length(string)]; + int j = 0; + if(string != null) + { + final int length = string.length(); + int c; + + for (int i = 0; i < length; i++) + { + c = string.charAt(i); + if ((c & 0xFF80) == 0) /* U+0000..U+007F */ + { + bytes[j++] = (byte) c; + } + else if ((c & 0xF800) == 0) /* U+0080..U+07FF */ + { + bytes[j++] = (byte) (0xC0 | ((c >> 6) & 0x1F)); + bytes[j++] = (byte) (0x80 | (c & 0x3F)); + } + else if ((c & 0xD800) != 0xD800 || (c > 0xDBFF)) /* U+0800..U+FFFF - excluding surrogate pairs */ + { + bytes[j++] = (byte) (0xE0 | ((c >> 12) & 0x0F)); + bytes[j++] = (byte) (0x80 | ((c >> 6) & 0x3F)); + bytes[j++] = (byte) (0x80 | (c & 0x3F)); + } + else + { + int low; + + if ((++i == length) || ((low = string.charAt(i)) & 0xDC00) != 0xDC00) + { + throw new IllegalArgumentException("String contains invalid Unicode code points"); + } + + c = 0x010000 + ((c & 0x03FF) << 10) + (low & 0x03FF); + + bytes[j++] = (byte) (0xF0 | ((c >> 18) & 0x07)); + bytes[j++] = (byte) (0x80 | ((c >> 12) & 0x3F)); + bytes[j++] = (byte) (0x80 | ((c >> 6) & 0x3F)); + bytes[j++] = (byte) (0x80 | (c & 0x3F)); + } + } + } + return bytes; + } + + public static int getUTF8Length(CharSequence string) + { + int size = 0; + if(string != null) + { + int c; + + final int inputLength = string.length(); + for (int i = 0; i < inputLength; i++) + { + c = string.charAt(i); + if ((c & 0xFF80) == 0) /* U+0000..U+007F */ + { + size++; + } + else if ((c & 0xF800) == 0) /* U+0080..U+07FF */ + { + size += 2; + } + else if ((c & 0xD800) != 0xD800 || (c > 0xDBFF)) /* U+0800..U+FFFF - excluding surrogate pairs */ + { + size += 3; + } + else + { + if ((++i == size) || (string.charAt(i) & 0xDC00) != 0xDC00) + { + throw new IllegalArgumentException("String contains invalid Unicode code points"); + } + + size += 4; + } + } + + } + return size; + } + } Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/FieldTable.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/FieldTable.java?rev=1683186&r1=1683185&r2=1683186&view=diff ============================================================================== --- qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/FieldTable.java (original) +++ qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/FieldTable.java Tue Jun 2 20:53:49 2015 @@ -716,7 +716,7 @@ public class FieldTable } else if (object instanceof Map) { - return setFieldTable(string, FieldTable.convertToFieldTable((Map) object)); + return setFieldTable(string, FieldTable.convertToFieldTable((Map<String,Object>) object)); } else if (object instanceof Date) { @@ -913,16 +913,20 @@ public class FieldTable if(fieldTable != null) { fieldTable.processOverElements( - new FieldTableElementProcessor() + new FieldTableElementProcessor() { public boolean processElement(String propertyName, AMQTypedValue value) { Object val = value.getValue(); - if(val instanceof AMQShortString) + if (val instanceof AMQShortString) { val = val.toString(); } + else if (val instanceof FieldTable) + { + val = FieldTable.convertToMap((FieldTable) val); + } map.put(propertyName, val); return true; } @@ -1159,6 +1163,7 @@ public class FieldTable return _properties.equals(f._properties); } + public static FieldTable convertToFieldTable(Map<String, Object> map) { if (map != null) @@ -1166,7 +1171,16 @@ public class FieldTable FieldTable table = new FieldTable(); for(Map.Entry<String,Object> entry : map.entrySet()) { - table.put(AMQShortString.valueOf(entry.getKey()), entry.getValue()); + final AMQShortString propertyNameAsShotString = AMQShortString.valueOf(entry.getKey()); + Object value = entry.getValue(); + if(value instanceof Map) + { + table.setFieldTable(propertyNameAsShotString, convertToFieldTable((Map<String,Object>)value)); + } + else + { + table.put(propertyNameAsShotString, value); + } } return table; Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/FrameCreatingMethodProcessor.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/FrameCreatingMethodProcessor.java?rev=1683186&r1=1683185&r2=1683186&view=diff ============================================================================== --- qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/FrameCreatingMethodProcessor.java (original) +++ qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/FrameCreatingMethodProcessor.java Tue Jun 2 20:53:49 2015 @@ -118,7 +118,7 @@ public class FrameCreatingMethodProcesso @Override public void receiveConnectionCloseOk() { - _processedMethods.add(new AMQFrame(0, ProtocolVersion.v8_0.equals(getProtocolVersion()) + _processedMethods.add(new AMQFrame(0, ProtocolVersion.v0_8.equals(getProtocolVersion()) ? ConnectionCloseOkBody.CONNECTION_CLOSE_OK_0_8 : ConnectionCloseOkBody.CONNECTION_CLOSE_OK_0_9)); } @@ -204,7 +204,7 @@ public class FrameCreatingMethodProcesso @Override public void receiveChannelOpenOk() { - _processedMethods.add(new AMQFrame(_channelId, ProtocolVersion.v8_0.equals(getProtocolVersion()) + _processedMethods.add(new AMQFrame(_channelId, ProtocolVersion.v0_8.equals(getProtocolVersion()) ? ChannelOpenOkBody.INSTANCE_0_8 : ChannelOpenOkBody.INSTANCE_0_9)); } @@ -479,7 +479,7 @@ public class FrameCreatingMethodProcesso @Override public void receiveBasicRecover(final boolean requeue, final boolean sync) { - if(ProtocolVersion.v8_0.equals(getProtocolVersion()) || !sync) + if(ProtocolVersion.v0_8.equals(getProtocolVersion()) || !sync) { _processedMethods.add(new AMQFrame(_channelId, new BasicRecoverBody(requeue))); } Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/MethodRegistry.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/MethodRegistry.java?rev=1683186&r1=1683185&r2=1683186&view=diff ============================================================================== --- qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/MethodRegistry.java (original) +++ qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/MethodRegistry.java Tue Jun 2 20:53:49 2015 @@ -29,6 +29,8 @@ package org.apache.qpid.framing; +import java.util.Map; + public final class MethodRegistry { private ProtocolVersion _protocolVersion; @@ -80,22 +82,23 @@ public final class MethodRegistry } public final BasicConsumeBody createBasicConsumeBody(final int ticket, - final AMQShortString queue, - final AMQShortString consumerTag, + final String queue, + final String consumerTag, final boolean noLocal, final boolean noAck, final boolean exclusive, final boolean nowait, - final FieldTable arguments) + final Map<String,Object> arguments) { + return new BasicConsumeBody(ticket, - queue, - consumerTag, + AMQShortString.valueOf(queue), + AMQShortString.valueOf(consumerTag), noLocal, noAck, exclusive, nowait, - arguments); + FieldTable.convertToFieldTable(arguments)); } public final BasicConsumeOkBody createBasicConsumeOkBody(final AMQShortString consumerTag) @@ -116,14 +119,14 @@ public final class MethodRegistry } public final BasicPublishBody createBasicPublishBody(final int ticket, - final AMQShortString exchange, - final AMQShortString routingKey, + final String exchange, + final String routingKey, final boolean mandatory, final boolean immediate) { return new BasicPublishBody(ticket, - exchange, - routingKey, + AMQShortString.valueOf(exchange), + AMQShortString.valueOf(routingKey), mandatory, immediate); } @@ -231,7 +234,7 @@ public final class MethodRegistry public final ChannelOpenOkBody createChannelOpenOkBody() { - return _protocolVersion.equals(ProtocolVersion.v8_0) + return _protocolVersion.equals(ProtocolVersion.v0_8) ? ChannelOpenOkBody.INSTANCE_0_8 : ChannelOpenOkBody.INSTANCE_0_9; } @@ -353,31 +356,32 @@ public final class MethodRegistry public final ConnectionCloseOkBody createConnectionCloseOkBody() { - return ProtocolVersion.v8_0.equals(_protocolVersion) + return ProtocolVersion.v0_8.equals(_protocolVersion) ? ConnectionCloseOkBody.CONNECTION_CLOSE_OK_0_8 : ConnectionCloseOkBody.CONNECTION_CLOSE_OK_0_9; } public final ExchangeDeclareBody createExchangeDeclareBody(final int ticket, - final AMQShortString exchange, - final AMQShortString type, + final String exchange, + final String type, final boolean passive, final boolean durable, final boolean autoDelete, final boolean internal, final boolean nowait, - final FieldTable arguments) + final Map<String,Object> arguments) { + return new ExchangeDeclareBody(ticket, - exchange, - type, + AMQShortString.valueOf(exchange), + AMQShortString.valueOf(type), passive, durable, autoDelete, internal, nowait, - arguments); + FieldTable.convertToFieldTable(arguments)); } public final ExchangeDeclareOkBody createExchangeDeclareOkBody() @@ -386,12 +390,12 @@ public final class MethodRegistry } public final ExchangeDeleteBody createExchangeDeleteBody(final int ticket, - final AMQShortString exchange, - final boolean ifUnused, - final boolean nowait) + final String exchange, + final boolean ifUnused, + final boolean nowait) { return new ExchangeDeleteBody(ticket, - exchange, + AMQShortString.valueOf(exchange), ifUnused, nowait ); @@ -402,13 +406,13 @@ public final class MethodRegistry return new ExchangeDeleteOkBody(); } - public final ExchangeBoundBody createExchangeBoundBody(final AMQShortString exchange, - final AMQShortString routingKey, - final AMQShortString queue) - { - return new ExchangeBoundBody(exchange, - routingKey, - queue); + public final ExchangeBoundBody createExchangeBoundBody(final String exchange, + final String routingKey, + final String queue) + { + return new ExchangeBoundBody(AMQShortString.valueOf(exchange), + AMQShortString.valueOf(routingKey), + AMQShortString.valueOf(queue)); } public final ExchangeBoundOkBody createExchangeBoundOkBody(final int replyCode, @@ -420,22 +424,23 @@ public final class MethodRegistry public final QueueDeclareBody createQueueDeclareBody(final int ticket, - final AMQShortString queue, - final boolean passive, - final boolean durable, - final boolean exclusive, - final boolean autoDelete, - final boolean nowait, - final FieldTable arguments) + final String queue, + final boolean passive, + final boolean durable, + final boolean exclusive, + final boolean autoDelete, + final boolean nowait, + final Map<String,Object> arguments) { + return new QueueDeclareBody(ticket, - queue, + AMQShortString.valueOf(queue), passive, durable, exclusive, autoDelete, nowait, - arguments); + FieldTable.convertToFieldTable(arguments)); } public final QueueDeclareOkBody createQueueDeclareOkBody(final AMQShortString queue, @@ -448,20 +453,23 @@ public final class MethodRegistry } public final QueueBindBody createQueueBindBody(final int ticket, - final AMQShortString queue, - final AMQShortString exchange, - final AMQShortString routingKey, + final String queue, + final String exchange, + final String routingKey, final boolean nowait, - final FieldTable arguments) + final Map<String,Object> arguments) { + return new QueueBindBody(ticket, - queue, - exchange, - routingKey, + AMQShortString.valueOf(queue), + AMQShortString.valueOf(exchange), + AMQShortString.valueOf(routingKey), nowait, - arguments); + FieldTable.convertToFieldTable(arguments)); + } + public final QueueBindOkBody createQueueBindOkBody() { return new QueueBindOkBody(); @@ -482,13 +490,13 @@ public final class MethodRegistry } public final QueueDeleteBody createQueueDeleteBody(final int ticket, - final AMQShortString queue, + final String queue, final boolean ifUnused, final boolean ifEmpty, final boolean nowait) { return new QueueDeleteBody(ticket, - queue, + AMQShortString.valueOf(queue), ifUnused, ifEmpty, nowait); Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java?rev=1683186&r1=1683185&r2=1683186&view=diff ============================================================================== --- qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java (original) +++ qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java Tue Jun 2 20:53:49 2015 @@ -206,7 +206,7 @@ public class ProtocolInitiation extends } else { - pv = new ProtocolVersion(_protocolMajor, _protocolMinor); + pv = ProtocolVersion.get(_protocolMajor, _protocolMinor); } Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ProtocolVersion.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ProtocolVersion.java?rev=1683186&r1=1683185&r2=1683186&view=diff ============================================================================== --- qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ProtocolVersion.java (original) +++ qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ProtocolVersion.java Tue Jun 2 20:53:49 2015 @@ -34,6 +34,7 @@ import java.util.Collections; import java.util.TreeSet; import java.util.Map; import java.util.HashMap; +import java.util.concurrent.ConcurrentHashMap; public class ProtocolVersion implements Comparable { @@ -41,7 +42,7 @@ public class ProtocolVersion implements private final byte _minorVersion; private final String _stringFormat; - public ProtocolVersion(byte majorVersion, byte minorVersion) + private ProtocolVersion(byte majorVersion, byte minorVersion) { _majorVersion = majorVersion; _minorVersion = minorVersion; @@ -146,7 +147,9 @@ public class ProtocolVersion implements public static final ProtocolVersion v0_9 = new ProtocolVersion((byte)0,(byte)9); public static final ProtocolVersion v0_91 = new ProtocolVersion((byte)0,(byte)91); - public static final ProtocolVersion v8_0 = new ProtocolVersion((byte)8,(byte)0); + public static final ProtocolVersion v0_8 = new ProtocolVersion((byte)8,(byte)0); + + private static final Map<ProtocolVersion, ProtocolVersion> INSTANCES = new ConcurrentHashMap<ProtocolVersion,ProtocolVersion>(); static { @@ -158,8 +161,8 @@ public class ProtocolVersion implements _nameToVersionMap.put("0-9", v0_9); versions.add(v0_91); _nameToVersionMap.put("0-91", v0_91); - versions.add(v8_0); - _nameToVersionMap.put("8-0", v8_0); + versions.add(v0_8); + _nameToVersionMap.put("8-0", v0_8); _supportedVersions = Collections.unmodifiableSortedSet(versions); ProtocolVersion systemDefinedVersion = @@ -168,6 +171,10 @@ public class ProtocolVersion implements _defaultVersion = (systemDefinedVersion == null) ? getLatestSupportedVersion() : systemDefinedVersion; + INSTANCES.put(v0_10,v0_10); + INSTANCES.put(v0_9,v0_9); + INSTANCES.put(v0_91,v0_91); + INSTANCES.put(v0_8, v0_8); } public static SortedSet<ProtocolVersion> getSupportedProtocolVersions() @@ -185,4 +192,12 @@ public class ProtocolVersion implements return _defaultVersion; } + public static ProtocolVersion get(byte majorVersion, byte minorVersion) + { + ProtocolVersion pv = new ProtocolVersion(majorVersion, minorVersion); + ProtocolVersion instance = INSTANCES.get(pv); + return instance == null ? pv : instance; + } + + } Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/network/Transport.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/network/Transport.java?rev=1683186&r1=1683185&r2=1683186&view=diff ============================================================================== --- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/network/Transport.java (original) +++ qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/network/Transport.java Tue Jun 2 20:53:49 2015 @@ -46,7 +46,7 @@ public class Transport static { final Map<ProtocolVersion,String> map = new HashMap<ProtocolVersion, String>(); - map.put(ProtocolVersion.v8_0, IO_TRANSPORT_CLASSNAME); + map.put(ProtocolVersion.v0_8, IO_TRANSPORT_CLASSNAME); map.put(ProtocolVersion.v0_9, IO_TRANSPORT_CLASSNAME); map.put(ProtocolVersion.v0_91, IO_TRANSPORT_CLASSNAME); map.put(ProtocolVersion.v0_10, IO_TRANSPORT_CLASSNAME); @@ -124,7 +124,7 @@ public class Transport { protocolSpecificSystemProperty = QPID_TRANSPORT_V0_9_PROPNAME; } - else if (ProtocolVersion.v8_0.equals(protocolVersion)) + else if (ProtocolVersion.v0_8.equals(protocolVersion)) { protocolSpecificSystemProperty = QPID_TRANSPORT_V0_8_PROPNAME; } Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/url/AMQBindingURL.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/url/AMQBindingURL.java?rev=1683186&r1=1683185&r2=1683186&view=diff ============================================================================== --- qpid/java/trunk/common/src/main/java/org/apache/qpid/url/AMQBindingURL.java (original) +++ qpid/java/trunk/common/src/main/java/org/apache/qpid/url/AMQBindingURL.java Tue Jun 2 20:53:49 2015 @@ -35,11 +35,11 @@ public class AMQBindingURL implements Bi private static final Logger _logger = LoggerFactory.getLogger(AMQBindingURL.class); private String _url; - private AMQShortString _exchangeClass = AMQShortString.valueOf(ExchangeDefaults.DIRECT_EXCHANGE_CLASS); - private AMQShortString _exchangeName = new AMQShortString(""); - private AMQShortString _destinationName = new AMQShortString(""); - private AMQShortString _queueName = new AMQShortString(""); - private AMQShortString[] _bindingKeys = new AMQShortString[0]; + private String _exchangeClass = ExchangeDefaults.DIRECT_EXCHANGE_CLASS; + private String _exchangeName = ""; + private String _destinationName = ""; + private String _queueName = ""; + private String[] _bindingKeys = new String[0]; private HashMap<String, String> _options; public AMQBindingURL(String url) throws URISyntaxException @@ -60,73 +60,54 @@ public class AMQBindingURL implements Bi _logger.debug("URL Parsed: " + this); } - public void setExchangeClass(String exchangeClass) - { - setExchangeClass(new AMQShortString(exchangeClass)); - } - - public void setQueueName(String name) - { - setQueueName(new AMQShortString(name)); - } - - public void setDestinationName(String name) - { - setDestinationName(new AMQShortString(name)); - } - - public void setExchangeName(String exchangeName) - { - setExchangeName(new AMQShortString(exchangeName)); - } public String getURL() { return _url; } - public AMQShortString getExchangeClass() + public String getExchangeClass() { return _exchangeClass; } - private void setExchangeClass(AMQShortString exchangeClass) + public void setExchangeClass(String exchangeClass) { _exchangeClass = exchangeClass; - if (exchangeClass.equals(AMQShortString.valueOf(ExchangeDefaults.TOPIC_EXCHANGE_CLASS))) + if (exchangeClass.equals(ExchangeDefaults.TOPIC_EXCHANGE_CLASS)) { setOption(BindingURL.OPTION_EXCLUSIVE, "true"); } } - public AMQShortString getExchangeName() + public String getExchangeName() { return _exchangeName; } - private void setExchangeName(AMQShortString name) + public void setExchangeName(String name) { _exchangeName = name; } - public AMQShortString getDestinationName() + public String getDestinationName() { return _destinationName; } - private void setDestinationName(AMQShortString name) + public void setDestinationName(String name) { _destinationName = name; } - public AMQShortString getQueueName() + public String getQueueName() { return _queueName; } - public void setQueueName(AMQShortString name) + public void setQueueName(String name) { _queueName = name; } @@ -160,13 +141,13 @@ public class AMQBindingURL implements Bi return _options.containsKey(key); } - public AMQShortString getRoutingKey() + public String getRoutingKey() { - if (_exchangeClass.equals(AMQShortString.valueOf(ExchangeDefaults.DIRECT_EXCHANGE_CLASS))) + if (_exchangeClass.equals(ExchangeDefaults.DIRECT_EXCHANGE_CLASS)) { if (containsOption(BindingURL.OPTION_ROUTING_KEY)) { - return new AMQShortString(getOption(OPTION_ROUTING_KEY)); + return getOption(OPTION_ROUTING_KEY); } else { @@ -176,13 +157,13 @@ public class AMQBindingURL implements Bi if (containsOption(BindingURL.OPTION_ROUTING_KEY)) { - return new AMQShortString(getOption(OPTION_ROUTING_KEY)); + return getOption(OPTION_ROUTING_KEY); } return getDestinationName(); } - public AMQShortString[] getBindingKeys() + public String[] getBindingKeys() { if (_bindingKeys != null && _bindingKeys.length>0) { @@ -190,18 +171,18 @@ public class AMQBindingURL implements Bi } else { - return new AMQShortString[]{getRoutingKey()}; + return new String[]{getRoutingKey()}; } } - public void setBindingKeys(AMQShortString[] keys) + public void setBindingKeys(String[] keys) { _bindingKeys = keys; } - public void setRoutingKey(AMQShortString key) + public void setRoutingKey(String key) { - setOption(OPTION_ROUTING_KEY, key.toString()); + setOption(OPTION_ROUTING_KEY, key); } public String toString() @@ -219,7 +200,7 @@ public class AMQBindingURL implements Bi sb.append(URLHelper.printOptions(_options)); // temp hack - if (getRoutingKey() == null || getRoutingKey().toString().equals("")) + if (getRoutingKey() == null || getRoutingKey().equals("")) { if (!sb.toString().contains("?")) @@ -231,9 +212,9 @@ public class AMQBindingURL implements Bi sb.append("&"); } - for (AMQShortString key :_bindingKeys) + for (String key :_bindingKeys) { - sb.append(BindingURL.OPTION_BINDING_KEY).append("='").append(key.toString()).append("'&"); + sb.append(BindingURL.OPTION_BINDING_KEY).append("='").append(key).append("'&"); } return sb.toString().substring(0,sb.toString().length()-1); Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/url/BindingURL.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/url/BindingURL.java?rev=1683186&r1=1683185&r2=1683186&view=diff ============================================================================== --- qpid/java/trunk/common/src/main/java/org/apache/qpid/url/BindingURL.java (original) +++ qpid/java/trunk/common/src/main/java/org/apache/qpid/url/BindingURL.java Tue Jun 2 20:53:49 2015 @@ -34,15 +34,15 @@ import org.apache.qpid.framing.AMQShortS */ public interface BindingURL { - public static final String OPTION_EXCLUSIVE = "exclusive"; - public static final String OPTION_AUTODELETE = "autodelete"; - public static final String OPTION_DURABLE = "durable"; - public static final String OPTION_BROWSE = "browse"; - public static final String OPTION_ROUTING_KEY = "routingkey"; - public static final String OPTION_BINDING_KEY = "bindingkey"; - public static final String OPTION_EXCHANGE_AUTODELETE = "exchangeautodelete"; - public static final String OPTION_EXCHANGE_DURABLE = "exchangedurable"; - public static final String OPTION_EXCHANGE_INTERNAL = "exchangeinternal"; + String OPTION_EXCLUSIVE = "exclusive"; + String OPTION_AUTODELETE = "autodelete"; + String OPTION_DURABLE = "durable"; + String OPTION_BROWSE = "browse"; + String OPTION_ROUTING_KEY = "routingkey"; + String OPTION_BINDING_KEY = "bindingkey"; + String OPTION_EXCHANGE_AUTODELETE = "exchangeautodelete"; + String OPTION_EXCHANGE_DURABLE = "exchangedurable"; + String OPTION_EXCHANGE_INTERNAL = "exchangeinternal"; /** * This option is only applicable for 0-8/0-9/0-9-1 protocols connection @@ -51,9 +51,9 @@ public interface BindingURL * server .If this option is not specified, the messages won't be moved to * the DLQ (or dropped) when delivery count exceeds the maximum. */ - public static final String OPTION_REJECT_BEHAVIOUR = "rejectbehaviour"; + String OPTION_REJECT_BEHAVIOUR = "rejectbehaviour"; - public static final Set<String> NON_CONSUMER_OPTIONS = + Set<String> NON_CONSUMER_OPTIONS = Collections.unmodifiableSet(new HashSet<String>(Arrays.asList(OPTION_EXCLUSIVE, OPTION_AUTODELETE, OPTION_DURABLE, @@ -68,13 +68,13 @@ public interface BindingURL String getURL(); - AMQShortString getExchangeClass(); + String getExchangeClass(); - AMQShortString getExchangeName(); + String getExchangeName(); - AMQShortString getDestinationName(); + String getDestinationName(); - AMQShortString getQueueName(); + String getQueueName(); String getOption(String key); @@ -83,9 +83,9 @@ public interface BindingURL boolean containsOption(String key); - AMQShortString getRoutingKey(); + String getRoutingKey(); - AMQShortString[] getBindingKeys(); + String[] getBindingKeys(); String toString(); } Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/url/BindingURLParser.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/url/BindingURLParser.java?rev=1683186&r1=1683185&r2=1683186&view=diff ============================================================================== --- qpid/java/trunk/common/src/main/java/org/apache/qpid/url/BindingURLParser.java (original) +++ qpid/java/trunk/common/src/main/java/org/apache/qpid/url/BindingURLParser.java Tue Jun 2 20:53:49 2015 @@ -387,17 +387,17 @@ public class BindingURLParser if (obj instanceof String) { - AMQShortString[] bindingKeys = new AMQShortString[]{new AMQShortString((String)obj)}; + String[] bindingKeys = new String[]{(String)obj}; _bindingURL.setBindingKeys(bindingKeys); } else // it would be a list { List list = (List)obj; - AMQShortString[] bindingKeys = new AMQShortString[list.size()]; + String[] bindingKeys = new String[list.size()]; int i=0; for (Iterator it = list.iterator(); it.hasNext();) { - bindingKeys[i] = new AMQShortString((String)it.next()); + bindingKeys[i] = (String)it.next(); i++; } _bindingURL.setBindingKeys(bindingKeys); Modified: qpid/java/trunk/common/src/test/java/org/apache/qpid/framing/AMQShortStringTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/test/java/org/apache/qpid/framing/AMQShortStringTest.java?rev=1683186&r1=1683185&r2=1683186&view=diff ============================================================================== --- qpid/java/trunk/common/src/test/java/org/apache/qpid/framing/AMQShortStringTest.java (original) +++ qpid/java/trunk/common/src/test/java/org/apache/qpid/framing/AMQShortStringTest.java Tue Jun 2 20:53:49 2015 @@ -34,73 +34,6 @@ public class AMQShortStringTest extends public static final AMQShortString GOOD = new AMQShortString("Good"); public static final AMQShortString BYE = new AMQShortString("BYE"); - public void testStartsWith() - { - assertTrue(HELLO.startsWith(HELL)); - - assertFalse(HELL.startsWith(HELLO)); - - assertTrue(GOODBYE.startsWith(GOOD)); - - assertFalse(GOOD.startsWith(GOODBYE)); - } - - public void testEndWith() - { - assertFalse(HELL.endsWith(HELLO)); - - assertTrue(GOODBYE.endsWith(new AMQShortString("bye"))); - - assertFalse(GOODBYE.endsWith(BYE)); - } - - - public void testTokenize() - { - AMQShortString dotSeparatedWords = new AMQShortString("this.is.a.test.with.1.2.3.-numbers-and-then--dashes-"); - AMQShortStringTokenizer dotTokenizer = dotSeparatedWords.tokenize((byte) '.'); - - assertTrue(dotTokenizer.hasMoreTokens()); - assertEquals(new AMQShortString("this"),(dotTokenizer.nextToken())); - assertTrue(dotTokenizer.hasMoreTokens()); - assertEquals(new AMQShortString("is"),(dotTokenizer.nextToken())); - assertTrue(dotTokenizer.hasMoreTokens()); - assertEquals(new AMQShortString("a"),(dotTokenizer.nextToken())); - assertTrue(dotTokenizer.hasMoreTokens()); - assertEquals(new AMQShortString("test"),(dotTokenizer.nextToken())); - assertTrue(dotTokenizer.hasMoreTokens()); - assertEquals(new AMQShortString("with"),(dotTokenizer.nextToken())); - assertTrue(dotTokenizer.hasMoreTokens()); - assertEquals(dotTokenizer.nextToken().toIntValue() , 1); - assertTrue(dotTokenizer.hasMoreTokens()); - assertEquals(dotTokenizer.nextToken().toIntValue() , 2); - assertTrue(dotTokenizer.hasMoreTokens()); - assertEquals(dotTokenizer.nextToken().toIntValue() , 3); - assertTrue(dotTokenizer.hasMoreTokens()); - AMQShortString dashString = dotTokenizer.nextToken(); - assertEquals(new AMQShortString("-numbers-and-then--dashes-"),(dashString)); - - AMQShortStringTokenizer dashTokenizer = dashString.tokenize((byte)'-'); - assertEquals(dashTokenizer.countTokens(), 7); - - AMQShortString[] expectedResults = new AMQShortString[] - { AMQShortString.EMPTY_STRING, - new AMQShortString("numbers"), - new AMQShortString("and"), - new AMQShortString("then"), - AMQShortString.EMPTY_STRING, - new AMQShortString("dashes"), - AMQShortString.EMPTY_STRING }; - - for(int i = 0; i < 7; i++) - { - assertTrue(dashTokenizer.hasMoreTokens()); - assertEquals(dashTokenizer.nextToken(), expectedResults[i]); - } - - assertFalse(dotTokenizer.hasMoreTokens()); - } - public void testEquals() { @@ -126,7 +59,8 @@ public class AMQShortStringTest extends } AMQShortString string = new AMQShortString(bytes); assertEquals("constructed amq short string length differs from expected", 4, string.length()); - assertTrue("constructed amq short string differs from expected", string.equalsCharSequence("test")); + + assertTrue("constructed amq short string differs from expected", string.toString().equals("test")); } /** @@ -139,34 +73,8 @@ public class AMQShortStringTest extends { AMQShortString string = new AMQShortString("test"); assertEquals("constructed amq short string length differs from expected", 4, string.length()); - assertTrue("constructed amq short string differs from expected", string.equalsCharSequence("test")); - } - - /** - * Test method for - * {@link org.apache.qpid.framing.AMQShortString#AMQShortString(char[])}. - * <p> - * Tests short string construction from char array with length less than 255. - */ - public void testCreateAMQShortStringCharArray() - { - char[] chars = "test".toCharArray(); - AMQShortString string = new AMQShortString(chars); - assertEquals("constructed amq short string length differs from expected", 4, string.length()); - assertTrue("constructed amq short string differs from expected", string.equalsCharSequence("test")); - } - /** - * Test method for - * {@link org.apache.qpid.framing.AMQShortString#AMQShortString(java.lang.CharSequence)} - * <p> - * Tests short string construction from char sequence with length less than 255. - */ - public void testCreateAMQShortStringCharSequence() - { - AMQShortString string = new AMQShortString((CharSequence) "test"); - assertEquals("constructed amq short string length differs from expected", 4, string.length()); - assertTrue("constructed amq short string differs from expected", string.equalsCharSequence("test")); + assertTrue("constructed amq short string differs from expected", string.toString().equals("test")); } /** @@ -220,98 +128,19 @@ public class AMQShortStringTest extends } } - /** - * Test method for - * {@link org.apache.qpid.framing.AMQShortString#AMQShortString(char[])}. - * <p> - * Tests an attempt to create an AMQP short string from char array with length over 255. - */ - public void testCreateAMQShortStringCharArrayOver255() - { - String test = buildString('a', 256); - char[] chars = test.toCharArray(); - try - { - new AMQShortString(chars); - fail("It should not be possible to create AMQShortString with length over 255"); - } - catch (IllegalArgumentException e) - { - assertEquals("Exception message differs from expected", - "Cannot create AMQShortString with number of octets over 255!", e.getMessage()); - } - } - - /** - * Test method for - * {@link org.apache.qpid.framing.AMQShortString#AMQShortString(java.lang.CharSequence)} - * <p> - * Tests an attempt to create an AMQP short string from char sequence with length over 255. - */ - public void testCreateAMQShortStringCharSequenceOver255() - { - String test = buildString('a', 256); - try - { - new AMQShortString((CharSequence) test); - fail("It should not be possible to create AMQShortString with length over 255"); - } - catch (IllegalArgumentException e) - { - assertEquals("Exception message differs from expected", - "Cannot create AMQShortString with number of octets over 255!", e.getMessage()); - } - } - - /** - * Tests joining of short strings into a short string with length over 255. - */ - public void testJoinOverflow() - { - List<AMQShortString> data = new ArrayList<AMQShortString>(); - for (int i = 0; i < 25; i++) - { - data.add(new AMQShortString("test data!")); - } - try - { - AMQShortString.join(data, new AMQShortString(" ")); - fail("It should not be possible to create AMQShortString with length over 255"); - } - catch (IllegalArgumentException e) - { - assertEquals("Exception message differs from expected", - "Cannot create AMQShortString with number of octets over 255!", e.getMessage()); - } - } - - /** - * Tests joining of short strings into a short string with length less than 255. - */ - public void testJoin() - { - StringBuilder expected = new StringBuilder(); - List<AMQShortString> data = new ArrayList<AMQShortString>(); - data.add(new AMQShortString("test data 1")); - expected.append("test data 1"); - data.add(new AMQShortString("test data 2")); - expected.append(" test data 2"); - AMQShortString result = AMQShortString.join(data, new AMQShortString(" ")); - assertEquals("join result differs from expected", expected.toString(), result.asString()); - } - public void testValueOf() { String string = buildString('a', 255); AMQShortString shortString = AMQShortString.valueOf(string, true, true); - assertEquals("Unexpected string from valueOf", string, shortString.asString()); + assertEquals("Unexpected string from valueOf", string, shortString.toString()); } public void testValueOfTruncated() { String string = buildString('a', 256); AMQShortString shortString = AMQShortString.valueOf(string, true, true); - assertEquals("Unexpected truncated string from valueOf", string.substring(0, AMQShortString.MAX_LENGTH -3) + "...", shortString.asString()); + assertEquals("Unexpected truncated string from valueOf", string.substring(0, AMQShortString.MAX_LENGTH -3) + "...", + shortString.toString()); } public void testValueOfNulAsEmptyString() Modified: qpid/java/trunk/common/src/test/java/org/apache/qpid/transport/network/TransportTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/test/java/org/apache/qpid/transport/network/TransportTest.java?rev=1683186&r1=1683185&r2=1683186&view=diff ============================================================================== --- qpid/java/trunk/common/src/test/java/org/apache/qpid/transport/network/TransportTest.java (original) +++ qpid/java/trunk/common/src/test/java/org/apache/qpid/transport/network/TransportTest.java Tue Jun 2 20:53:49 2015 @@ -41,7 +41,7 @@ public class TransportTest extends QpidT public void testDefaultGetOutgoingTransportForv0_8() throws Exception { - final OutgoingNetworkTransport networkTransport = Transport.getOutgoingTransportInstance(ProtocolVersion.v8_0); + final OutgoingNetworkTransport networkTransport = Transport.getOutgoingTransportInstance(ProtocolVersion.v0_8); assertNotNull(networkTransport); assertTrue(networkTransport instanceof IoNetworkTransport); } @@ -50,7 +50,7 @@ public class TransportTest extends QpidT { setTestSystemProperty(Transport.QPID_TRANSPORT_PROPNAME, TestOutgoingNetworkTransport.class.getName()); - final OutgoingNetworkTransport networkTransport = Transport.getOutgoingTransportInstance(ProtocolVersion.v8_0); + final OutgoingNetworkTransport networkTransport = Transport.getOutgoingTransportInstance(ProtocolVersion.v0_8); assertNotNull(networkTransport); assertTrue(networkTransport instanceof TestOutgoingNetworkTransport); } @@ -59,7 +59,7 @@ public class TransportTest extends QpidT { setTestSystemProperty(Transport.QPID_TRANSPORT_V0_8_PROPNAME, TestOutgoingNetworkTransport.class.getName()); - final OutgoingNetworkTransport networkTransport = Transport.getOutgoingTransportInstance(ProtocolVersion.v8_0); + final OutgoingNetworkTransport networkTransport = Transport.getOutgoingTransportInstance(ProtocolVersion.v0_8); assertNotNull(networkTransport); assertTrue(networkTransport instanceof TestOutgoingNetworkTransport); } @@ -106,7 +106,7 @@ public class TransportTest extends QpidT { try { - Transport.getOutgoingTransportInstance(new ProtocolVersion((byte)0, (byte)0)); + Transport.getOutgoingTransportInstance(ProtocolVersion.get((byte)0, (byte)0)); fail("Should have failed to load the transport for invalid protocol version"); } catch(IllegalArgumentException iae) Modified: qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/jms/QpidQueueCreator.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/jms/QpidQueueCreator.java?rev=1683186&r1=1683185&r2=1683186&view=diff ============================================================================== --- qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/jms/QpidQueueCreator.java (original) +++ qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/jms/QpidQueueCreator.java Tue Jun 2 20:53:49 2015 @@ -18,7 +18,9 @@ */ package org.apache.qpid.disttest.jms; +import java.util.Collections; import java.util.List; +import java.util.Map; import javax.jms.Connection; import javax.jms.JMSException; @@ -37,7 +39,7 @@ import org.slf4j.LoggerFactory; public class QpidQueueCreator implements QueueCreator { private static final Logger LOGGER = LoggerFactory.getLogger(QpidQueueCreator.class); - private static final FieldTable EMPTY_QUEUE_BIND_ARGUMENTS = new FieldTable(); + private static final Map<String,Object> EMPTY_QUEUE_BIND_ARGUMENTS = Collections.emptyMap(); private static int _drainPollTimeout = Integer.getInteger(QUEUE_CREATOR_DRAIN_POLL_TIMEOUT, 500); @Override @@ -157,7 +159,7 @@ public class QpidQueueCreator implements } } - private void deleteQueue(AMQSession<?, ?> session, AMQShortString queueName) + private void deleteQueue(AMQSession<?, ?> session, String queueName) { try { Modified: qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java?rev=1683186&r1=1683185&r2=1683186&view=diff ============================================================================== --- qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java (original) +++ qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java Tue Jun 2 20:53:49 2015 @@ -50,7 +50,6 @@ import org.apache.qpid.client.AMQConnect import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQTopic; import org.apache.qpid.exchange.ExchangeDefaults; -import org.apache.qpid.framing.AMQShortString; import org.apache.qpid.jms.BrokerDetails; import org.apache.qpid.jms.ConnectionURL; import org.apache.qpid.server.Broker; @@ -1013,7 +1012,7 @@ public class QpidBrokerTestCase extends */ public Topic getTestTopic() { - return new AMQTopic(AMQShortString.valueOf(ExchangeDefaults.TOPIC_EXCHANGE_NAME), getTestQueueName()); + return new AMQTopic(ExchangeDefaults.TOPIC_EXCHANGE_NAME, getTestQueueName()); } @Override Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java?rev=1683186&r1=1683185&r2=1683186&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java Tue Jun 2 20:53:49 2015 @@ -93,7 +93,7 @@ public class AMQQueueDeferredOrderingTes _logger.info("Create Session"); session = con.createSession(false, Session.AUTO_ACKNOWLEDGE); _logger.info("Create Q"); - queue = new AMQQueue(new AMQShortString("amq.direct"), new AMQShortString("Q"), new AMQShortString("Q"), + queue = new AMQQueue("amq.direct", "Q", "Q", false, true); _logger.info("Create Consumer of Q"); consumer = session.createConsumer(queue); Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java?rev=1683186&r1=1683185&r2=1683186&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java Tue Jun 2 20:53:49 2015 @@ -1030,7 +1030,7 @@ public class FailoverBehaviourTest exten final Map<String, Object> arguments = new HashMap<String, Object>(); arguments.put("x-qpid-capacity", capacity); arguments.put("x-qpid-flow-resume-capacity", resumeCapacity); - ((AMQSession<?, ?>) session).createQueue(new AMQShortString(queueName), false, true, false, arguments); + ((AMQSession<?, ?>) session).createQueue(queueName, false, true, false, arguments); Queue queue = session.createQueue("direct://amq.direct/" + queueName + "/" + queueName + "?durable='" + true + "'&autodelete='" + false + "'"); ((AMQSession<?, ?>) session).declareAndBind((AMQDestination) queue); Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/session/QueueDeclareTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/session/QueueDeclareTest.java?rev=1683186&r1=1683185&r2=1683186&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/session/QueueDeclareTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/session/QueueDeclareTest.java Tue Jun 2 20:53:49 2015 @@ -48,12 +48,12 @@ public class QueueDeclareTest extends Qp { AMQDestination destination = (AMQDestination) _session.createQueue("topic://amq.topic//?routingkey='testTopic'"); - assertEquals("Non empty queue name unexpectedly generated by parser : " + destination.getAMQQueueName(), AMQShortString.EMPTY_STRING, destination.getAMQQueueName()); + assertEquals("Non empty queue name unexpectedly generated by parser : " + destination.getAMQQueueName(), "", destination.getAMQQueueName()); _session.declareAndBind(destination); assertFalse("Non empty queue name should have been generated by declareAndBind", - AMQShortString.EMPTY_STRING.equals(destination.getAMQQueueName())); + "".equals(destination.getAMQQueueName())); sendMessage(_session, destination, 1); receiveMessage(destination); Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java?rev=1683186&r1=1683185&r2=1683186&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java Tue Jun 2 20:53:49 2015 @@ -119,7 +119,7 @@ public class SupportedProtocolVersionsTe //Verify requesting a 0-8 connection works setTestClientSystemProperty(ClientProperties.AMQP_VERSION, "0-8"); connection = (AMQConnection) getConnection(); - assertEquals("Unexpected protocol version in use", ProtocolVersion.v8_0, connection.getProtocolVersion()); + assertEquals("Unexpected protocol version in use", ProtocolVersion.v0_8, connection.getProtocolVersion()); connection.close(); } Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java?rev=1683186&r1=1683185&r2=1683186&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java Tue Jun 2 20:53:49 2015 @@ -24,7 +24,9 @@ package org.apache.qpid.server.exchange; import java.util.ArrayList; import java.util.Collections; +import java.util.HashMap; import java.util.List; +import java.util.Map; import javax.jms.Connection; import javax.jms.ExceptionListener; @@ -86,8 +88,8 @@ public class ReturnUnroutableMandatoryMe queue = new AMQHeadersExchange(new AMQBindingURL(ExchangeDefaults.HEADERS_EXCHANGE_CLASS + "://" + ExchangeDefaults.HEADERS_EXCHANGE_NAME + "/test/queue1?" + BindingURL.OPTION_ROUTING_KEY + "='F0000=1'")); - FieldTable ft = new FieldTable(); - ft.setString("F1000", "1"); + Map<String,Object> ft = new HashMap<>(); + ft.put("F1000", "1"); consumerSession.declareAndBind(queue, ft); consumer = consumerSession.createConsumer(queue); Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/AccessControlLoggingTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/AccessControlLoggingTest.java?rev=1683186&r1=1683185&r2=1683186&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/AccessControlLoggingTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/AccessControlLoggingTest.java Tue Jun 2 20:53:49 2015 @@ -81,7 +81,7 @@ public class AccessControlLoggingTest ex Connection conn = getConnection(USER, PASS); Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); conn.start(); - ((AMQSession<?, ?>) sess).createQueue(new AMQShortString("allow"), false, false, false); + ((AMQSession<?, ?>) sess).createQueue("allow", false, false, false); List<String> matches = findMatches(ACL_LOG_PREFIX); @@ -96,7 +96,7 @@ public class AccessControlLoggingTest ex Connection conn = getConnection(USER, PASS); Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); conn.start(); - ((AMQSession<?, ?>) sess).createQueue(new AMQShortString("allow-log"), false, false, false); + ((AMQSession<?, ?>) sess).createQueue("allow-log", false, false, false); List<String> matches = findMatches(ACL_LOG_PREFIX); @@ -125,7 +125,7 @@ public class AccessControlLoggingTest ex Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); conn.start(); try { - ((AMQSession<?, ?>) sess).createQueue(new AMQShortString("deny-log"), false, false, false); + ((AMQSession<?, ?>) sess).createQueue("deny-log", false, false, false); fail("Should have denied queue creation"); } catch (AMQException amqe) @@ -161,7 +161,7 @@ public class AccessControlLoggingTest ex Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); conn.start(); try { - ((AMQSession<?, ?>) sess).createQueue(new AMQShortString("deny"), false, false, false); + ((AMQSession<?, ?>) sess).createQueue("deny", false, false, false); fail("Should have denied queue creation"); } catch (AMQException amqe) Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java?rev=1683186&r1=1683185&r2=1683186&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java Tue Jun 2 20:53:49 2015 @@ -201,7 +201,7 @@ public class DurableQueueLoggingTest ext arguments.put("x-qpid-priorities", PRIORITIES); // Need to create a queue that does not exist so use test name final String queueName = getTestQueueName(); - ((AMQSession) _session).createQueue(new AMQShortString(queueName), false, _durable, false, arguments); + ((AMQSession) _session).createQueue(queueName, false, _durable, false, arguments); Queue queue = (Queue) _session.createQueue("direct://amq.direct/"+queueName+"/"+queueName+"?durable='"+_durable+"'&autodelete='false'"); @@ -247,7 +247,7 @@ public class DurableQueueLoggingTest ext arguments.put("x-qpid-priorities", PRIORITIES); // Need to create a queue that does not exist so use test name final String queueName = getTestQueueName() + "-autoDeletePriority"; - ((AMQSession) _session).createQueue(new AMQShortString(queueName), true, _durable, false, arguments); + ((AMQSession) _session).createQueue(queueName, true, _durable, false, arguments); Queue queue = (Queue) _session.createQueue("direct://amq.direct/"+queueName+"/"+queueName+"?durable='"+_durable+"'&autodelete='true'"); Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/ExchangeLoggingTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/ExchangeLoggingTest.java?rev=1683186&r1=1683185&r2=1683186&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/ExchangeLoggingTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/ExchangeLoggingTest.java Tue Jun 2 20:53:49 2015 @@ -193,9 +193,9 @@ public class ExchangeLoggingTest extends } else { - MethodRegistry registry = new MethodRegistry(ProtocolVersion.v8_0); + MethodRegistry registry = new MethodRegistry(ProtocolVersion.v0_8); - ExchangeDeleteBody body = registry.createExchangeDeleteBody(0, new AMQShortString(_name), false, true); + ExchangeDeleteBody body = registry.createExchangeDeleteBody(0, _name, false, true); AMQFrame exchangeDeclare = body.generateFrame(((AMQSession)_session).getChannelId()); Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/QueueLoggingTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/QueueLoggingTest.java?rev=1683186&r1=1683185&r2=1683186&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/QueueLoggingTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/QueueLoggingTest.java Tue Jun 2 20:53:49 2015 @@ -88,7 +88,7 @@ public class QueueLoggingTest extends Ab _session.createConsumer(queue); // Delete Queue - ((AMQSession)_session).sendQueueDelete(new AMQShortString(queue.getQueueName())); + ((AMQSession)_session).sendQueueDelete(queue.getQueueName()); //Perform a synchronous action to ensure that the above log will be on disk _session.close(); @@ -180,4 +180,4 @@ public class QueueLoggingTest extends Ab } -} \ No newline at end of file +} Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/ArrivalTimeFilterTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/ArrivalTimeFilterTest.java?rev=1683186&r1=1683185&r2=1683186&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/ArrivalTimeFilterTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/ArrivalTimeFilterTest.java Tue Jun 2 20:53:49 2015 @@ -97,7 +97,7 @@ public class ArrivalTimeFilterTest exten private void createDestinationWithFilter(final int period) throws AMQException, JMSException { - ((AMQSession<?,?>) _session).createQueue(new AMQShortString(_queueName), false, true, false, null); + ((AMQSession<?,?>) _session).createQueue(_queueName, false, true, false, null); Queue queue = new org.apache.qpid.client.AMQQueue("amq.direct", _queueName); ((AMQSession<?,?>) _session).declareAndBind((AMQDestination)queue); _queue = _session.createQueue("direct://amq.direct/"+_queueName+"/"+_queueName+"?x-qpid-replay-period='"+period+"'"); Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/DefaultFiltersTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/DefaultFiltersTest.java?rev=1683186&r1=1683185&r2=1683186&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/DefaultFiltersTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/DefaultFiltersTest.java Tue Jun 2 20:53:49 2015 @@ -63,7 +63,7 @@ public class DefaultFiltersTest extends selector = selector.replace("\"", "\\\""); arguments.put("qpid.default_filters","{ \"x-filter-jms-selector\" : { \"x-filter-jms-selector\" : [ \""+selector+"\" ] } }"); - ((AMQSession<?,?>) _session).createQueue(new AMQShortString(_queueName), false, true, false, arguments); + ((AMQSession<?,?>) _session).createQueue(_queueName, false, true, false, arguments); _queue = new org.apache.qpid.client.AMQQueue("amq.direct", _queueName); ((AMQSession<?,?>) _session).declareAndBind((AMQDestination)_queue); } Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/EnsureNondestructiveConsumersTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/EnsureNondestructiveConsumersTest.java?rev=1683186&r1=1683185&r2=1683186&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/EnsureNondestructiveConsumersTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/EnsureNondestructiveConsumersTest.java Tue Jun 2 20:53:49 2015 @@ -61,7 +61,7 @@ public class EnsureNondestructiveConsume final Map<String,Object> arguments = new HashMap<>(); arguments.put("qpid.ensure_nondestructive_consumers", String.valueOf(ensureNonDestructiveConsumer)); - ((AMQSession<?,?>) _session).createQueue(new AMQShortString(_queueName), false, true, false, arguments); + ((AMQSession<?,?>) _session).createQueue(_queueName, false, true, false, arguments); _queue = new org.apache.qpid.client.AMQQueue("amq.direct", _queueName); ((AMQSession<?,?>) _session).declareAndBind((AMQDestination)_queue); } Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/LastValueQueueTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/LastValueQueueTest.java?rev=1683186&r1=1683185&r2=1683186&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/LastValueQueueTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/LastValueQueueTest.java Tue Jun 2 20:53:49 2015 @@ -554,7 +554,7 @@ public class LastValueQueueTest extends { final Map<String,Object> arguments = new HashMap<String, Object>(); arguments.put("qpid.last_value_queue_key",KEY_PROPERTY); - ((AMQSession<?,?>) session).createQueue(new AMQShortString(_queueName), false, true, false, arguments); + ((AMQSession<?,?>) session).createQueue(_queueName, false, true, false, arguments); _queue = new AMQQueue("amq.direct", _queueName); ((AMQSession<?,?>) session).declareAndBind((AMQDestination)_queue); } Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/MessageGroupQueueTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/MessageGroupQueueTest.java?rev=1683186&r1=1683185&r2=1683186&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/MessageGroupQueueTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/MessageGroupQueueTest.java Tue Jun 2 20:53:49 2015 @@ -121,7 +121,7 @@ public class MessageGroupQueueTest exten { arguments.put(QueueArgumentsConverter.QPID_SHARED_MSG_GROUP,"1"); } - ((AMQSession) producerSession).createQueue(new AMQShortString(QUEUE), true, false, false, arguments); + ((AMQSession) producerSession).createQueue(QUEUE, true, false, false, arguments); queue = (Queue) producerSession.createQueue("direct://amq.direct/"+QUEUE+"/"+QUEUE+"?durable='false'&autodelete='true'"); ((AMQSession) producerSession).declareAndBind((AMQDestination)queue); @@ -211,7 +211,7 @@ public class MessageGroupQueueTest exten { arguments.put(QueueArgumentsConverter.QPID_SHARED_MSG_GROUP,"1"); } - ((AMQSession) producerSession).createQueue(new AMQShortString(QUEUE), true, false, false, arguments); + ((AMQSession) producerSession).createQueue(QUEUE, true, false, false, arguments); queue = (Queue) producerSession.createQueue("direct://amq.direct/"+QUEUE+"/"+QUEUE+"?durable='false'&autodelete='true'"); ((AMQSession) producerSession).declareAndBind((AMQDestination)queue); @@ -311,7 +311,7 @@ public class MessageGroupQueueTest exten arguments.put(QueueArgumentsConverter.QPID_SHARED_MSG_GROUP,"1"); } - ((AMQSession) producerSession).createQueue(new AMQShortString(QUEUE), true, false, false, arguments); + ((AMQSession) producerSession).createQueue(QUEUE, true, false, false, arguments); queue = (Queue) producerSession.createQueue("direct://amq.direct/"+QUEUE+"/"+QUEUE+"?durable='false'&autodelete='true'"); ((AMQSession) producerSession).declareAndBind((AMQDestination)queue); @@ -403,7 +403,7 @@ public class MessageGroupQueueTest exten arguments.put(QueueArgumentsConverter.QPID_SHARED_MSG_GROUP,"1"); } - ((AMQSession) producerSession).createQueue(new AMQShortString(QUEUE), true, false, false, arguments); + ((AMQSession) producerSession).createQueue(QUEUE, true, false, false, arguments); queue = (Queue) producerSession.createQueue("direct://amq.direct/"+QUEUE+"/"+QUEUE+"?durable='false'&autodelete='true'"); ((AMQSession) producerSession).declareAndBind((AMQDestination)queue); @@ -495,7 +495,7 @@ public class MessageGroupQueueTest exten arguments.put(QueueArgumentsConverter.QPID_GROUP_HEADER_KEY,"group"); arguments.put(QueueArgumentsConverter.QPID_SHARED_MSG_GROUP,"1"); - ((AMQSession) producerSession).createQueue(new AMQShortString(QUEUE), true, false, false, arguments); + ((AMQSession) producerSession).createQueue(QUEUE, true, false, false, arguments); queue = (Queue) producerSession.createQueue("direct://amq.direct/"+QUEUE+"/"+QUEUE+"?durable='false'&autodelete='true'"); ((AMQSession) producerSession).declareAndBind((AMQDestination)queue); Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/ModelTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/ModelTest.java?rev=1683186&r1=1683185&r2=1683186&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/ModelTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/ModelTest.java Tue Jun 2 20:53:49 2015 @@ -287,7 +287,7 @@ public class ModelTest extends QpidBroke AMQSession session = (AMQSession) connection.createSession(false, Session.AUTO_ACKNOWLEDGE); - session.createQueue(new AMQShortString(queueName), + session.createQueue(queueName, autoDelete, durable, exclusive); validateQueueViaJMX(queueName, (exclusive && durable &&!isBroker010()) ? connection.getClientID() : null, durable, autoDelete || (exclusive && !isBroker010() && !durable)); Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java?rev=1683186&r1=1683185&r2=1683186&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java Tue Jun 2 20:53:49 2015 @@ -88,7 +88,7 @@ public class PriorityQueueTest extends Q { final Map<String,Object> arguments = new HashMap<String, Object>(); arguments.put("x-qpid-priorities",10); - ((AMQSession) producerSession).createQueue(new AMQShortString(QUEUE), true, false, false, arguments); + ((AMQSession) producerSession).createQueue(QUEUE, true, false, false, arguments); queue = (Queue) producerSession.createQueue("direct://amq.direct/"+QUEUE+"/"+QUEUE+"?durable='false'&autodelete='true'"); ((AMQSession) producerSession).declareAndBind((AMQDestination)queue); @@ -129,7 +129,7 @@ public class PriorityQueueTest extends Q { final Map<String,Object> arguments = new HashMap<String, Object>(); arguments.put("x-qpid-priorities",3); - ((AMQSession) producerSession).createQueue(new AMQShortString(QUEUE), true, false, false, arguments); + ((AMQSession) producerSession).createQueue(QUEUE, true, false, false, arguments); queue = producerSession.createQueue("direct://amq.direct/"+QUEUE+"/"+QUEUE+"?durable='false'&autodelete='true'"); ((AMQSession) producerSession).declareAndBind((AMQDestination)queue); @@ -226,7 +226,7 @@ public class PriorityQueueTest extends Q //declare a priority queue with 10 priorities final Map<String,Object> arguments = new HashMap<String, Object>(); arguments.put("x-qpid-priorities",10); - ((AMQSession<?,?>) producerSess).createQueue(new AMQShortString(getTestQueueName()), false, true, false, arguments); + ((AMQSession<?,?>) producerSess).createQueue(getTestQueueName(), false, true, false, arguments); Queue queue = producerSess.createQueue(getTestQueueName()); Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java?rev=1683186&r1=1683185&r2=1683186&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java Tue Jun 2 20:53:49 2015 @@ -381,7 +381,7 @@ public class ProducerFlowControlTest ext producerConnection.close(); // delete queue with a consumer session - ((AMQSession<?,?>) consumerSession).sendQueueDelete(new AMQShortString(queueName)); + ((AMQSession<?,?>) consumerSession).sendQueueDelete(queueName); consumer = consumerSession.createConsumer(queue); consumerConnection.start(); @@ -400,7 +400,7 @@ public class ProducerFlowControlTest ext final Map<String,Object> arguments = new HashMap<String, Object>(); arguments.put("x-qpid-capacity",capacity); arguments.put("x-qpid-flow-resume-capacity",resumeCapacity); - ((AMQSession<?,?>) session).createQueue(new AMQShortString(queueName), autoDelete, durable, false, arguments); + ((AMQSession<?,?>) session).createQueue(queueName, autoDelete, durable, false, arguments); queue = session.createQueue("direct://amq.direct/"+queueName+"/"+queueName+"?durable='" + durable + "'&autodelete='" + autoDelete + "'"); ((AMQSession<?,?>) session).declareAndBind((AMQDestination)queue); } Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/QueueBindTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/QueueBindTest.java?rev=1683186&r1=1683185&r2=1683186&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/QueueBindTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/QueueBindTest.java Tue Jun 2 20:53:49 2015 @@ -71,13 +71,13 @@ public class QueueBindTest extends QpidB private void runTestForTopicExchange(AMQDestination destination) throws AMQException, JMSException, Exception { // binding queue with empty arguments - _session.declareAndBind(destination, FieldTable.convertToFieldTable(Collections.<String, Object> emptyMap())); + _session.declareAndBind(destination,Collections.<String, Object>emptyMap()); // try to re-bind queue with a selector Map<String, Object> bindArguments = new HashMap<String, Object>(); bindArguments.put(AMQPFilterTypes.JMS_SELECTOR.getValue().toString(), INDEX + "=0"); _session.bindQueue(destination.getAMQQueueName(), destination.getRoutingKey(), - FieldTable.convertToFieldTable(bindArguments), destination.getExchangeName(), destination); + bindArguments, destination.getExchangeName(), destination); _connection.start(); @@ -103,13 +103,14 @@ public class QueueBindTest extends QpidB private void runTestForNonTopicExhange(AMQQueue destination) throws AMQException, Exception, JMSException { // binding queue with empty arguments - _session.declareAndBind(destination, FieldTable.convertToFieldTable(Collections.<String, Object> emptyMap())); + _session.declareAndBind(destination, + Collections.<String, Object>emptyMap()); // try to re-bind queue with a selector Map<String, Object> bindArguments = new HashMap<String, Object>(); bindArguments.put(AMQPFilterTypes.JMS_SELECTOR.getValue().toString(), INDEX + "=0"); _session.bindQueue(destination.getAMQQueueName(), destination.getRoutingKey(), - FieldTable.convertToFieldTable(bindArguments), destination.getExchangeName(), destination); + bindArguments, destination.getExchangeName(), destination); // send and receive to prove that selector is not used int numberOfMesssages = 2; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
