Removed Appendable from generated code and reverted usage. Merged default back in.

Author: Steve Powell

codegen.py

@@ -95,21 +95,21 @@ def java_field_name(name):
 def java_field_type(spec, domain):
     return javaTypeMap[spec.resolveDomain(domain)]
 
-def java_field_default_value(type, value):
-    if type == 'int':
+def java_field_default_value(jtype, value):
+    if jtype == 'int':
         return value
-    elif type == 'boolean':
-        return "{0}".format(value).lower()
-    elif type == 'String':
-        return "\"{0}\"".format(value)
-    elif type == 'LongString':
-        return "LongStringHelper.asLongString(\"{0}\")".format(value)
-    elif type == 'long':
-        return "{0}L".format(value)
-    elif type == 'Map<String,Object>':
+    elif jtype == 'boolean':
+        return ('%s'% (value)).lower()
+    elif jtype == 'String':
+        return '"%s"' % (value)
+    elif jtype == 'LongString':
+        return 'LongStringHelper.asLongString("%s")' % (value)
+    elif jtype == 'long':
+        return '%sL' % (value)
+    elif jtype == 'Map<String,Object>':
         return "null"
     else:
-        raise BogusDefaultValue("JSON provided default value {0} for suspicious type {1}".format(value, type))
+        raise BogusDefaultValue("JSON provided default value %s for suspicious type %s" % (value, jtype))
 
 def typeNameDefault(spec, a):
     fieldType = java_field_type(spec, a.domain)
@@ -266,20 +266,12 @@ def printWritePropertiesTo(c):
         print "        }"
 
     def printAppendArgumentDebugStringTo(c):
-        def appendValue(jField, jType):
-            if jType == "String":
-                return "this.%s" % (jField)
-            else:
-                return "String.valueOf(this.%s)" % (jField)
-
-        appendList = [ "%s=\")\n               .append(%s)\n               .append(\"" 
-                       % (f.name, appendValue(java_field_name(f.name), java_field_type(spec, f.domain)))
+        appendList = [ "%s=\")\n               .append(this.%s)\n               .append(\""
+                       % (f.name, java_field_name(f.name))
                        for f in c.fields ]
         print
-        print "        public void appendArgumentDebugStringTo(Appendable acc) {"
-        print "            try {"
-        print "                acc.append(\"(%s)\");" % (", ".join(appendList))
-        print "            } catch(IOException _) { }"
+        print "        public void appendArgumentDebugStringTo(StringBuilder acc) {"
+        print "            acc.append(\"(%s)\");" % (", ".join(appendList))
         print "        }"
 
     def printPropertiesBuilderClass(c):
@@ -485,21 +477,12 @@ def trueOrFalse(truthVal):
                     return "false"
 
             def argument_debug_string():
-                def appendFieldValue(a):
-                    (jName, jType) = (java_field_name(a.name), java_field_type(spec, a.domain))
-                    if jType == "String":
-                        return "this.%s" % (jName)
-                    else:
-                        return "String.valueOf(this.%s)" % (jName)
-
-                appendList = [ "%s=\")\n                   .append(%s)\n                   .append(\"" 
-                               % (a.name, appendFieldValue(a))
+                appendList = [ "%s=\")\n                   .append(this.%s)\n                   .append(\""
+                               % (a.name, java_field_name(a.name))
                                for a in m.arguments ]
                 print
-                print "            public void appendArgumentDebugStringTo(Appendable acc) {"
-                print "                try {"
-                print "                    acc.append(\"(%s)\");" % ", ".join(appendList)
-                print "                } catch(IOException _) { }"
+                print "            public void appendArgumentDebugStringTo(StringBuilder acc) {"
+                print "                acc.append(\"(%s)\");" % ", ".join(appendList)
                 print "            }"
 
             def write_arguments():

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

@@ -35,8 +35,6 @@
 import com.rabbitmq.client.QueueingConsumer;
 import com.rabbitmq.client.QueueingConsumer.Delivery;
 
-import com.rabbitmq.client.Envelope;
-
 public class QosTests extends BrokerTestCase
 {
 

test/src/com/rabbitmq/client/test/server/DurableBindingLifecycle.java

@@ -46,6 +46,10 @@ protected void restart() throws IOException {
 
             Host.executeCommand("cd ../rabbitmq-test; make restart-secondary-node");
         }
+        restartPrimary();
+    }
+
+    private void restartPrimary() throws IOException {
         tearDown();
         Host.executeCommand("cd ../rabbitmq-test; make restart-app");
         setUp();
@@ -129,5 +133,26 @@ public void testDefaultBindingRecovery() throws IOException {
         deleteQueue(Q);
     }
 
+    /**
+     * Test that when we have a transient exchange bound to a durable
+     * queue and the durable queue is on a cluster node that restarts,
+     * we do not lose the binding.  See bug 24009.
+     */
+    public void testTransientExchangeDurableQueue() throws IOException {
+        // This test depends on the second node in the cluster to keep
+        // the transient X alive
+        if (clusteredConnection != null) {
+            channel.exchangeDeclare("transientX", "fanout", false);
+            channel.queueDeclare("durableQ", true, false, false, null);
+            channel.queueBind("durableQ", "transientX", "");
 
+            restartPrimary();
+
+            basicPublishVolatile("transientX", "");
+            assertDelivered("durableQ", 1);
+
+            deleteExchange("transientX");
+            deleteQueue("durableQ");
+        }
+    }
 }