Merged bug24988 into default

Author: Emile Joubert

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

@@ -44,6 +44,11 @@
 import com.rabbitmq.utility.BlockingCell;
 import com.rabbitmq.utility.Utility;
 
+final class Copyright {
+    final static String COPYRIGHT="Copyright (C) 2007-2012 VMware, Inc.";
+    final static String LICENSE="Licensed under the MPL. See http://www.rabbitmq.com/";
+}
+
 /**
  * Concrete class representing and managing an AMQP connection to a broker.
  * <p>
@@ -63,21 +68,22 @@ public class AMQConnection extends ShutdownNotifierComponent implements Connecti
      * @see Connection#getClientProperties
      */
     public static final Map<String, Object> defaultClientProperties() {
+        Map<String,Object> props = new HashMap<String, Object>();
+        props.put("product", LongStringHelper.asLongString("RabbitMQ"));
+        props.put("version", LongStringHelper.asLongString(ClientVersion.VERSION));
+        props.put("platform", LongStringHelper.asLongString("Java"));
+        props.put("copyright", LongStringHelper.asLongString(Copyright.COPYRIGHT));
+        props.put("information", LongStringHelper.asLongString(Copyright.LICENSE));
+
         Map<String, Object> capabilities = new HashMap<String, Object>();
         capabilities.put("publisher_confirms", true);
         capabilities.put("exchange_exchange_bindings", true);
         capabilities.put("basic.nack", true);
         capabilities.put("consumer_cancel_notify", true);
-        return buildTable(new Object[] {
-                "product", LongStringHelper.asLongString("RabbitMQ"),
-                "version", LongStringHelper.asLongString(ClientVersion.VERSION),
-                "platform", LongStringHelper.asLongString("Java"),
-                "copyright", LongStringHelper.asLongString(
-                    "Copyright (C) 2007-2012 VMware, Inc."),
-                "information", LongStringHelper.asLongString(
-                    "Licensed under the MPL. See http://www.rabbitmq.com/"),
-                "capabilities", capabilities
-            });
+
+        props.put("capabilities", capabilities);
+
+        return props;
     }
 
     private static final Version clientVersion =
@@ -799,20 +805,4 @@ public void close(int closeCode,
     private String getHostAddress() {
         return getAddress() == null ? null : getAddress().getHostAddress();
     }
-
-    /**
-     * Utility for constructing a java.util.Map instance from an
-     * even-length array containing alternating String keys (on the
-     * even elements, starting at zero) and values (on the odd
-     * elements, starting at one).
-     */
-    private static final Map<String, Object> buildTable(Object[] keysValues) {
-        Map<String, Object> result = new HashMap<String, Object>();
-        for (int index = 0; index < keysValues.length; index += 2) {
-            String key = (String) keysValues[index];
-            Object value = keysValues[index + 1];
-            result.put(key, value);
-        }
-        return result;
-    }
 }

test/src/com/rabbitmq/client/test/functional/UnexpectedFrames.java

@@ -96,10 +96,8 @@ public Frame confuse(Frame frame) {
                 if (frame.type == AMQP.FRAME_METHOD) {
                     // We can't just skip the method as that will lead us to
                     // send 0 bytes and hang waiting for a response.
-                    Frame confusedFrame = new Frame(AMQP.FRAME_HEADER,
-                                                    frame.channel,
-                                                    frame.getPayload());
-                    return confusedFrame;
+                    return new Frame(AMQP.FRAME_HEADER,
+                                     frame.channel, frame.getPayload());
                 }
                 return frame;
             }
@@ -119,12 +117,11 @@ public Frame confuse(Frame frame) {
 
     public void testWrongClassInHeader() throws IOException {
         expectUnexpectedFrameError(new Confuser() {
-            public Frame confuse(Frame frame) throws IOException {
+            public Frame confuse(Frame frame) {
                 if (frame.type == AMQP.FRAME_HEADER) {
                     byte[] payload = frame.getPayload();
                     Frame confusedFrame = new Frame(AMQP.FRAME_HEADER,
-                            frame.channel,
-                            payload);
+                                                    frame.channel, payload);
                     // First two bytes = class ID, must match class ID from
                     // method.
                     payload[0] = 12;