Merge with default

Author: Rob Harrop

codegen.py

@@ -370,6 +370,9 @@ def printSetter(fieldType, fieldName):
 
         print "        }"
 
+        # default constructor
+        print "        public %sProperties() {}" % (jClassName)
+
         #class properties
         print "        public int getClassId() { return %i; }" % (c.index)
         print "        public String getClassName() { return \"%s\"; }" % (c.name)

test/src/com/rabbitmq/examples/FileProducer.java

@@ -82,10 +82,8 @@ public static void main(String[] args) {
 		Map<String, Object> headers = new HashMap<String, Object>();
 		headers.put("filename", filename);
 		headers.put("length", (int) f.length());
-		BasicProperties props = new BasicProperties(null, null, headers, null,
-							    null, null, null, null,
-							    null, null, null, null,
-							    null, null);
+		BasicProperties props = new BasicProperties();
+		props.setHeaders(headers);
 		ch.basicPublish(exchange, routingKey, props, body);
 		System.out.println(" done.");
 	    }