QPID-1824 : Add ability to use a ConnectionURL String to configure a ConfigurationFactory via a 3rd party tools that use Bean properties such as Mule or Spring.

merged from trunk r767150

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-release@767209 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 86 insertions, 0 deletions

diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java
index 01a915f2cc..2d6f4434fe 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java
@@ -354,6 +354,17 @@ public class AMQConnectionFactory implements ConnectionFactory, QueueConnectionF
         return _connectionDetails;
     }
 
+    public String getConnectionURLString()
+    {
+        return _connectionDetails.toString();
+    }
+
+
+    public final void setConnectionURLString(String url) throws URLSyntaxException
+    {
+        _connectionDetails = new AMQConnectionURL(url);
+    }
+
     /**
      * JNDI interface to create objects from References.
      *
diff --git a/qpid/java/client/src/test/java/org/apache/qpid/test/unit/jndi/ConnectionFactoryTest.java b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/jndi/ConnectionFactoryTest.java
new file mode 100644
index 0000000000..9e76b0d468
--- /dev/null
+++ b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/jndi/ConnectionFactoryTest.java
@@ -0,0 +1,75 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.qpid.test.unit.jndi;
+
+import junit.framework.TestCase;
+import org.apache.qpid.client.AMQConnectionFactory;
+import org.apache.qpid.jms.BrokerDetails;
+import org.apache.qpid.jms.ConnectionURL;
+import org.apache.qpid.url.URLSyntaxException;
+
+public class ConnectionFactoryTest extends TestCase
+{
+
+    //URL will be returned with the password field swapped for '********'
+    // so ensure that these two strings are kept in sync.
+    public static final String URL = "amqp://guest:guest@clientID/test?brokerlist='tcp://localhost:5672'";
+    public static final String URL_STAR_PWD = "amqp://guest:********@clientID/test?brokerlist='tcp://localhost:5672'";
+
+    public void testConnectionURLString()
+    {
+        AMQConnectionFactory factory = new AMQConnectionFactory();
+
+        assertNull("ConnectionURL should have no value at start",
+                   factory.getConnectionURL());
+
+        try
+        {
+            factory.setConnectionURLString(URL);
+        }
+        catch (URLSyntaxException e)
+        {
+            fail(e.getMessage());
+        }
+
+        //URL will be returned with the password field swapped for '********'
+        assertEquals("Connection URL not correctly set", URL_STAR_PWD, factory.getConnectionURLString());
+
+        // Further test that the processed ConnectionURL is as expected after
+        // the set call
+        ConnectionURL connectionurl = factory.getConnectionURL();
+
+        assertNull("Failover is set.", connectionurl.getFailoverMethod());
+        assertEquals("guest", connectionurl.getUsername());
+        assertEquals("guest", connectionurl.getPassword());
+        assertEquals("clientID", connectionurl.getClientName());
+        assertEquals("/test", connectionurl.getVirtualHost());
+
+        assertEquals(1, connectionurl.getBrokerCount());
+
+        BrokerDetails service = connectionurl.getBrokerDetails(0);
+
+        assertEquals("tcp", service.getTransport());
+        assertEquals("localhost", service.getHost());
+        assertEquals(5672, service.getPort());
+
+    }
+}