QPID-3662: Only display connection options once in toString of URL

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1211061 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 28 insertions, 10 deletions

diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java b/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java
index f9f50d9150..ee55eb9ce9 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java
@@ -34,7 +34,6 @@ import org.apache.qpid.url.URLSyntaxException;
 
 public class AMQConnectionURL implements ConnectionURL
 {
- 
     private String _url;
     private String _failoverMethod;
     private Map<String, String> _failoverOptions;
@@ -279,15 +278,6 @@ public class AMQConnectionURL implements ConnectionURL
             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();
     }
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java
index 5a5a3a0bd9..392ef1f29b 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java
@@ -274,6 +274,34 @@ public class ConnectionURLTest extends TestCase
 //        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
     {