Merge branch 'master' of github.com:msgpack/msgpack-java

muga · muga · commit 31971904e153 · 2011-07-05T19:27:46.000+09:00
diff --git a/src/main/java/org/msgpack/MessagePack.java b/src/main/java/org/msgpack/MessagePack.java
@@ -60,7 +60,6 @@ public void pack(OutputStream out, Object v) throws IOException {
     public void pack(OutputStream out, Object v, Template tmpl) throws IOException {
         StreamPacker pk = new StreamPacker(out);
         tmpl.write(pk, v);
-        pk.flush();
     }
 
     public byte[] pack(Value v) throws IOException {  // TODO IOException
diff --git a/src/main/java/org/msgpack/io/LinkedBufferOutput.java b/src/main/java/org/msgpack/io/LinkedBufferOutput.java
@@ -58,15 +58,6 @@ public int getSize() {
         return size + filled;
     }
 
-    public void flush() {
-        if(filled > 0) {
-            if(!flushBuffer(buffer, 0, filled)) {
-                buffer = null;
-            }
-            filled = 0;
-        }
-    }
-
     protected boolean flushBuffer(byte[] buffer, int off, int len) {
         link.add(new Link(buffer, off, len));
         size += len;
diff --git a/src/main/java/org/msgpack/io/Output.java b/src/main/java/org/msgpack/io/Output.java
@@ -45,7 +45,5 @@ public interface Output {
     public void writeByteAndFloat(byte b, float v) throws IOException;
 
     public void writeByteAndDouble(byte b, double v) throws IOException;
-
-    public void flush() throws IOException;
 }
 
diff --git a/src/main/java/org/msgpack/packer/AbstractMessagePackPacker.java b/src/main/java/org/msgpack/packer/AbstractMessagePackPacker.java
@@ -32,11 +32,6 @@ protected AbstractMessagePackPacker(Output out) {
         this.out = out;
     }
 
-    @Override
-    public void flush() throws IOException {
-        out.flush();
-    }
-
     @Override
     public void writeByte(byte d) throws IOException {
         if(d < -(1<<5)) {
diff --git a/src/main/java/org/msgpack/packer/Packer.java b/src/main/java/org/msgpack/packer/Packer.java
@@ -76,9 +76,6 @@ public void write(MessagePackable v) throws IOException {
         v.writeTo(this);
     }
 
-    public void flush() throws IOException {
-    }
-
     /* TODO
     public void write(boolean v) throws IOException {
         writeBoolean(v);
diff --git a/src/main/java/org/msgpack/value/AbstractBooleanValue.java b/src/main/java/org/msgpack/value/AbstractBooleanValue.java
@@ -34,22 +34,8 @@ public boolean isFalse() {
         return !getBoolean();
     }
 
-    public String toString() {
-        if(getBoolean()) {
-            return "true";
-        } else {
-            return "false";
-        }
+    public BooleanValue asBooleanValue() {
+        return this;
     }
-
-    // TODO equals
-
-	public int hashCode() {
-		if(getBoolean()) {
-			return 1231;
-		} else {
-			return 1237;
-		}
-	}
 }
 
diff --git a/src/main/java/org/msgpack/value/AbstractRawValue.java b/src/main/java/org/msgpack/value/AbstractRawValue.java
@@ -48,11 +48,59 @@ public int hashCode() {
     }
 
     public String toString() {
-        StringBuilder sb = new StringBuilder();
+        return toString(new StringBuilder()).toString();
+    }
+
+    public StringBuilder toString(StringBuilder sb) {
+        String s = getString();
         sb.append("\"");
-        sb.append(getString());  // TODO escape
+        for(int i=0; i < s.length(); i++) {
+            char ch = s.charAt(i);
+            if(ch < 0x20) {
+                switch(ch) {
+                case '\n':
+                    sb.append("\\n");
+                    break;
+                case '\r':
+                    sb.append("\\r");
+                    break;
+                case '\t':
+                    sb.append("\\t");
+                    break;
+                case '\f':
+                    sb.append("\\f");
+                    break;
+                case '\b':
+                    sb.append("\\b");
+                    break;
+                default:
+                    escapeChar(sb, ch);
+                    break;
+                }
+            } else {
+                switch(ch) {
+                case '\\':
+                    sb.append("\\\\");
+                    break;
+                case '"':
+                    sb.append("\\\"");
+                    break;
+                default:
+                    sb.append(ch);
+                    break;
+                }
+            }
+        }
         sb.append("\"");
-        return sb.toString();
+        return sb;
+    }
+
+    private void escapeChar(StringBuilder sb, char ch) {
+        sb.append("\\u");
+        sb.append(((int)ch >> 12) & 0xF);
+        sb.append(((int)ch >> 8) & 0xF);
+        sb.append(((int)ch >> 4) & 0xF);
+        sb.append((int)ch & 0xF);
     }
 }
 
diff --git a/src/main/java/org/msgpack/value/ArrayValueImpl.java b/src/main/java/org/msgpack/value/ArrayValueImpl.java
@@ -138,18 +138,21 @@ public int hashCode() {
     }
 
     public String toString() {
+        return toString(new StringBuilder()).toString();
+    }
+
+    public StringBuilder toString(StringBuilder sb) {
         if(array.length == 0) {
-            return "[]";
+            return sb.append("[]");
         }
-        StringBuilder sb = new StringBuilder();
         sb.append("[");
         sb.append(array[0]);
         for(int i=1; i < array.length; i++) {
             sb.append(",");
-            sb.append(array[i]);
+            array[i].toString(sb);
         }
         sb.append("]");
-        return sb.toString();
+        return sb;
     }
 }
 
diff --git a/src/main/java/org/msgpack/value/BigIntegerValueImpl.java b/src/main/java/org/msgpack/value/BigIntegerValueImpl.java
@@ -124,5 +124,9 @@ public int hashCode() {
     public String toString() {
         return value.toString();
     }
+
+    public StringBuilder toString(StringBuilder sb) {
+        return sb.append(value.toString());
+    }
 }
 
diff --git a/src/main/java/org/msgpack/value/DoubleValueImpl.java b/src/main/java/org/msgpack/value/DoubleValueImpl.java
@@ -91,5 +91,9 @@ public int hashCode() {
     public String toString() {
         return Double.toString(value);
     }
+
+    public StringBuilder toString(StringBuilder sb) {
+        return sb.append(Double.toString(value));
+    }
 }
 
diff --git a/src/main/java/org/msgpack/value/FalseValueImpl.java b/src/main/java/org/msgpack/value/FalseValueImpl.java
@@ -33,10 +33,6 @@ public boolean getBoolean() {
         return false;
     }
 
-    public BooleanValue asBooleanValue() {
-        return this;
-    }
-
     public void writeTo(Packer pk) throws IOException {
         pk.writeBoolean(false);
     }
@@ -55,5 +51,13 @@ public boolean equals(Object o) {
     public int hashCode() {
         return 1237;
     }
+
+    public String toString() {
+        return "false";
+    }
+
+    public StringBuilder toString(StringBuilder sb) {
+        return sb.append("false");
+    }
 }
 
diff --git a/src/main/java/org/msgpack/value/FloatValue.java b/src/main/java/org/msgpack/value/FloatValue.java
@@ -33,8 +33,5 @@ public FloatValue asFloatValue() {
     public abstract float getFloat();
 
     public abstract double getDouble();
-
-    // TODO equals
-    // TODO hashCode
 }
 
diff --git a/src/main/java/org/msgpack/value/FloatValueImpl.java b/src/main/java/org/msgpack/value/FloatValueImpl.java
@@ -90,5 +90,9 @@ public int hashCode() {
     public String toString() {
         return Float.toString(value);
     }
+
+    public StringBuilder toString(StringBuilder sb) {
+        return sb.append(Float.toString(value));
+    }
 }
 
diff --git a/src/main/java/org/msgpack/value/IntValueImpl.java b/src/main/java/org/msgpack/value/IntValueImpl.java
@@ -118,5 +118,9 @@ public int hashCode() {
     public String toString() {
         return Integer.toString(value);
     }
+
+    public StringBuilder toString(StringBuilder sb) {
+        return sb.append(Integer.toString(value));
+    }
 }
 
diff --git a/src/main/java/org/msgpack/value/LongValueImpl.java b/src/main/java/org/msgpack/value/LongValueImpl.java
@@ -123,5 +123,9 @@ public int hashCode() {
     public String toString() {
         return Long.toString(value);
     }
+
+    public StringBuilder toString(StringBuilder sb) {
+        return sb.append(Long.toString(value));
+    }
 }
 
diff --git a/src/main/java/org/msgpack/value/SequentialMapValueImpl.java b/src/main/java/org/msgpack/value/SequentialMapValueImpl.java
@@ -254,22 +254,25 @@ public int hashCode() {
     }
 
     public String toString() {
+        return toString(new StringBuilder()).toString();
+    }
+
+    public StringBuilder toString(StringBuilder sb) {
         if(array.length == 0) {
-            return "{}";
+            return sb.append("{}");
         }
-        StringBuilder sb = new StringBuilder();
         sb.append("{");
         sb.append(array[0]);
         sb.append(":");
         sb.append(array[1]);
         for(int i=2; i < array.length; i+=2) {
             sb.append(",");
-            sb.append(array[i]);
+            array[i].toString(sb);
             sb.append(":");
-            sb.append(array[i+1]);
+            array[i+1].toString(sb);
         }
         sb.append("}");
-        return sb.toString();
+        return sb;
     }
 }
 
diff --git a/src/main/java/org/msgpack/value/TrueValueImpl.java b/src/main/java/org/msgpack/value/TrueValueImpl.java
@@ -33,10 +33,6 @@ public boolean getBoolean() {
         return true;
     }
 
-    public BooleanValue asBooleanValue() {
-        return this;
-    }
-
     public void writeTo(Packer pk) throws IOException {
         pk.writeBoolean(true);
     }
@@ -52,8 +48,16 @@ public boolean equals(Object o) {
         return ((BooleanValue) o).getBoolean() == true;
     }
 
-	public int hashCode() {
+    public int hashCode() {
         return 1231;
     }
+
+    public String toString() {
+        return "true";
+    }
+
+    public StringBuilder toString(StringBuilder sb) {
+        return sb.append("true");
+    }
 }
 
diff --git a/src/main/java/org/msgpack/value/Value.java b/src/main/java/org/msgpack/value/Value.java
@@ -52,5 +52,7 @@ public interface Value {
     public RawValue asRawValue();
 
     public void writeTo(Packer pk) throws IOException;
+
+    public StringBuilder toString(StringBuilder sb);
 }
 
diff --git a/src/test/java/org/msgpack/TestCrossLang.java b/src/test/java/org/msgpack/TestCrossLang.java
@@ -78,8 +78,6 @@ public void testCompactSerialize() throws IOException {
             pk.write(av);
         }
 
-        pk.flush();
-
         byte[] c = out.toByteArray();
 
         assertEquals(b.length, c.length);
diff --git a/src/test/java/org/msgpack/TestSetPredefinedTypes.java b/src/test/java/org/msgpack/TestSetPredefinedTypes.java
@@ -172,17 +172,18 @@ public void testString() throws Exception {
 		testString(sb.toString());
 	    }
 	}
-	// large size string
-	{
-	    for (int i = 0; i < 10; i++) {
-		sb = new StringBuilder();
-		len = (int) Math.random() % 100 + (1 << 31);
-		for (int j = 0; j < len; j++) {
-		    sb.append('a' + ((int) Math.random()) & 26);
-		}
-		testString(sb.toString());
-	    }
-	}
+// heap size error
+//	// large size string
+//	{
+//	    for (int i = 0; i < 10; i++) {
+//		sb = new StringBuilder();
+//		len = (int) Math.random() % 100 + (1 << 30);
+//		for (int j = 0; j < len; j++) {
+//		    sb.append('a' + ((int) Math.random()) & 26);
+//		}
+//		testString(sb.toString());
+//	    }
+//	}
     }
 
     public abstract void testString(String v) throws Exception;
diff --git a/src/test/java/org/msgpack/TestStreamPackUnpack.java b/src/test/java/org/msgpack/TestStreamPackUnpack.java

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,6 @@ public void pack(OutputStream out, Object v) throws IOException {`
`60`	`60`	`public void pack(OutputStream out, Object v, Template tmpl) throws IOException {`
`61`	`61`	`StreamPacker pk = new StreamPacker(out);`
`62`	`62`	`tmpl.write(pk, v);`
`63`		`- pk.flush();`
`64`	`63`	`}`
`65`	`64`
`66`	`65`	`public byte[] pack(Value v) throws IOException { // TODO IOException`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,5 @@ public interface Output {`
`45`	`45`	`public void writeByteAndFloat(byte b, float v) throws IOException;`
`46`	`46`
`47`	`47`	`public void writeByteAndDouble(byte b, double v) throws IOException;`
`48`		`-`
`49`		`- public void flush() throws IOException;`
`50`	`48`	`}`
`51`	`49`
Original file line number	Diff line number	Diff line change
`@@ -76,9 +76,6 @@ public void write(MessagePackable v) throws IOException {`
`76`	`76`	`v.writeTo(this);`
`77`	`77`	`}`
`78`	`78`
`79`		`- public void flush() throws IOException {`
`80`		`- }`
`81`		`-`
`82`	`79`	`/* TODO`
`83`	`80`	`public void write(boolean v) throws IOException {`
`84`	`81`	`writeBoolean(v);`
Original file line number	Diff line number	Diff line change
`@@ -138,18 +138,21 @@ public int hashCode() {`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`public String toString() {`
	`141`	`+ return toString(new StringBuilder()).toString();`
	`142`	`+ }`
	`143`	`+`
	`144`	`+ public StringBuilder toString(StringBuilder sb) {`
`141`	`145`	`if(array.length == 0) {`
`142`		`- return "[]";`
	`146`	`+ return sb.append("[]");`
`143`	`147`	`}`
`144`		`- StringBuilder sb = new StringBuilder();`
`145`	`148`	`sb.append("[");`
`146`	`149`	`sb.append(array[0]);`
`147`	`150`	`for(int i=1; i < array.length; i++) {`
`148`	`151`	`sb.append(",");`
`149`		`- sb.append(array[i]);`
	`152`	`+ array[i].toString(sb);`
`150`	`153`	`}`
`151`	`154`	`sb.append("]");`
`152`		`- return sb.toString();`
	`155`	`+ return sb;`
`153`	`156`	`}`
`154`	`157`	`}`
`155`	`158`
Original file line number	Diff line number	Diff line change
`@@ -124,5 +124,9 @@ public int hashCode() {`
`124`	`124`	`public String toString() {`
`125`	`125`	`return value.toString();`
`126`	`126`	`}`
	`127`	`+`
	`128`	`+ public StringBuilder toString(StringBuilder sb) {`
	`129`	`+ return sb.append(value.toString());`
	`130`	`+ }`
`127`	`131`	`}`
`128`	`132`
Original file line number	Diff line number	Diff line change
`@@ -91,5 +91,9 @@ public int hashCode() {`
`91`	`91`	`public String toString() {`
`92`	`92`	`return Double.toString(value);`
`93`	`93`	`}`
	`94`	`+`
	`95`	`+ public StringBuilder toString(StringBuilder sb) {`
	`96`	`+ return sb.append(Double.toString(value));`
	`97`	`+ }`
`94`	`98`	`}`
`95`	`99`