Make fields of *Properties final:

    adjust constructors to set everything;
    fix final few places that reply on updates;
    add builder() method to produce a builder from a built properties object.

Author: Steve Powell

codegen.py

@@ -262,7 +262,8 @@ def printReadProperties(c):
             for f in c.fields:
                 (jfName, jfType, jfClass) = (java_field_name(f.name), java_field_type(spec, f.domain), java_class_name(f.domain))
                 if jfType in java_scalar_types:
-                    print "            if (this.%sIsSet) this.%s = reader.read%s();" % (jfName, jfName, jfClass)
+                    print "            if (this.%sIsSet) { this.%s = reader.read%s(); }" % (jfName, jfName, jfClass)
+                    print "            else { this.%s = %s; }" % (jfName, java_scalar_default(jfType))
                 else:
                     print "            this.%s = %s_present ? reader.read%s() : null;" % (jfName, jfName, jfClass)
 
@@ -354,15 +355,25 @@ def ctorParm(field):
 
         print "        }"
 
+    def printPropertiesBuilder(c):
+        print
+        print "        public Builder builder() {"
+        print "            Builder builder = new Builder();"
+        setFieldList = [ "%s(%s)" % (fn, fn)
+                         for fn in [ java_field_name(f.name)
+                                    for f in c.fields if java_field_type(spec, f.domain) not in java_scalar_types ] ]
+        print "            builder.%s;" % ("\n                .".join(setFieldList))
+        for f in c.fields:
+            if java_field_type(spec, f.domain) in java_scalar_types:
+                fn = java_field_name(f.name)
+                print "            if (%sIsSet) { builder.%s(%s); }" % (fn, fn, fn)
+        print "            return builder;"
+        print "        }"
+
     def printPropertiesClass(c):
-        def printGetterAndSetter(fieldType, fieldName):
+        def printGetter(fieldType, fieldName):
             capFieldName = fieldName[0].upper() + fieldName[1:]
             print "        public %s get%s() { return this.%s; }" % (fieldType, capFieldName, fieldName)
-            if fieldType in java_scalar_types:
-                print "        public void set%s(%s %s)" % (capFieldName, fieldType, fieldName)
-                print "        {   this.%s = %s; this.%sIsSet = true; }" % (fieldName, fieldName, fieldName)
-            else:
-                print "        public void set%s(%s %s) { this.%s = %s; }" % (capFieldName, fieldType, fieldName, fieldName, fieldName)
 
         jClassName = java_class_name(c.name)
 
@@ -372,8 +383,8 @@ def printGetterAndSetter(fieldType, fieldName):
         for f in c.fields:
             (fType, fName) = (java_field_type(spec, f.domain), java_field_name(f.name))
             if fType in java_scalar_types:
-                print "        private boolean %sIsSet = false;" % (fName)
-            print "        private %s %s;" % (fType, fName)
+                print "        private final boolean %sIsSet;" % (fName)
+            print "        private final %s %s;" % (fType, fName)
 
         #explicit constructor
         if c.fields:
@@ -409,10 +420,12 @@ def printGetterAndSetter(fieldType, fieldName):
         print "        public int getClassId() { return %i; }" % (c.index)
         print "        public String getClassName() { return \"%s\"; }" % (c.name)
 
+        printPropertiesBuilder(c)
+        
         #accessor methods
         print
         for f in c.fields:
-            printGetterAndSetter(java_field_type(spec, f.domain), java_field_name(f.name))
+            printGetter(java_field_type(spec, f.domain), java_field_name(f.name))
 
         printWritePropertiesTo(c)
         printAppendArgumentDebugStringTo(c)

src/com/rabbitmq/client/RpcClient.java

@@ -158,16 +158,8 @@ public byte[] primitiveCall(AMQP.BasicProperties props, byte[] message)
         synchronized (_continuationMap) {
             _correlationId++;
             String replyId = "" + _correlationId;
-            if (props != null) {
-                props.setCorrelationId(replyId);
-                props.setReplyTo(_replyQueue);
-            }
-            else {
-                props = new AMQP.BasicProperties(null, null, null, null,
-                                             null, replyId,
-                                             _replyQueue, null, null, null,
-                                             null, null, null, null);
-            }
+            props = ((props==null) ? new AMQP.BasicProperties.Builder() : props.builder())
+                    .correlationId(replyId).replyTo(_replyQueue).build();
             _continuationMap.put(replyId, k);
         }
         publish(props, message);

src/com/rabbitmq/client/RpcServer.java

@@ -148,9 +148,7 @@ public void processRequest(QueueingConsumer.Delivery request)
             AMQP.BasicProperties replyProperties
                 = new AMQP.BasicProperties.Builder().correlationId(correlationId).build();
             byte[] replyBody = handleCall(request, replyProperties);
-            replyProperties.setCorrelationId(correlationId);
-            _channel.basicPublish("", replyTo,
-                                  replyProperties, replyBody);
+            _channel.basicPublish("", replyTo, replyProperties, replyBody);
         } else {
             handleCast(request);
         }

src/com/rabbitmq/tools/jsonrpc/JsonRpcClient.java

@@ -14,7 +14,6 @@
 //  Copyright (c) 2007-2011 VMware, Inc.  All rights reserved.
 //
 
-
 package com.rabbitmq.tools.jsonrpc;
 
 import java.io.IOException;

src/com/rabbitmq/tools/jsonrpc/JsonRpcServer.java

@@ -100,9 +100,7 @@ public JsonRpcServer(Channel channel,
      */
     public String handleStringCall(String requestBody, AMQP.BasicProperties replyProperties)
     {
-        replyProperties.setContentType("application/json");
         String replyBody = doCall(requestBody);
-        //System.err.println(requestBody + " --> " + replyBody);
         return replyBody;
     }
 

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

@@ -26,7 +26,10 @@
 public class ValueOrExceptionTest extends TestCase {
     public static class InsufficientMagicException extends Exception 
       implements SensibleClone<InsufficientMagicException> {
-      public InsufficientMagicException(String message) {
+      /** Default for no check. */
+        private static final long serialVersionUID = 1L;
+
+    public InsufficientMagicException(String message) {
         super(message);
       }
 

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

@@ -17,11 +17,11 @@
 
 package com.rabbitmq.client.test.functional;
 
-import com.rabbitmq.client.test.BrokerTestCase;
-import com.rabbitmq.client.AMQP;
-import com.rabbitmq.client.ShutdownSignalException;
 import java.io.IOException;
 
+import com.rabbitmq.client.AMQP;
+import com.rabbitmq.client.test.BrokerTestCase;
+
 public class DoubleDeletion extends BrokerTestCase
 {
     protected static final String Q = "DoubleDeletionQueue";

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

@@ -20,7 +20,6 @@
 import java.io.IOException;
 
 import com.rabbitmq.client.AMQP;
-import com.rabbitmq.client.ShutdownSignalException;
 import com.rabbitmq.client.test.BrokerTestCase;
 
 /* Declare an exchange, bind a queue to it, then try to delete it,

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

@@ -17,13 +17,12 @@
 
 package com.rabbitmq.client.test.functional;
 
-import com.rabbitmq.client.AMQP;
-import com.rabbitmq.client.GetResponse;
-import com.rabbitmq.client.QueueingConsumer;
-
 import java.util.HashSet;
 import java.util.Set;
 
+import com.rabbitmq.client.AMQP;
+import com.rabbitmq.client.QueueingConsumer;
+
 public class Nack extends AbstractRejectTest {
 
     public void testSingleNack() throws Exception {

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

@@ -40,11 +40,10 @@ public void testNoRequeueOnCancel()
         channel.basicPublish("", Q, null, "1".getBytes());
 
         QueueingConsumer c;
-        QueueingConsumer.Delivery d;
 
         c = new QueueingConsumer(channel);
         String consumerTag = channel.basicConsume(Q, false, c);
-        d = c.nextDelivery();
+        c.nextDelivery();
         channel.basicCancel(consumerTag);
 
         assertNull(channel.basicGet(Q, true));