implement extended table field types

Author: Matthias Radestock

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

@@ -103,19 +103,30 @@ public final String readShortstr()
         return readShortstr(this.in);
     }
 
-    /** Public API - convenience method - reads a long string argument from a DataInputStream. */
-    public static final LongString readLongstr(final DataInputStream in)
+    /** Public API - convenience method - reads a 32-bit-length-prefix
+     * byte vector from a DataInputStream.
+     */
+    public static final byte[] readBytes(final DataInputStream in)
         throws IOException
     {
         final long contentLength = unsignedExtend(in.readInt());
         if(contentLength < Integer.MAX_VALUE) {
             final byte [] buffer = new byte[(int)contentLength];
             in.readFully(buffer);
-
-            return LongStringHelper.asLongString(buffer);
-        }
+            return buffer;
+        } else {
             throw new UnsupportedOperationException
-                ("Very long strings not currently supported");
+                ("Very long byte vectors and strings not currently supported");
+        }
+    }
+
+    /** Public API - convenience method - reads a long string argument
+     * from a DataInputStream.
+     */
+    public static final LongString readLongstr(final DataInputStream in)
+        throws IOException
+    {
+        return LongStringHelper.asLongString(readBytes(in));
     }
 
     /** Public API - reads a long string argument. */
@@ -206,6 +217,30 @@ public static final Map<String, Object> readTable(DataInputStream in)
             case 'F':
                 value = readTable(tableIn);
                 break;
+            case 'b':
+                value = tableIn.readByte();
+                break;
+            case 'd':
+                value = tableIn.readDouble();
+                break;
+            case 'f':
+                value = tableIn.readFloat();
+                break;
+            case 'l':
+                value = tableIn.readLong();
+                break;
+            case 's':
+                value = tableIn.readShort();
+                break;
+            case 't':
+                value = tableIn.readBoolean();
+                break;
+            case 'x':
+                value = readBytes(tableIn);
+                break;
+            case 'V':
+                value = null;
+                break;
             default:
                 throw new MalformedFrameException
                     ("Unrecognised type in table");

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

@@ -203,6 +203,38 @@ else if(value instanceof Map) {
                     // (not even a little respect)
                     writeTable((Map<String, Object>) value);
                 }
+                else if (value instanceof Byte) {
+                    writeOctet('b');
+                    out.writeByte((Byte)value);
+                }
+                else if(value instanceof Double) {
+                    writeOctet('d');
+                    out.writeDouble((Double)value);
+                }
+                else if(value instanceof Float) {
+                    writeOctet('f');
+                    out.writeFloat((Float)value);
+                }
+                else if(value instanceof Long) {
+                    writeOctet('l');
+                    out.writeLong((Long)value);
+                }
+                else if(value instanceof Short) {
+                    writeOctet('s');
+                    out.writeShort((Short)value);
+                }
+                else if(value instanceof Boolean) {
+                    writeOctet('t');
+                    out.writeBoolean((Boolean)value);
+                }
+                else if(value instanceof byte[]) {
+                    writeOctet('x');
+                    writeLong(((byte[])value).length);
+                    out.write((byte[])value);
+                }
+                else if(value == null) {
+                    writeOctet('V');
+                }
                 else {
                     throw new IllegalArgumentException
                         ("Invalid value type: " + value.getClass().getName()