additional client properties may now be specified via ConnectionParameters

Author: Vlad Ionescu

src/com/rabbitmq/client/ConnectionParameters.java

@@ -31,6 +31,8 @@
 package com.rabbitmq.client;
 
 import java.security.AccessControlException;
+import java.util.Map;
+import java.util.HashMap;
 
 /**
  * Properties bean to encapsulate parameters for a Connection.
@@ -65,12 +67,17 @@ private static String safeGetProperty(String key, String def) {
     /** Default value for desired heartbeat interval; zero for none */
     public static final int DEFAULT_HEARTBEAT = 0;
 
+    /** Default extra client properties to be sent to the server */
+    public static final Map<String, Object> DEFAULT_CLIENT_PROPERTIES =
+            new HashMap<String, Object>();
+
     private String _userName = DEFAULT_USER;
     private String _password = DEFAULT_PASS;
     private String _virtualHost = DEFAULT_VHOST;
     private int _requestedChannelMax = DEFAULT_CHANNEL_MAX;
     private int _requestedFrameMax = DEFAULT_FRAME_MAX;
     private int _requestedHeartbeat = DEFAULT_HEARTBEAT;
+    private Map<String, Object> _clientProperties = DEFAULT_CLIENT_PROPERTIES;
 
     /**
      * Instantiate a set of parameters with all values set to the defaults
@@ -173,4 +180,19 @@ public void setRequestedChannelMax(int requestedChannelMax) {
         _requestedChannelMax = requestedChannelMax;
     }
 
+    /**
+     * Retrieve the map of extra client properties to be sent to the server
+     * @return the map of extra client properties
+     */
+    public Map<String, Object> getClientProperties() {
+        return _clientProperties;
+    }
+
+    /**
+     * Set the extra client properties to be sent to the server
+     * @param clientProperties the map of extra client properties
+     */
+    public void setClientProperties(Map<String, Object> clientProperties) {
+        _clientProperties = clientProperties;
+    }
 }

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

@@ -73,6 +73,19 @@ 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;
 
+    private static final Object[] DEFAULT_CLIENT_PROPERTIES = 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);
 
@@ -376,16 +389,9 @@ public void writeFrame(Frame f) throws IOException {
     }
 
     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/")
-        });
+        Map<String, Object> props = Frame.buildTable(DEFAULT_CLIENT_PROPERTIES);
+        props.putAll(_params.getClientProperties());
+        return props;
     }
 
     private static int negotiatedMaxValue(int clientValue, int serverValue) {