NO-JIRA: remove test-only and unused connect methods

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

4 files changed, 13 insertions, 24 deletions

diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java
index 34ebdb441b..e732bee421 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java
@@ -65,7 +65,7 @@ public class ClientDelegate extends ConnectionDelegate
     {
         Map<String,Object> clientProperties = new HashMap<String,Object>();
 
-        if(this._connectionSettings.getClientProperties() != null)
+        if(_connectionSettings.getClientProperties() != null)
         {
             clientProperties.putAll(_connectionSettings.getClientProperties());
         }
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java
index 675c3e35b5..d9b94245e1 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java
@@ -200,23 +200,12 @@ public class Connection extends ConnectionInvoker
         return saslClient;
     }
 
-    public void connect(String host, int port, String vhost, String username, String password)
+    public void connect(String host, int port, String vhost, String username, String password, boolean ssl, String saslMechs)
     {
-        connect(host, port, vhost, username, password, false);
+        connect(host, port, vhost, username, password, ssl, saslMechs, null);
     }
 
-    public void connect(String host, int port, String vhost, String username, String password, boolean ssl)
-    {
-        connect(host, port, vhost, username, password, ssl,"PLAIN");
-    }
-
-    public void connect(String host, int port, String vhost, String username, String password, boolean ssl,String saslMechs)
-    {
-        connect(host, port, vhost, username, password, ssl,saslMechs, Collections.EMPTY_MAP);
-    }
-
-
-    public void connect(String host, int port, String vhost, String username, String password, boolean ssl,String saslMechs,Map<String,Object> clientProps)
+    public void connect(String host, int port, String vhost, String username, String password, boolean ssl, String saslMechs, Map<String,Object> clientProps)
     {
         ConnectionSettings settings = new ConnectionSettings();
         settings.setHost(host);
diff --git a/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java b/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java
index d22e806dd6..f3715f351e 100644
--- a/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java
+++ b/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java
@@ -170,7 +170,7 @@ public class ConnectionTest extends QpidTestCase implements SessionListener
                 }
             }
         });
-        conn.connect("localhost", port, null, "guest", "guest", false);
+        conn.connect("localhost", port, null, "guest", "guest", false, null);
         return conn;
     }
 
@@ -275,7 +275,7 @@ public class ConnectionTest extends QpidTestCase implements SessionListener
         Connection conn = new Connection();
         conn.addConnectionListener(new FailoverConnectionListener());
         conn.setConnectionDelegate(new ClientDelegate(new ConnectionSettings()));
-        conn.connect("localhost", port, null, "guest", "guest");
+        conn.connect("localhost", port, null, "guest", "guest", false, null);
         Session ssn = conn.createSession(1);
         ssn.setSessionListener(new TestSessionListener());
 
@@ -331,7 +331,7 @@ public class ConnectionTest extends QpidTestCase implements SessionListener
         Connection conn = new Connection();
         conn.setConnectionDelegate(new ClientDelegate(new ConnectionSettings()));
         conn.addConnectionListener(new FailoverConnectionListener());
-        conn.connect("localhost", port, null, "guest", "guest");
+        conn.connect("localhost", port, null, "guest", "guest", false, null);
         Session ssn = conn.createSession(1);
         ssn.setSessionListener(new TestSessionListener());
 
@@ -353,7 +353,7 @@ public class ConnectionTest extends QpidTestCase implements SessionListener
 
         Connection conn = new Connection();
         conn.setConnectionDelegate(new ClientDelegate(new ConnectionSettings()));
-        conn.connect("localhost", port, null, "guest", "guest");
+        conn.connect("localhost", port, null, "guest", "guest", false, null);
         Session ssn = conn.createSession();
         ssn.sessionFlush(EXPECTED);
         send(ssn, "SINK 0");
@@ -367,7 +367,7 @@ public class ConnectionTest extends QpidTestCase implements SessionListener
         startServer();
         Connection conn = new Connection();
         conn.setConnectionDelegate(new ClientDelegate(new ConnectionSettings()));
-        conn.connect("localhost", port, null, "guest", "guest");
+        conn.connect("localhost", port, null, "guest", "guest", false, null);
         conn.connectionHeartbeat();
         conn.close();
     }
@@ -378,7 +378,7 @@ public class ConnectionTest extends QpidTestCase implements SessionListener
 
         Connection conn = new Connection();
         conn.setConnectionDelegate(new ClientDelegate(new ConnectionSettings()));
-        conn.connect("localhost", port, null, "guest", "guest");
+        conn.connect("localhost", port, null, "guest", "guest", false, null);
         Session ssn = conn.createSession();
         send(ssn, "EXCP 0");
         Thread.sleep(3000);
@@ -398,7 +398,7 @@ public class ConnectionTest extends QpidTestCase implements SessionListener
 
         Connection conn = new Connection();
         conn.setConnectionDelegate(new ClientDelegate(new ConnectionSettings()));
-        conn.connect("localhost", port, null, "guest", "guest");
+        conn.connect("localhost", port, null, "guest", "guest", false, null);
         Session ssn = conn.createSession();
         send(ssn, "EXCP 0", true);
         try
@@ -424,7 +424,7 @@ public class ConnectionTest extends QpidTestCase implements SessionListener
         public void closed(Connection conn)
         {
             queue = true;
-            conn.connect("localhost", port, null, "guest", "guest");
+            conn.connect("localhost", port, null, "guest", "guest", false, null);
             conn.resume();
         }
     }
diff --git a/qpid/java/tools/src/main/java/org/apache/qpid/tools/QpidBench.java b/qpid/java/tools/src/main/java/org/apache/qpid/tools/QpidBench.java
index 602fcc6321..e2d179965b 100644
--- a/qpid/java/tools/src/main/java/org/apache/qpid/tools/QpidBench.java
+++ b/qpid/java/tools/src/main/java/org/apache/qpid/tools/QpidBench.java
@@ -689,7 +689,7 @@ public class QpidBench
     {
         org.apache.qpid.transport.Connection conn =
             new org.apache.qpid.transport.Connection();
-        conn.connect(opts.broker, opts.port, null, "guest", "guest",false);
+        conn.connect(opts.broker, opts.port, null, "guest", "guest", false, null);
         return conn;
     }