Changed codegen to use scalar types for *Properties:

    introduce java scalar types functions;
    update writePropertiesTo and readPropertiesFrom;
    preserve boxed scalars on constructor to indicate 'unset' by null;
    adjusted one test to expect a scalar.

Author: Steve Powell

codegen.py

@@ -51,29 +51,36 @@ def java_constant_name(c):
     'Date'
     ])
 
-javaPropertyTypeMap = {
-    'octet': 'Integer',
-    'shortstr': 'String',
-    'longstr': 'LongString',
-    'short': 'Integer',
-    'long': 'Integer',
-    'longlong': 'Long',
-    'bit': 'Boolean',
-    'table': 'Map<String,Object>',
-    'timestamp': 'Date'
+# the types in the range of javaTypeMap must be in java_scala_types
+java_scalar_types = set([
+    'int',
+    'long',
+    'boolean'
+    ])
+
+# the java_scalar_types must be in the domain of javaBoxedTypeMap
+javaBoxedTypeMap = {
+    'int': 'Integer',
+    'long': 'Long',
+    'boolean': 'Boolean'
     }
+def java_boxed_type(jtype):
+    if jtype in java_scalar_types:
+        return javaBoxedTypeMap[jtype]
+    else:
+        return jtype
 
 def java_type(spec, domain):
     return javaTypeMap[spec.resolveDomain(domain)]
 
-def java_name(upper, name):
+def java_name(upperNext, name):
     out = ''
     for c in name:
         if not c.isalnum():
-            upper = True
-        elif upper:
+            upperNext = True
+        elif upperNext:
             out += c.upper()
-            upper = False
+            upperNext = False
         else:
             out += c
     return out
@@ -84,8 +91,6 @@ def java_class_name(name):
 def java_getter_name(name):
     return java_name(False, 'get-' + name)
 
-def java_property_type(spec, type):
-    return javaPropertyTypeMap[spec.resolveDomain(type)]
 def java_field_name(name):
     return java_name(False, name)
 def java_field_type(spec, domain):
@@ -108,10 +113,9 @@ def java_field_default_value(type, value):
         raise BogusDefaultValue("JSON provided default value {0} for suspicious type {1}".format(value, type))
 
 def typeNameDefault(spec, a):
-    return (java_field_type(spec, a.domain),
-            java_field_name(a.name),
-            java_field_default_value(java_field_type(spec, a.domain),
-                                     a.defaultvalue))
+    fieldType = java_field_type(spec, a.domain)
+    defaultVal = java_field_default_value(fieldType, a.defaultvalue)
+    return (fieldType, java_field_name(a.name), defaultVal)
 
 def nullCheckedFields(spec, m):
     fieldsToNullCheck = set([])
@@ -236,59 +240,111 @@ def printClassInterfaces():
 
     def printReadPropertiesFrom(c):
         print
-        print """        public void readPropertiesFrom(ContentHeaderPropertyReader reader)
-            throws IOException
-        {"""
+        print "        public void readPropertiesFrom(ContentHeaderPropertyReader reader)"
+        print "            throws IOException"
+        print "        {"
+
         for f in c.fields:
-            print "            boolean %s_present = reader.readPresence();" % (java_field_name(f.name))
+            (jfName, jfType) = (java_field_name(f.name), java_field_type(spec, f.domain))
+            if jfType in java_scalar_types:
+                print "            this.%sIsSet = reader.readPresence();" % (jfName)
+            else:
+                print "            boolean %s_present = reader.readPresence();" % (jfName)
         print "            reader.finishPresence();"
         for f in c.fields:
-            print "            this.%s = %s_present ? reader.read%s() : null;" % (java_field_name(f.name), java_field_name(f.name),  java_class_name(f.domain))
+            (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)
+            else:
+                print "            this.%s = %s_present ? reader.read%s() : null;" % (jfName, jfName, jfClass)
+
         print "        }"
 
     def printWritePropertiesTo(c):
         print
-        print """        public void writePropertiesTo(ContentHeaderPropertyWriter writer)
-            throws IOException
-        {"""
+        print "        public void writePropertiesTo(ContentHeaderPropertyWriter writer)"
+        print "            throws IOException"
+        print "        {"
         for f in c.fields:
-            print "            writer.writePresence(this.%s != null);" % (java_field_name(f.name))
+            (jfName, jfType) = (java_field_name(f.name), java_field_type(spec, f.domain))
+            if jfType in java_scalar_types:
+                print "            writer.writePresence(this.%sIsSet);" % (jfName)
+            else:
+                print "            writer.writePresence(this.%s != null);" % (jfName)
+
         print "            writer.finishPresence();"
+
         for f in c.fields:
-            print "            if (this.%s != null) { writer.write%s(this.%s); }" % (java_field_name(f.name), java_class_name(f.domain), java_field_name(f.name))
+            (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) writer.write%s(this.%s);" % (jfName, jfClass, jfName)
+            else:
+                print "            if (this.%s != null) writer.write%s(this.%s);" % (jfName, jfClass, jfName)
         print "        }"
 
     def printAppendArgumentDebugStringTo(c):
-        appendList = [ "%s=\")\n               .append(this.%s)\n               .append(\"" 
-                       % (f.name, java_field_name(f.name))
+        def optionalValueClause(jField, jType):
+            if jType in java_scalar_types:
+                return "this.%sIsSet ? String.valueOf(this.%s) : \"unset\"" % (jField, jField)
+            else:
+                return "this.%s" % (jField)
+
+        appendList = [ "%s=\")\n               .append(%s)\n               .append(\"" 
+                       % (f.name, optionalValueClause(java_field_name(f.name), java_field_type(spec, f.domain)))
                        for f in c.fields ]
         print
         print "        public void appendArgumentDebugStringTo(StringBuffer acc) {"
-        print "            acc.append(\"(%s)\");" % ", ".join(appendList)
+        print "            acc.append(\"(%s)\");" % (", ".join(appendList))
+        print "        }"
+
+    def printPropertiesBuilderClass(c):
+        print "        public static final class Builder {"
+        for f in c.fields:
+            print "            private %s %s;" % (java_field_type(spec, f.domain),java_field_name(f.name))
+
         print "        }"
-        
+
     def printPropertiesClass(c):
+        def printGetterAndSetter(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)
+
         print
-        print "    public static class %(className)s extends %(parentClass)s {" % {'className' : java_class_name(c.name) + 'Properties', 'parentClass' : 'com.rabbitmq.client.impl.AMQ' + java_class_name(c.name) + 'Properties'}
+        print "    public static class %sProperties extends com.rabbitmq.client.impl.AMQ%sProperties {" % (jClassName, jClassName)
         #property fields
         for f in c.fields:
-            print "        private %s %s;" % (java_property_type(spec, f.domain),java_field_name(f.name))
+            (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)
 
         #explicit constructor
         if c.fields:
             print
-            consParmList = [ "%s %s" % (java_property_type(spec,f.domain),java_field_name(f.name))
+            consParmList = [ "%s %s" % (java_boxed_type(java_field_type(spec,f.domain)),java_field_name(f.name))
                              for f in c.fields ]
-            print "        public %sProperties(" % (java_class_name(c.name))
+            print "        public %sProperties(" % (jClassName)
             print "            %s)" % (",\n            ".join(consParmList))
             print "        {"
             for f in c.fields:
-                print "            this.%s = %s;" % (java_field_name(f.name), java_field_name(f.name))
+                (fType, fName) = (java_field_type(spec, f.domain),java_field_name(f.name))
+                if fType in java_scalar_types:
+                    print "            if (%s == null) { this.%sIsSet = false; }" % (fName, fName)
+                    print "            else { this.%sIsSet = true; this.%s = %s; }" % (fName, fName, fName)
+                else:
+                    print "            this.%s = %s;" % (fName, fName)
             print "        }"
 
         #default constructor
         print
-        print "        public %sProperties() {}" % (java_class_name(c.name))
+        print "        public %sProperties() {}" % (jClassName)
 
         #class properties
         print "        public int getClassId() { return %i; }" % (c.index)
@@ -297,15 +353,13 @@ def printPropertiesClass(c):
         #accessor methods
         print
         for f in c.fields:
-            print """        public %(fieldType)s get%(capFieldName)s() { return %(fieldName)s; }
-        public void set%(capFieldName)s(%(fieldType)s %(fieldName)s) { this.%(fieldName)s = %(fieldName)s; }""" % \
-            {'fieldType' : java_property_type(spec, f.domain), \
-            'capFieldName' : (java_field_name(f.name)[0].upper() + java_field_name(f.name)[1:]), \
-            'fieldName' : java_field_name(f.name)}
+            printGetterAndSetter(java_field_type(spec, f.domain), java_field_name(f.name))
 
         printReadPropertiesFrom(c)
         printWritePropertiesTo(c)
         printAppendArgumentDebugStringTo(c)
+        printPropertiesBuilderClass(c)
+
         print "    }"
 
     def printPropertiesClasses():

src/com/rabbitmq/client/BasicProperties.java

@@ -44,13 +44,13 @@ public interface BasicProperties {
      * Retrieve the value in the deliveryMode field.
      * @return deliveryMode field, or null if the field has not been set.
      */
-    public abstract Integer getDeliveryMode();
+    public abstract int getDeliveryMode();
 
     /**
      * Retrieve the value in the priority field.
      * @return priority field, or null if the field has not been set.
      */
-    public abstract Integer getPriority();
+    public abstract int getPriority();
 
     /**
      * Retrieve the value in the correlationId field.
@@ -122,13 +122,13 @@ public interface BasicProperties {
      * Set the deliveryMode field, or null indicating the field is not set
      * @param deliveryMode the value to set the field to
      */
-    public abstract void setDeliveryMode(Integer deliveryMode);
+    public abstract void setDeliveryMode(int deliveryMode);
 
     /**
      * Set the priority field, or null indicating the field is not set
      * @param priority the value to set the field to
      */
-    public abstract void setPriority(Integer priority);
+    public abstract void setPriority(int priority);
 
     /**
      * Set the correlationId field, or null indicating the field is not set

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

@@ -48,7 +48,7 @@ public ContentHeaderPropertyReader(DataInputStream in) throws IOException {
         this.bitCount = 15; // forces a flagWord read
     }
 
-    public boolean isContinuationBitSet() {
+    private boolean isContinuationBitSet() {
         return (flagWord & 1) != 0;
     }
 
@@ -109,7 +109,7 @@ public Map<String, Object> readTable() throws IOException {
     }
 
     /** Reads and returns an AMQP octet content header field. */
-    public Integer readOctet() throws IOException {
+    public int readOctet() throws IOException {
         return in.readOctet();
     }
 

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

@@ -25,7 +25,8 @@
 import com.rabbitmq.client.ContentHeader;
 
 /**
- * Generates an AMQP wire-protocol packet from a {@link ContentHeader}. Methods on this object are usually called from autogenerated code.
+ * Generates an AMQP wire-protocol packet from a {@link ContentHeader}.
+ * Methods on this object are usually called from autogenerated code.
  */
 public class ContentHeaderPropertyWriter {
     /** Accumulates our output */
@@ -46,7 +47,7 @@ public ContentHeaderPropertyWriter(DataOutputStream out) {
         this.bitCount = 0;
     }
 
-    public void emitFlagWord(boolean continuationBit) throws IOException {
+    private void emitFlagWord(boolean continuationBit) throws IOException {
         out.writeShort(continuationBit ? (flagWord | 1) : flagWord);
         flagWord = 0;
         bitCount = 0;
@@ -100,6 +101,10 @@ public void writeOctet(Integer octet) throws IOException {
         out.writeOctet(octet);
     }
 
+    public void writeOctet(int octet) throws IOException {
+        out.writeOctet(octet);
+    }
+
     public void writeTimestamp(Date timestamp) throws IOException {
         out.writeTimestamp(timestamp);
     }

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

@@ -54,7 +54,7 @@ public void testPropertyClonePreservesValues()
         assertEquals(MessageProperties.MINIMAL_PERSISTENT_BASIC.getDeliveryMode(),
                      ((BasicProperties) MessageProperties.MINIMAL_PERSISTENT_BASIC.clone())
                        .getDeliveryMode());
-        assertEquals((Integer) 2,
+        assertEquals(2,
                      ((BasicProperties) MessageProperties.MINIMAL_PERSISTENT_BASIC.clone())
                        .getDeliveryMode());
     }