Author: rgodfrey
Date: Wed Jun 10 12:48:04 2015
New Revision: 1684664
URL: http://svn.apache.org/r1684664
Log:
QPID-6545 : Fix broken equality tests, remove instances of String.toString()
and other issues raised by [~k-wall]
Modified:
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_from_1_0.java
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java
qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/DefaultManagedObject.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQDestination.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQSession.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQTopic.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java
qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/client/destinationurl/DestinationURLTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/QueueBindTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java
Modified:
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java?rev=1684664&r1=1684663&r2=1684664&view=diff
==============================================================================
---
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java
(original)
+++
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java
Wed Jun 10 12:48:04 2015
@@ -240,7 +240,7 @@ public class UpgradeFrom4To5 extends Abs
String question = MessageFormat.format("Found
persistent messages for non-durable queue ''{1}''. "
+ " Do you with to create this queue and move
all the messages into it?" + lineSeparator
+ "NOTE: Answering No will result in these
messages being discarded!", queueName);
- UpgradeInteractionResponse response =
handler.requireResponse(question.toString(),
+ UpgradeInteractionResponse response =
handler.requireResponse(question,
UpgradeInteractionResponse.YES,
UpgradeInteractionResponse.YES,
UpgradeInteractionResponse.NO,
UpgradeInteractionResponse.ABORT);
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java?rev=1684664&r1=1684663&r2=1684664&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java
Wed Jun 10 12:48:04 2015
@@ -634,7 +634,7 @@ public class JsonFileConfigStore impleme
final Class<? extends ConfiguredObject> clazz)
{
Map<String,Class<? extends ConfiguredObject>>map = new HashMap<String,
Class<? extends ConfiguredObject>>();
- map.put(clazz.getSimpleName().toString(), clazz);
+ map.put(clazz.getSimpleName(), clazz);
Collection<Class<? extends ConfiguredObject>> childClasses =
model.getChildTypes(clazz);
if(childClasses != null)
{
Modified:
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_from_1_0.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_from_1_0.java?rev=1684664&r1=1684663&r2=1684664&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_from_1_0.java
(original)
+++
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageConverter_from_1_0.java
Wed Jun 10 12:48:04 2015
@@ -165,7 +165,7 @@ public class MessageConverter_from_1_0
public static Object convertValue(final Object value)
{
- if(value != null && !STANDARD_TYPES.contains(value))
+ if(value != null && !STANDARD_TYPES.contains(value.getClass()))
{
if(value instanceof Map)
{
Modified:
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java?rev=1684664&r1=1684663&r2=1684664&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java
(original)
+++
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java
Wed Jun 10 12:48:04 2015
@@ -527,7 +527,7 @@ public class MessageMetaData_1_0 impleme
}
else
{
- return _properties.getReplyTo().toString();
+ return _properties.getReplyTo();
}
}
Modified:
qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java?rev=1684664&r1=1684663&r2=1684664&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java
(original)
+++
qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java
Wed Jun 10 12:48:04 2015
@@ -56,7 +56,7 @@ public class MessageConverter_0_8_to_1_0
protected MessageMetaData_1_0 convertMetaData(final AMQMessage
serverMessage, SectionEncoder sectionEncoder)
{
- List<Section> sections = new ArrayList<Section>(3);
+ List<Section> sections = new ArrayList<>(3);
Header header = new Header();
@@ -115,23 +115,23 @@ public class MessageConverter_0_8_to_1_0
AMQBindingURL burl = new AMQBindingURL(originalReplyTo);
String replyTo;
- if(burl.getExchangeName() != null &&
!burl.getExchangeName().equals(AMQShortString.EMPTY_STRING))
+ if(burl.getExchangeName() != null &&
!burl.getExchangeName().equals(""))
{
- replyTo = burl.getExchangeName().toString();
+ replyTo = burl.getExchangeName();
if(burl.getRoutingKey() != null)
{
- replyTo += "/" + burl.getRoutingKey().toString();
+ replyTo += "/" + burl.getRoutingKey();
}
}
- else if(burl.getQueueName() != null &&
!burl.getQueueName().equals(AMQShortString.EMPTY_STRING))
+ else if(burl.getQueueName() != null &&
!burl.getQueueName().equals(""))
{
- replyTo = burl.getQueueName().toString();
+ replyTo = burl.getQueueName();
}
else if(burl.getRoutingKey() != null)
{
- replyTo = burl.getRoutingKey().toString();
+ replyTo = burl.getRoutingKey();
}
else
{
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java?rev=1684664&r1=1684663&r2=1684664&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
Wed Jun 10 12:48:04 2015
@@ -605,7 +605,7 @@ public class RestServlet extends Abstrac
byte[] data = new byte[(int) part.getSize()];
part.getInputStream().read(data);
String inlineURL = DataUrlUtils.getDataUrlForBytes(data);
- fileUploads.put(part.getName(),inlineURL.toString());
+ fileUploads.put(part.getName(), inlineURL);
}
}
providedObject.putAll(fileUploads);
Modified:
qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/DefaultManagedObject.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/DefaultManagedObject.java?rev=1684664&r1=1684663&r2=1684664&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/DefaultManagedObject.java
(original)
+++
qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/DefaultManagedObject.java
Wed Jun 10 12:48:04 2015
@@ -143,7 +143,7 @@ public abstract class DefaultManagedObje
{
if (obj.getParentObject() != null)
{
- String parentType =
getHierarchicalType(obj.getParentObject()).toString();
+ String parentType = getHierarchicalType(obj.getParentObject());
return parentType + "." + obj.getType();
}
else
Modified:
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQDestination.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQDestination.java?rev=1684664&r1=1684663&r2=1684664&view=diff
==============================================================================
---
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQDestination.java
(original)
+++
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQDestination.java
Wed Jun 10 12:48:04 2015
@@ -470,7 +470,7 @@ public abstract class AMQDestination imp
public String getQueueName()
{
- return _queueName == null ? null : _queueName.toString();
+ return _queueName;
}
public String getAMQQueueName()
@@ -754,15 +754,15 @@ public abstract class AMQDestination imp
{
String type = binding.getExchangeClass();
- if (type.equals(ExchangeDefaults.DIRECT_EXCHANGE_CLASS))
+ if (ExchangeDefaults.DIRECT_EXCHANGE_CLASS.equals(type))
{
return new AMQQueue(binding);
}
- else if (type.equals(ExchangeDefaults.TOPIC_EXCHANGE_CLASS))
+ else if (ExchangeDefaults.TOPIC_EXCHANGE_CLASS.equals(type))
{
return new AMQTopic(binding);
}
- else if (type.equals(ExchangeDefaults.HEADERS_EXCHANGE_CLASS))
+ else if (ExchangeDefaults.HEADERS_EXCHANGE_CLASS.equals(type))
{
return new AMQHeadersExchange(binding);
}
Modified:
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQSession.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQSession.java?rev=1684664&r1=1684663&r2=1684664&view=diff
==============================================================================
--- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQSession.java
(original)
+++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQSession.java
Wed Jun 10 12:48:04 2015
@@ -1092,19 +1092,19 @@ public abstract class AMQSession<C exten
// durable topic subscription that the broker arguments
don't match any more. This is because it is not otherwise
// possible to determine when querying the broker whether
there are no arguments or just a non-matching selector
// argument, as specifying null for the arguments when
querying means they should not be checked at all
-
args.put(AMQPFilterTypes.JMS_SELECTOR.getValue().toString(), messageSelector ==
null ? "" : messageSelector);
+ args.put(AMQPFilterTypes.JMS_SELECTOR.getValue(),
messageSelector == null ? "" : messageSelector);
if(noLocal)
{
-
args.put(AMQPFilterTypes.NO_LOCAL.getValue().toString(), true);
+ args.put(AMQPFilterTypes.NO_LOCAL.getValue(), true);
}
// if the queue is bound to the exchange but NOT for this
topic and selector, then the JMS spec
// says we must trash the subscription.
boolean isQueueBound =
isQueueBound(dest.getExchangeName(), dest.getAMQQueueName());
boolean isQueueBoundForTopicAndSelector =
- isQueueBound(dest.getExchangeName().toString(),
- dest.getAMQQueueName().toString(),
- topicName.toString(), args);
+ isQueueBound(dest.getExchangeName(),
+ dest.getAMQQueueName(),
+ topicName, args);
if (isQueueBound && !isQueueBoundForTopicAndSelector)
{
@@ -2070,7 +2070,7 @@ public abstract class AMQSession<C exten
{
throw JMSExceptionHelper.chainJMSException(new
InvalidDestinationException(
"Invalid routing key:"
- + amqd.getRoutingKey().toString()
+ + amqd.getRoutingKey()
), e);
}
catch (AMQException e)
Modified:
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java?rev=1684664&r1=1684663&r2=1684664&view=diff
==============================================================================
---
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
(original)
+++
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
Wed Jun 10 12:48:04 2015
@@ -561,7 +561,7 @@ public class AMQSession_0_10 extends AMQ
rk = routingKey;
}
- return isQueueBound(exchangeName == null ? null :
exchangeName,queueName == null ? null : queueName,rk,(Map<String,Object>)null);
+ return isQueueBound(exchangeName, queueName, rk,
(Map<String,Object>)null);
}
public boolean isQueueBound(final String exchangeName, final String
queueName, final String bindingKey,Map<String,Object> args)
@@ -763,12 +763,12 @@ public class AMQSession_0_10 extends AMQ
// This code is here to ensure address based destination work with
the declareQueue public method in AMQSession.java
Node node = amqd.getNode();
Map<String,Object> arguments = new HashMap<String,Object>();
- arguments.putAll((Map<? extends String, ? extends Object>)
node.getDeclareArgs());
+ arguments.putAll(node.getDeclareArgs());
if (arguments.get(AddressHelper.NO_LOCAL) == null)
{
arguments.put(AddressHelper.NO_LOCAL, noLocal);
}
- getQpidSession().queueDeclare(queueName.toString(),
node.getAlternateExchange() ,
+ getQpidSession().queueDeclare(queueName,
node.getAlternateExchange() ,
arguments,
node.isAutoDelete() ? Option.AUTO_DELETE : Option.NONE,
node.isDurable() ? Option.DURABLE : Option.NONE,
@@ -1246,7 +1246,7 @@ public class AMQSession_0_10 extends AMQ
queueProps.isExclusive() ? Option.EXCLUSIVE : Option.NONE);
Map<String,Object> bindingArguments = new HashMap<String, Object>();
-
bindingArguments.put(AMQPFilterTypes.JMS_SELECTOR.getValue().toString(),
messageSelector == null ? "" : messageSelector);
+ bindingArguments.put(AMQPFilterTypes.JMS_SELECTOR.getValue(),
messageSelector == null ? "" : messageSelector);
getQpidSession().exchangeBind(queueName,
dest.getAddressName(),
dest.getSubject(),
Modified:
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java?rev=1684664&r1=1684663&r2=1684664&view=diff
==============================================================================
---
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java
(original)
+++
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java
Wed Jun 10 12:48:04 2015
@@ -210,7 +210,7 @@ public class AMQSession_0_8 extends AMQS
continue;
}
String queue = binding.getQueue() == null?
- queueName.toString() : binding.getQueue();
+ queueName : binding.getQueue();
String exchange = binding.getExchange() == null ?
defaultExchange :
@@ -616,8 +616,7 @@ public class AMQSession_0_8 extends AMQS
ExchangeDeclareBody body =
methodRegistry.createExchangeDeclareBody(getTicket(),
name,
type,
-
passive || name.toString()
-
.startsWith("amq."),
+
passive || name.startsWith("amq."),
durable,
autoDelete,
false,
Modified:
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQTopic.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQTopic.java?rev=1684664&r1=1684663&r2=1684664&view=diff
==============================================================================
--- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQTopic.java
(original)
+++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQTopic.java
Wed Jun 10 12:48:04 2015
@@ -154,7 +154,7 @@ public class AMQTopic extends AMQDestina
{
if (getRoutingKey() != null)
{
- return getRoutingKey().toString();
+ return getRoutingKey();
}
else if (getSubject() != null)
{
Modified:
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java?rev=1684664&r1=1684663&r2=1684664&view=diff
==============================================================================
---
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java
(original)
+++
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java
Wed Jun 10 12:48:04 2015
@@ -85,10 +85,10 @@ public class BasicMessageProducer_0_10 e
{
if (getSession().isDeclareExchanges())
{
- String name = destination.getExchangeName().toString();
+ String name = destination.getExchangeName();
((AMQSession_0_10)
getSession()).getQpidSession().exchangeDeclare
(name,
- destination.getExchangeClass().toString(),
+ destination.getExchangeClass(),
null, null,
name.startsWith("amq.") ? Option.PASSIVE : Option.NONE,
destination.isExchangeDurable() ? Option.DURABLE :
Option.NONE,
@@ -180,12 +180,12 @@ public class BasicMessageProducer_0_10 e
deliveryProp.setPriority(MessageDeliveryPriority.get((short)
priority));
message.setJMSPriority(priority);
}
- String exchangeName = destination.getExchangeName() == null ? "" :
destination.getExchangeName().toString();
+ String exchangeName = destination.getExchangeName() == null ? "" :
destination.getExchangeName();
if ( deliveryProp.getExchange() == null || !
deliveryProp.getExchange().equals(exchangeName))
{
deliveryProp.setExchange(exchangeName);
}
- String routingKey = destination.getRoutingKey().toString();
+ String routingKey = destination.getRoutingKey();
if (deliveryProp.getRoutingKey() == null || !
deliveryProp.getRoutingKey().equals(routingKey))
{
deliveryProp.setRoutingKey(routingKey);
@@ -359,7 +359,7 @@ public class BasicMessageProducer_0_10 e
ByteBuffer buffer = data == null ? ByteBuffer.allocate(0) :
data.slice();
- ssn.messageTransfer(destination.getExchangeName() == null ? "" :
destination.getExchangeName().toString(),
+ ssn.messageTransfer(destination.getExchangeName() == null ? "" :
destination.getExchangeName(),
MessageAcceptMode.NONE,
MessageAcquireMode.PRE_ACQUIRED,
new Header(deliveryProp, messageProps),
Modified:
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java?rev=1684664&r1=1684663&r2=1684664&view=diff
==============================================================================
---
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
(original)
+++
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
Wed Jun 10 12:48:04 2015
@@ -174,7 +174,7 @@ public class AMQMessageDelegate_0_10 ext
if (exchange != null && !exchangeMapContains(exchange))
{
Future<ExchangeQueryResult> future =
- session.exchangeQuery(exchange.toString());
+ session.exchangeQuery(exchange);
ExchangeQueryResult res = future.get();
updateExchangeType(exchange, res.getType());
@@ -332,7 +332,7 @@ public class AMQMessageDelegate_0_10 ext
}
}
- final ReplyTo replyTo = new ReplyTo(amqd.getExchangeName().toString(),
amqd.getRoutingKey().toString());
+ final ReplyTo replyTo = new ReplyTo(amqd.getExchangeName(),
amqd.getRoutingKey());
_destinationCache.put(replyTo, destination);
_messageProps.setReplyTo(replyTo);
}
Modified:
qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java?rev=1684664&r1=1684663&r2=1684664&view=diff
==============================================================================
---
qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java
(original)
+++
qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java
Wed Jun 10 12:48:04 2015
@@ -452,13 +452,13 @@ public class ConnectionURLTest extends T
AMQConnectionURL conn = new AMQConnectionURL(url);
-
assertEquals(conn.getDefaultQueueExchangeName().toString(),"test.direct");
+ assertEquals(conn.getDefaultQueueExchangeName(),"test.direct");
-
assertEquals(conn.getDefaultTopicExchangeName().toString(),"test.topic");
+ assertEquals(conn.getDefaultTopicExchangeName(),"test.topic");
-
assertEquals(conn.getTemporaryQueueExchangeName().toString(),"tmp.direct");
+ assertEquals(conn.getTemporaryQueueExchangeName(),"tmp.direct");
-
assertEquals(conn.getTemporaryTopicExchangeName().toString(),"tmp.topic");
+ assertEquals(conn.getTemporaryTopicExchangeName(),"tmp.topic");
}
Modified:
qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/client/destinationurl/DestinationURLTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/client/destinationurl/DestinationURLTest.java?rev=1684664&r1=1684663&r2=1684664&view=diff
==============================================================================
---
qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/client/destinationurl/DestinationURLTest.java
(original)
+++
qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/client/destinationurl/DestinationURLTest.java
Wed Jun 10 12:48:04 2015
@@ -46,13 +46,13 @@ public class DestinationURLTest extends
assertTrue(url.equals(dest.toString()));
-
assertTrue(dest.getExchangeClass().toString().equals("exchange.Class"));
+ assertTrue(dest.getExchangeClass().equals("exchange.Class"));
- assertTrue(dest.getExchangeName().toString().equals("exchangeName"));
+ assertTrue(dest.getExchangeName().equals("exchangeName"));
- assertTrue(dest.getDestinationName().toString().equals("Destination"));
+ assertTrue(dest.getDestinationName().equals("Destination"));
- assertTrue(dest.getQueueName().toString().equals("Queue"));
+ assertTrue(dest.getQueueName().equals("Queue"));
}
public void testQueue() throws URISyntaxException
@@ -64,13 +64,13 @@ public class DestinationURLTest extends
assertTrue(url.equals(dest.toString()));
- assertTrue(dest.getExchangeClass().toString().equals("exchangeClass"));
+ assertTrue(dest.getExchangeClass().equals("exchangeClass"));
- assertTrue(dest.getExchangeName().toString().equals("exchangeName"));
+ assertTrue(dest.getExchangeName().equals("exchangeName"));
- assertTrue(dest.getDestinationName().toString().equals(""));
+ assertTrue(dest.getDestinationName().equals(""));
- assertTrue(dest.getQueueName().toString().equals("Queue"));
+ assertTrue(dest.getQueueName().equals("Queue"));
}
public void testQueueWithOption() throws URISyntaxException
@@ -82,13 +82,13 @@ public class DestinationURLTest extends
assertTrue(url.equals(dest.toString()));
- assertTrue(dest.getExchangeClass().toString().equals("exchangeClass"));
+ assertTrue(dest.getExchangeClass().equals("exchangeClass"));
- assertTrue(dest.getExchangeName().toString().equals("exchangeName"));
+ assertTrue(dest.getExchangeName().equals("exchangeName"));
- assertTrue(dest.getDestinationName().toString().equals(""));
+ assertTrue(dest.getDestinationName().equals(""));
- assertTrue(dest.getQueueName().toString().equals("Queue"));
+ assertTrue(dest.getQueueName().equals("Queue"));
assertTrue(dest.getOption("option").equals("value"));
}
@@ -102,13 +102,13 @@ public class DestinationURLTest extends
assertTrue(url.equals(dest.toString()));
- assertTrue(dest.getExchangeClass().toString().equals("exchangeClass"));
+ assertTrue(dest.getExchangeClass().equals("exchangeClass"));
- assertTrue(dest.getExchangeName().toString().equals("exchangeName"));
+ assertTrue(dest.getExchangeName().equals("exchangeName"));
- assertTrue(dest.getDestinationName().toString().equals("Destination"));
+ assertTrue(dest.getDestinationName().equals("Destination"));
- assertTrue(dest.getQueueName().toString().equals(""));
+ assertTrue(dest.getQueueName().equals(""));
}
public void testDestinationWithOption() throws URISyntaxException
@@ -120,13 +120,13 @@ public class DestinationURLTest extends
assertTrue(url.equals(dest.toString()));
- assertTrue(dest.getExchangeClass().toString().equals("exchangeClass"));
+ assertTrue(dest.getExchangeClass().equals("exchangeClass"));
- assertTrue(dest.getExchangeName().toString().equals("exchangeName"));
+ assertTrue(dest.getExchangeName().equals("exchangeName"));
- assertTrue(dest.getDestinationName().toString().equals("Destination"));
+ assertTrue(dest.getDestinationName().equals("Destination"));
- assertTrue(dest.getQueueName().toString().equals(""));
+ assertTrue(dest.getQueueName().equals(""));
assertTrue(dest.getOption("option").equals("value"));
}
@@ -138,13 +138,13 @@ public class DestinationURLTest extends
AMQBindingURL dest = new AMQBindingURL(url);
- assertTrue(dest.getExchangeClass().toString().equals("exchangeClass"));
+ assertTrue(dest.getExchangeClass().equals("exchangeClass"));
- assertTrue(dest.getExchangeName().toString().equals("exchangeName"));
+ assertTrue(dest.getExchangeName().equals("exchangeName"));
- assertTrue(dest.getDestinationName().toString().equals("Destination"));
+ assertTrue(dest.getDestinationName().equals("Destination"));
- assertTrue(dest.getQueueName().toString().equals(""));
+ assertTrue(dest.getQueueName().equals(""));
assertTrue(dest.getOption("option").equals("value"));
assertTrue(dest.getOption("option2").equals("value2"));
@@ -159,11 +159,11 @@ public class DestinationURLTest extends
assertTrue(dest.getExchangeClass().equals(ExchangeDefaults.DIRECT_EXCHANGE_CLASS));
- assertTrue(dest.getExchangeName().toString().equals(""));
+ assertTrue(dest.getExchangeName().equals(""));
- assertTrue(dest.getDestinationName().toString().equals(""));
+ assertTrue(dest.getDestinationName().equals(""));
- assertTrue(dest.getQueueName().toString().equals("IBMPerfQueue1"));
+ assertTrue(dest.getQueueName().equals("IBMPerfQueue1"));
assertTrue(dest.getOption("durable").equals("true"));
}
@@ -175,13 +175,13 @@ public class DestinationURLTest extends
AMQBindingURL dest = new AMQBindingURL(url);
- assertTrue(dest.getExchangeClass().toString().equals("exchangeClass"));
+ assertTrue(dest.getExchangeClass().equals("exchangeClass"));
- assertTrue(dest.getExchangeName().toString().equals("exchangeName"));
+ assertTrue(dest.getExchangeName().equals("exchangeName"));
- assertTrue(dest.getDestinationName().toString().equals("Destination"));
+ assertTrue(dest.getDestinationName().equals("Destination"));
- assertTrue(dest.getQueueName().toString().equals(""));
+ assertTrue(dest.getQueueName().equals(""));
assertTrue(dest.getBindingKeys().length == 2);
}
@@ -334,13 +334,13 @@ public class DestinationURLTest extends
assertTrue(url.equals(burl.toString()));
- assertTrue(burl.getExchangeClass().toString().equals("exchangeClass"));
+ assertTrue(burl.getExchangeClass().equals("exchangeClass"));
- assertTrue(burl.getExchangeName().toString().equals("exchangeName"));
+ assertTrue(burl.getExchangeName().equals("exchangeName"));
- assertTrue(burl.getDestinationName().toString().equals("Destination"));
+ assertTrue(burl.getDestinationName().equals("Destination"));
- assertTrue(burl.getQueueName().toString().equals("Queue"));
+ assertTrue(burl.getQueueName().equals("Queue"));
//check that the MaxDeliveryCount property has the right value
assertEquals("server",burl.getOption(BindingURL.OPTION_REJECT_BEHAVIOUR));
@@ -370,13 +370,13 @@ public class DestinationURLTest extends
assertTrue(url.equals(burl.toString()));
- assertTrue(burl.getExchangeClass().toString().equals("exchangeClass"));
+ assertTrue(burl.getExchangeClass().equals("exchangeClass"));
- assertTrue(burl.getExchangeName().toString().equals("exchangeName"));
+ assertTrue(burl.getExchangeName().equals("exchangeName"));
- assertTrue(burl.getDestinationName().toString().equals("Destination"));
+ assertTrue(burl.getDestinationName().equals("Destination"));
- assertTrue(burl.getQueueName().toString().equals("Queue"));
+ assertTrue(burl.getQueueName().equals("Queue"));
class MyTestAMQDestination extends AMQDestination
{
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=1684664&r1=1684663&r2=1684664&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
Wed Jun 10 12:48:04 2015
@@ -75,7 +75,7 @@ public class QueueBindTest extends QpidB
// 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");
+ bindArguments.put(AMQPFilterTypes.JMS_SELECTOR.getValue(), INDEX +
"=0");
_session.bindQueue(destination.getAMQQueueName(),
destination.getRoutingKey(),
bindArguments, destination.getExchangeName(),
destination);
@@ -108,7 +108,7 @@ public class QueueBindTest extends QpidB
// 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");
+ bindArguments.put(AMQPFilterTypes.JMS_SELECTOR.getValue(), INDEX +
"=0");
_session.bindQueue(destination.getAMQQueueName(),
destination.getRoutingKey(),
bindArguments, destination.getExchangeName(),
destination);
Modified:
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java?rev=1684664&r1=1684663&r2=1684664&view=diff
==============================================================================
---
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
(original)
+++
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
Wed Jun 10 12:48:04 2015
@@ -97,11 +97,11 @@ public class ConnectionTest extends Qpid
AMQQueue queue = (AMQQueue) queueSession.createQueue("MyQueue");
- assertEquals(queue.getExchangeName().toString(), "test.direct");
+ assertEquals(queue.getExchangeName(), "test.direct");
AMQQueue tempQueue = (AMQQueue)
queueSession.createTemporaryQueue();
- assertEquals(tempQueue.getExchangeName().toString(), "tmp.direct");
+ assertEquals(tempQueue.getExchangeName(), "tmp.direct");
queueSession.close();
@@ -109,11 +109,11 @@ public class ConnectionTest extends Qpid
AMQTopic topic = (AMQTopic)
topicSession.createTopic("silly.topic");
- assertEquals(topic.getExchangeName().toString(), "test.topic");
+ assertEquals(topic.getExchangeName(), "test.topic");
AMQTopic tempTopic = (AMQTopic)
topicSession.createTemporaryTopic();
- assertEquals(tempTopic.getExchangeName().toString(), "tmp.topic");
+ assertEquals(tempTopic.getExchangeName(), "tmp.topic");
topicSession.close();
Modified:
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java?rev=1684664&r1=1684663&r2=1684664&view=diff
==============================================================================
---
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java
(original)
+++
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java
Wed Jun 10 12:48:04 2015
@@ -99,7 +99,7 @@ public class AMQProtocolSessionTest exte
private void checkTempQueueName(SocketAddress address, String queueName)
{
_testSession.getNetworkConnection().setLocalAddress(address);
- assertEquals("Wrong queue name", queueName,
_testSession.genQueueName().toString());
+ assertEquals("Wrong queue name", queueName,
_testSession.genQueueName());
}
private static class TestNetworkConnection implements NetworkConnection
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
