Merge bug23451 into bug23912

Author: Rob Harrop

codegen.py

@@ -266,12 +266,20 @@ def printWritePropertiesTo(c):
         print "        }"
 
     def printAppendArgumentDebugStringTo(c):
-        appendList = [ "%s=\")\n               .append(this.%s)\n               .append(\"" 
-                       % (f.name, java_field_name(f.name))
+        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)))
                        for f in c.fields ]
         print
-        print "        public void appendArgumentDebugStringTo(StringBuffer acc) {"
-        print "            acc.append(\"(%s)\");" % (", ".join(appendList))
+        print "        public void appendArgumentDebugStringTo(Appendable acc) {"
+        print "            try {"
+        print "                acc.append(\"(%s)\");" % (", ".join(appendList))
+        print "            } catch(IOException _) { }"
         print "        }"
 
     def printPropertiesBuilderClass(c):
@@ -477,12 +485,21 @@ def trueOrFalse(truthVal):
                     return "false"
 
             def argument_debug_string():
-                appendList = [ "%s=\")\n                   .append(this.%s)\n                   .append(\"" 
-                               % (a.name, java_field_name(a.name))
+                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))
                                for a in m.arguments ]
                 print
-                print "            public void appendArgumentDebugStringTo(StringBuffer acc) {"
-                print "                acc.append(\"(%s)\");" % ", ".join(appendList)
+                print "            public void appendArgumentDebugStringTo(Appendable acc) {"
+                print "                try {"
+                print "                    acc.append(\"(%s)\");" % ", ".join(appendList)
+                print "                } catch(IOException _) { }"
                 print "            }"
 
             def write_arguments():

src/com/rabbitmq/client/ContentHeader.java

@@ -38,5 +38,5 @@ public interface ContentHeader extends Cloneable {
      * A debugging utility - enable properties to be appended to a string buffer for use as trace messages.
      * @param buffer a place to append the properties as a string
      */
-    public void appendPropertyDebugStringTo(StringBuffer buffer);
+    public void appendPropertyDebugStringTo(Appendable buffer);
 }

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

@@ -58,12 +58,12 @@ private void writeTo(DataOutputStream out, long bodySize) throws IOException {
     public abstract void writePropertiesTo(ContentHeaderPropertyWriter writer) throws IOException;
 
     /** Public API - {@inheritDoc} */
-    public void appendPropertyDebugStringTo(StringBuffer acc) {
-        acc.append("(?)");
+    public void appendPropertyDebugStringTo(Appendable acc) {
+        try { acc.append("(?)"); } catch(IOException ioe) { }
     }
 
     @Override public String toString() {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         sb.append("#contentHeader<").append(getClassName()).append(">");
         this.appendPropertyDebugStringTo(sb);
         return sb.toString();

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

@@ -240,7 +240,7 @@ public DataOutputStream getOutputStream() {
     }
 
     @Override public String toString() {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         sb.append("Frame(type=").append(type).append(", channel=").append(channel).append(", ");
         if (accumulator == null) {
             sb.append(payload.length).append(" bytes of payload)");

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

@@ -63,12 +63,12 @@ public abstract class Method implements com.rabbitmq.client.Method {
      * Public API - debugging utility
      * @param buffer the buffer to append debug data to
      */
-    public void appendArgumentDebugStringTo(StringBuffer buffer) {
-        buffer.append("(?)");
+    public void appendArgumentDebugStringTo(Appendable buffer) {
+        try { buffer.append("(?)");} catch(IOException ioe) { }
     }
 
     @Override public String toString() {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         sb.append("#method<").append(protocolMethodName()).append(">");
         this.appendArgumentDebugStringTo(sb);
         return sb.toString();

src/com/rabbitmq/tools/json/JSONReader.java

@@ -51,7 +51,7 @@ public class JSONReader {
     private CharacterIterator it;
     private char c;
     private Object token;
-    private StringBuffer buf = new StringBuffer();
+    private StringBuilder buf = new StringBuilder();
 
     private char next() {
         c = it.next();

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

@@ -53,8 +53,7 @@ public void testTypes() throws IOException {
         table.put("t", true);
         table.put("x", "byte".getBytes());
         table.put("V", null);
-        @SuppressWarnings("rawtypes")
-        List fieldArray = new ArrayList();
+        List<Object> fieldArray = new ArrayList<Object>();
         fieldArray.add(LongStringHelper.asLongString("foo"));
         fieldArray.add(123);
         table.put("A", fieldArray);

test/src/com/rabbitmq/tools/Host.java

@@ -27,9 +27,9 @@ public class Host {
     private static String capture(InputStream is)
         throws IOException
     {
-        final BufferedReader br = new BufferedReader(new InputStreamReader(is));
+        BufferedReader br = new BufferedReader(new InputStreamReader(is));
         String line;
-        final StringBuffer buff = new StringBuffer();
+        StringBuilder buff = new StringBuilder();
         while ((line = br.readLine()) != null) {
             buff.append(line);
         }