Author: grkvlt
Date: Tue Dec 6 18:16:18 2011
New Revision: 1211061
URL: http://svn.apache.org/viewvc?rev=1211061&view=rev
Log:
QPID-3662: Only display connection options once in toString of URL
Modified:
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java
qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java
Modified:
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java?rev=1211061&r1=1211060&r2=1211061&view=diff
==============================================================================
---
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java
(original)
+++
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java
Tue Dec 6 18:16:18 2011
@@ -34,7 +34,6 @@ import org.apache.qpid.url.URLSyntaxExce
public class AMQConnectionURL implements ConnectionURL
{
-
private String _url;
private String _failoverMethod;
private Map<String, String> _failoverOptions;
@@ -279,15 +278,6 @@ public class AMQConnectionURL implements
sb.append(URLHelper.printOptions(_failoverOptions));
sb.append("'");
}
-
- for (String key : _options.keySet())
- {
- if (!key.equals(OPTIONS_FAILOVER) ||
!key.equals(OPTIONS_BROKERLIST))
- {
-
sb.append(URLHelper.DEFAULT_OPTION_SEPERATOR).append(key).append("='");
- sb.append(_options.get(key)).append("'");
- }
- }
return sb.toString();
}
Modified:
qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java?rev=1211061&r1=1211060&r2=1211061&view=diff
==============================================================================
---
qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java
(original)
+++
qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java
Tue Dec 6 18:16:18 2011
@@ -274,6 +274,34 @@ public class ConnectionURLTest extends T
// assertTrue(service.getPort() == 1234);
}
+ /**
+ * Test for QPID-3662 to ensure the {@code toString()} representation is
correct.
+ */
+ public void testConnectionURLOptionToString() throws URLSyntaxException
+ {
+ String url =
"amqp://guest:guest@client/localhost?maxprefetch='1'&brokerlist='tcp://localhost:1234?tcp_nodelay='true''";
+ ConnectionURL connectionurl = new AMQConnectionURL(url);
+
+ assertNull(connectionurl.getFailoverMethod());
+ assertEquals("guest", connectionurl.getUsername());
+ assertEquals("guest", connectionurl.getPassword());
+ assertEquals("client", connectionurl.getClientName());
+ assertEquals("/localhost", connectionurl.getVirtualHost());
+ assertEquals("1", connectionurl.getOption("maxprefetch"));
+ assertTrue(connectionurl.getBrokerCount() == 1);
+
+ BrokerDetails service = connectionurl.getBrokerDetails(0);
+ assertTrue(service.getTransport().equals("tcp"));
+ assertTrue(service.getHost().equals("localhost"));
+ assertTrue(service.getPort() == 1234);
+ assertTrue(service.getProperties().containsKey("tcp_nodelay"));
+ assertEquals("true", service.getProperties().get("tcp_nodelay"));
+
+ String nopasswd =
"amqp://guest:********@client/localhost?maxprefetch='1'&brokerlist='tcp://localhost:1234?tcp_nodelay='true''";
+ String tostring = connectionurl.toString();
+ assertEquals(tostring.indexOf("maxprefetch"),
tostring.lastIndexOf("maxprefetch"));
+ assertEquals(nopasswd, tostring);
+ }
public void testSingleTransportMultiOptionURL() throws URLSyntaxException
{
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
