Merged bug21143 into default

Author: 0x6e6562

codegen.py

@@ -132,6 +132,15 @@ def printClassInterfaces():
             print "    }"
 
 
+    def printClone(c):
+        print
+        print """        public Object clone()
+            throws CloneNotSupportedException
+        {
+            return super.clone();
+        }""" % \
+        {"n": java_class_name(c.name)}
+        
     def printReadProperties(c):
         print
         print """        public void readPropertiesFrom(ContentHeaderPropertyReader reader)
@@ -171,7 +180,7 @@ def printPropertyDebug(c):
 
     def printClassProperties(c):
         print
-        print "    public static class %s extends AMQContentHeader {" % ( java_class_name(c.name) + 'Properties')
+        print "    public static class %s extends AMQContentHeader implements Cloneable {" % ( java_class_name(c.name) + 'Properties')
         #property fields
         for f in c.fields:
             print "        public %s %s;" % (java_property_type(spec, f.domain),java_field_name(f.name))
@@ -196,6 +205,7 @@ def printClassProperties(c):
         print "        public int getClassId() { return %i; }" % (c.index)
         print "        public java.lang.String getClassName() { return \"%s\"; }" % (c.name)
 
+        printClone(c)
         printReadProperties(c)
         printWriteProperties(c)
         printPropertyDebug(c)

test/src/com/rabbitmq/client/test/AllTest.java

@@ -43,6 +43,7 @@ public static TestSuite suite() {
         suite.addTest(AMQConnectionTest.suite());
         suite.addTest(ValueOrExceptionTest.suite());
         suite.addTest(BrokenFramesTest.suite());
+	suite.addTestSuite(ClonePropertiesTest.class);
         return suite;
     }
 }

test/src/com/rabbitmq/client/test/ClonePropertiesTest.java

@@ -0,0 +1,56 @@
+//   The contents of this file are subject to the Mozilla Public License
+//   Version 1.1 (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.mozilla.org/MPL/
+//
+//   Software distributed under the License is distributed on an "AS IS"
+//   basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+//   License for the specific language governing rights and limitations
+//   under the License.
+//
+//   The Original Code is RabbitMQ.
+//
+//   The Initial Developers of the Original Code are LShift Ltd,
+//   Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd.
+//
+//   Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd,
+//   Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
+//   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
+//   Technologies LLC, and Rabbit Technologies Ltd.
+//
+//   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+//   Ltd. Portions created by Cohesive Financial Technologies LLC are
+//   Copyright (C) 2007-2009 Cohesive Financial Technologies
+//   LLC. Portions created by Rabbit Technologies Ltd are Copyright
+//   (C) 2007-2009 Rabbit Technologies Ltd.
+//
+//   All Rights Reserved.
+//
+//   Contributor(s): ______________________________________.
+//
+package com.rabbitmq.client.test;
+
+import junit.framework.TestCase;
+
+import com.rabbitmq.client.AMQP.BasicProperties;
+import com.rabbitmq.client.MessageProperties;
+
+public class ClonePropertiesTest extends TestCase {
+    public void testPropertyCloneIsDistinct()
+        throws CloneNotSupportedException
+    {
+        assertTrue(MessageProperties.MINIMAL_PERSISTENT_BASIC !=
+                   MessageProperties.MINIMAL_PERSISTENT_BASIC.clone());
+    }
+
+    public void testPropertyClonePreservesValues()
+        throws CloneNotSupportedException
+    {
+        assertEquals(MessageProperties.MINIMAL_PERSISTENT_BASIC.deliveryMode,
+                     ((BasicProperties) MessageProperties.MINIMAL_PERSISTENT_BASIC.clone())
+                       .deliveryMode);
+        assertEquals((Integer) 2,
+                     ((BasicProperties) MessageProperties.MINIMAL_PERSISTENT_BASIC.clone())
+                       .deliveryMode);
+    }
+}