merge bug20154 into default

Author: tonyg

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

@@ -45,7 +45,7 @@
  */
 public class ContentHeaderPropertyReader {
     /** Stream we are reading from */
-    private final DataInputStream in;
+    private final ValueReader in;
 
     /** Current field flag word */
     public int flagWord;
@@ -57,7 +57,7 @@ public class ContentHeaderPropertyReader {
      * Protected API - Constructs a reader from the given input stream
      */
     public ContentHeaderPropertyReader(DataInputStream in) throws IOException {
-        this.in = in;
+        this.in = new ValueReader(in);
         this.flagWord = 1; // just the continuation bit
         this.bitCount = 15; // forces a flagWord read
     }
@@ -94,41 +94,41 @@ public void finishPresence() throws IOException {
 
     /** Reads and returns an AMQP short string content header field. */
     public String readShortstr() throws IOException {
-        return MethodArgumentReader.readShortstr(in);
+        return in.readShortstr();
     }
 
     /** Reads and returns an AMQP "long string" (binary) content header field. */
     public LongString readLongstr() throws IOException {
-        return MethodArgumentReader.readLongstr(in);
+        return in.readLongstr();
     }
 
     /** Reads and returns an AMQP short integer content header field. */
     public Integer readShort() throws IOException {
-        return new Integer(in.readUnsignedShort());
+        return in.readShort();
     }
 
     /** Reads and returns an AMQP integer content header field. */
     public Integer readLong() throws IOException {
-        return in.readInt();
+        return in.readLong();
     }
 
     /** Reads and returns an AMQP long integer content header field. */
     public Long readLonglong() throws IOException {
-        return new Long(in.readLong());
+        return in.readLonglong();
     }
 
     /** Reads and returns an AMQP table content header field. */
     public Map<String, Object> readTable() throws IOException {
-        return MethodArgumentReader.readTable(in);
+        return in.readTable();
     }
 
     /** Reads and returns an AMQP octet content header field. */
     public Integer readOctet() throws IOException {
-        return in.readUnsignedByte();
+        return in.readOctet();
     }
 
     /** Reads and returns an AMQP timestamp content header field. */
     public Date readTimestamp() throws IOException {
-        return MethodArgumentReader.readTimestamp(in);
+        return in.readTimestamp();
     }
 }

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

@@ -38,16 +38,14 @@
 import java.util.Date;
 import java.util.Map;
 
-import org.apache.commons.io.IOUtils;
-
 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.
  */
 public class ContentHeaderPropertyWriter {
-    /** DataOutputStream wrapper for outBytes */
-    public DataOutputStream out;
+    /** Accumulates our output */
+    private final ValueWriter out;
 
     /** Current flags word being accumulated */
     public int flagWord;
@@ -59,7 +57,7 @@ public class ContentHeaderPropertyWriter {
      * Constructs a fresh ContentHeaderPropertyWriter.
      */
     public ContentHeaderPropertyWriter(DataOutputStream out) {
-        this.out = out;
+        this.out = new ValueWriter(out);
         this.flagWord = 0;
         this.bitCount = 0;
     }
@@ -87,75 +85,38 @@ public void finishPresence() throws IOException {
     }
 
     public void writeShortstr(String str) throws IOException {
-        byte[] bytes = str.getBytes("utf-8");
-        out.writeByte(bytes.length);
-        out.write(bytes);
+        out.writeShortstr(str);
     }
 
     public void writeLongstr(String str) throws IOException {
-        byte[] bytes = str.getBytes("utf-8");
-        out.writeInt(bytes.length);
-        out.write(bytes);
+        out.writeLongstr(str);
     }
 
     public void writeLongstr(LongString str) throws IOException {
-        out.writeInt((int) str.length());
-        IOUtils.copy(str.getStream(), out);
+        out.writeLongstr(str);
     }
 
     public void writeShort(Integer s) throws IOException {
         out.writeShort(s);
     }
 
     public void writeLong(Integer l) throws IOException {
-        out.writeInt(l);
+        out.writeLong(l);
     }
 
     public void writeLonglong(Long ll) throws IOException {
-        out.writeLong(ll.longValue());
+        out.writeLonglong(ll);
     }
 
     public void writeTable(Map<String, Object> table) throws IOException {
-        out.writeInt((int) Frame.tableSize(table));
-        for (Map.Entry<String, Object> entry : table.entrySet()) {
-
-            writeShortstr(entry.getKey());
-
-            Object value = entry.getValue();
-            if (value instanceof String) {
-                out.writeByte('S');
-                writeLongstr((String) value);
-            } else if (value instanceof LongString) {
-                out.writeByte('S');
-                writeLongstr((LongString) value);
-            } else if (value instanceof Integer) {
-                out.writeByte('I');
-                writeLong((Integer) value);
-            } else if (value instanceof BigDecimal) {
-                out.writeByte('D');
-                BigDecimal decimal = (BigDecimal) value;
-                out.writeByte(decimal.scale());
-                BigInteger unscaled = decimal.unscaledValue();
-                if (unscaled.bitLength() > 32) /* Integer.SIZE in Java 1.5 */
-                    throw new IllegalArgumentException("BigDecimal too large to be encoded");
-                out.writeInt(decimal.unscaledValue().intValue());
-            } else if (value instanceof Date) {
-                out.writeByte('T');
-                writeTimestamp((Date) value);
-            } else if (value instanceof Map) {
-                out.writeByte('F');
-                writeTable((Map<String, Object>) value);
-            } else {
-                throw new IllegalArgumentException("Invalid value type: " + value.getClass().getName() + " for key " + entry.getKey());
-            }
-        }
+        out.writeTable(table);
     }
 
     public void writeOctet(Integer octet) throws IOException {
-        out.writeByte(octet);
+        out.writeOctet(octet);
     }
 
     public void writeTimestamp(Date timestamp) throws IOException {
-        out.writeLong(timestamp.getTime() / 1000);
+        out.writeTimestamp(timestamp);
     }
 }

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

@@ -273,8 +273,7 @@ public static long tableSize(Map<String, Object> table)
                 acc += longStrSize((String)entry.getValue());
             }
             else if(value instanceof LongString) {
-                acc += 4;
-                acc += ((LongString)value).length();
+                acc += 4 + ((LongString)value).length();
             }
             else if(value instanceof Integer) {
                 acc += 4;
@@ -286,8 +285,30 @@ else if(value instanceof Date || value instanceof Timestamp) {
                 acc += 8;
             }
             else if(value instanceof Map) {
+                acc += 4 + tableSize((Map<String, Object>) value);
+            }
+            else if (value instanceof Byte) {
+                acc += 1;
+            }
+            else if(value instanceof Double) {
+                acc += 8;
+            }
+            else if(value instanceof Float) {
                 acc += 4;
-                acc += tableSize((Map<String, Object>) value);
+            }
+            else if(value instanceof Long) {
+                acc += 8;
+            }
+            else if(value instanceof Short) {
+                acc += 2;
+            }
+            else if(value instanceof Boolean) {
+                acc += 1;
+            }
+            else if(value instanceof byte[]) {
+                acc += 4 + ((byte[])value).length;
+            }
+            else if(value == null) {
             }
             else {
                 throw new IllegalArgumentException("invalid value in table");