Merge bug21949 into default

Author: tonyg

src/com/rabbitmq/client/Connection.java

@@ -90,6 +90,13 @@ public interface Connection extends ShutdownNotifier { // rename to AMQPConnecti
      */
     int getHeartbeat();
 
+    /**
+     * Get a copy of the map of client properties sent to the server
+     *
+     * @return a copy of the map of client properties
+     */
+    Map<String, Object> getClientProperties();
+
     /**
      * Retrieve the known hosts.
      * @return an array of addresses for all hosts that came back in the initial {@link com.rabbitmq.client.AMQP.Connection.OpenOk} open-ok method

src/com/rabbitmq/client/ConnectionFactory.java

@@ -90,15 +90,16 @@ public class ConnectionFactory implements Cloneable {
      */
     public static final String DEFAULT_SSL_PROTOCOL = "SSLv3";
 
-    private String username               = DEFAULT_USER;
-    private String password               = DEFAULT_PASS;
-    private String virtualHost            = DEFAULT_VHOST;
-    private String host                   = DEFAULT_HOST;
-    private int port                      = USE_DEFAULT_PORT;
-    private int requestedChannelMax       = DEFAULT_CHANNEL_MAX;
-    private int requestedFrameMax         = DEFAULT_FRAME_MAX;
-    private int requestedHeartbeat        = DEFAULT_HEARTBEAT;
-    private SocketFactory factory         = SocketFactory.getDefault();
+    private String username                       = DEFAULT_USER;
+    private String password                       = DEFAULT_PASS;
+    private String virtualHost                    = DEFAULT_VHOST;
+    private String host                           = DEFAULT_HOST;
+    private int port                              = USE_DEFAULT_PORT;
+    private int requestedChannelMax               = DEFAULT_CHANNEL_MAX;
+    private int requestedFrameMax                 = DEFAULT_FRAME_MAX;
+    private int requestedHeartbeat                = DEFAULT_HEARTBEAT;
+    private Map<String, Object> _clientProperties = AMQConnection.defaultClientProperties();
+    private SocketFactory factory                 = SocketFactory.getDefault();
 
     /**
      * Instantiate a ConnectionFactory with a default set of parameters.
@@ -236,6 +237,29 @@ public void setRequestedHeartbeat(int requestedHeartbeat) {
         this.requestedHeartbeat = requestedHeartbeat;
     }
 
+    /**
+     * Retrieve the currently-configured table of client properties
+     * that will be sent to the server during connection
+     * startup. Clients may add, delete, and alter keys in this
+     * table. Such changes will take effect when the next new
+     * connection is started using this factory.
+     * @return the map of client properties
+     * @see setClientProperties()
+     */
+    public Map<String, Object> getClientProperties() {
+        return _clientProperties;
+    }
+
+    /**
+     * Replace the table of client properties that will be sent to the
+     * server during subsequent connection startups.
+     * @param clientProperties the map of extra client properties
+     * @see getClientProperties()
+     */
+    public void setClientProperties(Map<String, Object> clientProperties) {
+        _clientProperties = clientProperties;
+    }
+
     /**
      * Retrieve the socket factory used to make connections with.
      */

src/com/rabbitmq/client/impl/AMQConnection.java

@@ -35,6 +35,7 @@
 import java.io.IOException;
 import java.net.SocketException;
 import java.util.Map;
+import java.util.HashMap;
 import java.util.concurrent.TimeoutException;
 
 import com.rabbitmq.client.AMQP;
@@ -72,6 +73,28 @@ public class AMQConnection extends ShutdownNotifierComponent implements Connecti
     /** Timeout used while waiting for a connection.close-ok (milliseconds) */
     public static final int CONNECTION_CLOSING_TIMEOUT = 10000;
 
+    /**
+     * Retrieve a copy of the default table of client properties that
+     * will be sent to the server during connection startup. This
+     * method is called when each new ConnectionFactory instance is
+     * constructed.
+     * @return a map of client properties
+     * @see Connection.getClientProperties()
+     */
+    public static Map<String, Object> defaultClientProperties() {
+        return Frame.buildTable(new Object[] {
+                "product", LongStringHelper.asLongString("RabbitMQ"),
+                "version", LongStringHelper.asLongString(ClientVersion.VERSION),
+                "platform", LongStringHelper.asLongString("Java"),
+                "copyright", LongStringHelper.asLongString(
+                    "Copyright (C) 2007-2008 LShift Ltd., " +
+                    "Cohesive Financial Technologies LLC., " +
+                    "and Rabbit Technologies Ltd."),
+                "information", LongStringHelper.asLongString(
+                    "Licensed under the MPL. See http://www.rabbitmq.com/")
+            });
+    }
+
     private static final Version clientVersion =
         new Version(AMQP.PROTOCOL.MAJOR, AMQP.PROTOCOL.MINOR);
 
@@ -146,6 +169,7 @@ public void ensureIsOpen()
 
     private final String _username, _password, _virtualHost;
     private final int _requestedChannelMax, _requestedFrameMax, _requestedHeartbeat;
+    private final Map<String, Object> _clientProperties;
 
     /** Saved server properties field from connection.start */
     public Map<String, Object> _serverProperties;
@@ -202,6 +226,7 @@ public AMQConnection(ConnectionFactory factory,
         _requestedChannelMax = factory.getRequestedChannelMax();
         _requestedFrameMax = factory.getRequestedFrameMax();
         _requestedHeartbeat = factory.getRequestedHeartbeat();
+        _clientProperties = new HashMap<String, Object>(factory.getClientProperties());
 
         this.factory = factory;
         _frameHandler = frameHandler;
@@ -271,10 +296,8 @@ public void start(boolean insist)
         LongString saslResponse = LongStringHelper.asLongString("\0" + _username +
                                                                 "\0" + _password);
         AMQImpl.Connection.StartOk startOk =
-            new AMQImpl.Connection.StartOk(buildClientPropertiesTable(),
-                                           "PLAIN",
-                                           saslResponse,
-                                           "en_US");
+            new AMQImpl.Connection.StartOk(_clientProperties, "PLAIN",
+                                           saslResponse, "en_US");
 
         AMQP.Connection.Tune connTune =
             (AMQP.Connection.Tune) _channel0.exnWrappingRpc(startOk).getMethod();
@@ -359,6 +382,10 @@ public void setHeartbeat(int heartbeat) {
         }
     }
 
+    public Map<String, Object> getClientProperties() {
+        return new HashMap<String, Object>(_clientProperties);
+    }
+
     /**
      * Protected API - retrieve the current ExceptionHandler
      */
@@ -394,19 +421,6 @@ public void writeFrame(Frame f) throws IOException {
         _lastActivityTime = System.nanoTime();
     }
 
-    public Map<String, Object> buildClientPropertiesTable() {
-        return Frame.buildTable(new Object[] {
-            "product", LongStringHelper.asLongString("RabbitMQ"),
-            "version", LongStringHelper.asLongString(ClientVersion.VERSION),
-            "platform", LongStringHelper.asLongString("Java"),
-            "copyright", LongStringHelper.asLongString("Copyright (C) 2007-2008 LShift Ltd., " +
-                                                       "Cohesive Financial Technologies LLC., " +
-                                                       "and Rabbit Technologies Ltd."),
-            "information", LongStringHelper.asLongString("Licensed under the MPL.  " +
-                                                         "See http://www.rabbitmq.com/")
-        });
-    }
-
     private static int negotiatedMaxValue(int clientValue, int serverValue) {
         return (clientValue == 0 || serverValue == 0) ?
             Math.max(clientValue, serverValue) :