fixed Value.equals and added test programs

frsyuki · frsyuki · commit 5f0c276cd063 · 2011-08-12T18:01:34.000+09:00
diff --git a/src/main/java/org/msgpack/template/AnyTemplate.java b/src/main/java/org/msgpack/template/AnyTemplate.java
@@ -37,7 +37,7 @@ public static AnyTemplate getInstance(TemplateRegistry registry) {
     private TemplateRegistry registry;
 
     private AnyTemplate(TemplateRegistry registry) {
-	
+        this.registry = registry;
     }
 
     public void write(Packer pk, T target, boolean required) throws IOException {
diff --git a/src/main/java/org/msgpack/type/AbstractRawValue.java b/src/main/java/org/msgpack/type/AbstractRawValue.java
@@ -36,11 +36,15 @@ public boolean equals(Object o) {
         if(this == o) {
             return true;
         }
-        if(!(o instanceof RawValue)) {
+        if(!(o instanceof Value)) {
+            return false;
+        }
+        Value v = (Value) o;
+        if(!v.isRaw()) {
             return false;
         }
 
-        return Arrays.equals(getByteArray(), ((RawValue) o).getByteArray());
+        return Arrays.equals(getByteArray(), v.asRawValue().getByteArray());
     }
 
     public int hashCode() {
diff --git a/src/main/java/org/msgpack/type/ArrayValueImpl.java b/src/main/java/org/msgpack/type/ArrayValueImpl.java
@@ -96,15 +96,19 @@ public boolean equals(Object o) {
         if(o == this) {
             return true;
         }
-        if(!(o instanceof ArrayValue)) {
+        if(!(o instanceof Value)) {
+            return false;
+        }
+        Value v = (Value) o;
+        if(!v.isArray()) {
             return false;
         }
 
-        if(o.getClass() == ArrayValueImpl.class) {
-            return equals((ArrayValueImpl) o);
+        if(v.getClass() == ArrayValueImpl.class) {
+            return equals((ArrayValueImpl) v);
         }
 
-        ListIterator oi = ((List) o).listIterator();
+        ListIterator oi = v.asArrayValue().listIterator();
         int i = 0;
         while(i < array.length) {
             if(!oi.hasNext() || !array[i].equals(oi.next())) {
diff --git a/src/main/java/org/msgpack/type/BigIntegerValueImpl.java b/src/main/java/org/msgpack/type/BigIntegerValueImpl.java
@@ -109,11 +109,15 @@ public boolean equals(Object o) {
         if(o == this) {
             return true;
         }
-        if(!(o instanceof IntegerValue)) {
+        if(!(o instanceof Value)) {
+            return false;
+        }
+        Value v = (Value) o;
+        if(!v.isInteger()) {
             return false;
         }
 
-        return value.equals(((IntegerValue) o).bigIntegerValue());
+        return value.equals(v.asIntegerValue().bigIntegerValue());
     }
 
     public int hashCode() {
diff --git a/src/main/java/org/msgpack/type/ByteArrayRawValueImpl.java b/src/main/java/org/msgpack/type/ByteArrayRawValueImpl.java
@@ -68,11 +68,15 @@ public boolean equals(Object o) {
         if(this == o) {
             return true;
         }
-        if(!(o instanceof RawValue)) {
+        if(!(o instanceof Value)) {
+            return false;
+        }
+        Value v = (Value) o;
+        if(!v.isRaw()) {
             return false;
         }
 
-        return Arrays.equals(bytes, ((RawValue) o).getByteArray());
+        return Arrays.equals(bytes, v.asRawValue().getByteArray());
     }
 
     public int hashCode() {
diff --git a/src/main/java/org/msgpack/type/DoubleValueImpl.java b/src/main/java/org/msgpack/type/DoubleValueImpl.java
@@ -74,11 +74,15 @@ public boolean equals(Object o) {
         if(o == this) {
             return true;
         }
-        if(!(o instanceof FloatValue)) {
+        if(!(o instanceof Value)) {
+            return false;
+        }
+        Value v = (Value) o;
+        if(!v.isFloat()) {
             return false;
         }
 
-        return value == ((FloatValue) o).getDouble();
+        return value == v.asFloatValue().getDouble();
     }
 
     // TODO compareTo
diff --git a/src/main/java/org/msgpack/type/FalseValueImpl.java b/src/main/java/org/msgpack/type/FalseValueImpl.java
@@ -41,11 +41,15 @@ public boolean equals(Object o) {
         if(o == this) {
             return true;
         }
-        if(!(o instanceof BooleanValue)) {
+        if(!(o instanceof Value)) {
+            return false;
+        }
+        Value v = (Value) o;
+        if(!v.isBoolean()) {
             return false;
         }
 
-        return ((BooleanValue) o).getBoolean() == false;
+        return v.asBooleanValue().getBoolean() == false;
     }
 
     public int hashCode() {
diff --git a/src/main/java/org/msgpack/type/FloatValueImpl.java b/src/main/java/org/msgpack/type/FloatValueImpl.java
@@ -70,11 +70,15 @@ public boolean equals(Object o) {
         if(o == this) {
             return true;
         }
-        if(!(o instanceof FloatValue)) {
+        if(!(o instanceof Value)) {
+            return false;
+        }
+        Value v = (Value) o;
+        if(!v.isFloat()) {
             return false;
         }
 
-        return (double)value == ((FloatValue) o).getDouble();
+        return (double)value == v.asFloatValue().getDouble();
     }
 
     public void writeTo(Packer pk) throws IOException {
diff --git a/src/main/java/org/msgpack/type/IntValueImpl.java b/src/main/java/org/msgpack/type/IntValueImpl.java
@@ -99,13 +99,17 @@ public boolean equals(Object o) {
         if(o == this) {
             return true;
         }
-        if(!(o instanceof IntegerValue)) {
+        if(!(o instanceof Value)) {
+            return false;
+        }
+        Value v = (Value) o;
+        if(!v.isInteger()) {
             return false;
         }
 
         try {
             // TODO
-            return value == ((IntegerValue) o).getInt();
+            return value == v.asIntegerValue().getInt();
         } catch (MessageTypeException ex) {
             return false;
         }
diff --git a/src/main/java/org/msgpack/type/LongValueImpl.java b/src/main/java/org/msgpack/type/LongValueImpl.java
@@ -104,13 +104,17 @@ public boolean equals(Object o) {
         if(o == this) {
             return true;
         }
-        if(!(o instanceof IntegerValue)) {
+        if(!(o instanceof Value)) {
+            return false;
+        }
+        Value v = (Value) o;
+        if(!v.isInteger()) {
             return false;
         }
 
         try {
             // TODO
-            return value == ((IntegerValue) o).getLong();
+            return value == v.asIntegerValue().getLong();
         } catch (MessageTypeException ex) {
             return false;
         }
diff --git a/src/main/java/org/msgpack/type/SequentialMapValueImpl.java b/src/main/java/org/msgpack/type/SequentialMapValueImpl.java
@@ -179,15 +179,19 @@ public boolean equals(Object o) {
         if(o == this) {
             return true;
         }
-        if(!(o instanceof MapValue)) {
+        if(!(o instanceof Value)) {
+            return false;
+        }
+        Value v = (Value) o;
+        if(!v.isMap()) {
             return false;
         }
 
-        if(o.getClass() == SequentialMapValueImpl.class) {
-            return equals((SequentialMapValueImpl) o);
+        if(v.getClass() == SequentialMapValueImpl.class) {
+            return equals((SequentialMapValueImpl) v);
         }
 
-        Map<Value,Value> om = (Map<Value,Value>) o;
+        Map<Value,Value> om = v.asMapValue();
         if (om.size() != array.length/2) {
             return false;
         }
diff --git a/src/main/java/org/msgpack/type/StringRawValueImpl.java b/src/main/java/org/msgpack/type/StringRawValueImpl.java
@@ -51,15 +51,19 @@ public boolean equals(Object o) {
         if(this == o) {
             return true;
         }
-        if(!(o instanceof RawValue)) {
+        if(!(o instanceof Value)) {
+            return false;
+        }
+        Value v = (Value) o;
+        if(!v.isRaw()) {
             return false;
         }
 
-        if(o.getClass() == StringRawValueImpl.class) {
-            return string.equals(((StringRawValueImpl) o).string);
+        if(v.getClass() == StringRawValueImpl.class) {
+            return string.equals(((StringRawValueImpl) v).string);
         }
 
-        return Arrays.equals(getByteArray(), ((RawValue) o).getByteArray());
+        return Arrays.equals(getByteArray(), v.asRawValue().getByteArray());
     }
 }
 
diff --git a/src/main/java/org/msgpack/type/TrueValueImpl.java b/src/main/java/org/msgpack/type/TrueValueImpl.java
@@ -41,11 +41,15 @@ public boolean equals(Object o) {
         if(o == this) {
             return true;
         }
-        if(!(o instanceof BooleanValue)) {
+        if(!(o instanceof Value)) {
+            return false;
+        }
+        Value v = (Value) o;
+        if(!v.isBoolean()) {
             return false;
         }
 
-        return ((BooleanValue) o).getBoolean() == true;
+        return v.asBooleanValue().getBoolean() == true;
     }
 
     public int hashCode() {
diff --git a/src/main/java/org/msgpack/unpacker/BufferUnpacker.java b/src/main/java/org/msgpack/unpacker/BufferUnpacker.java
@@ -41,5 +41,7 @@ public interface BufferUnpacker extends Unpacker {
     public BufferUnpacker feed(ByteBuffer b);
 
     public BufferUnpacker feed(ByteBuffer buf, boolean nocopy);
+
+    public void reset();
 }
 
diff --git a/src/main/java/org/msgpack/unpacker/Converter.java b/src/main/java/org/msgpack/unpacker/Converter.java
@@ -384,5 +384,10 @@ public void skip() {
             }
         }
     }
+
+    public void reset() {
+        stack.reset();
+        value = null;
+    }
 }
 
diff --git a/src/main/java/org/msgpack/unpacker/MessagePackUnpacker.java b/src/main/java/org/msgpack/unpacker/MessagePackUnpacker.java
@@ -554,6 +554,11 @@ public void skip() throws IOException {
         }
     }
 
+    public void reset() {
+        raw = null;
+        stack.reset();
+    }
+
     public void close() throws IOException {
         in.close();
     }
diff --git a/src/main/java/org/msgpack/unpacker/UnpackerStack.java b/src/main/java/org/msgpack/unpacker/UnpackerStack.java
@@ -90,5 +90,9 @@ public boolean topIsArray() {
     public boolean topIsMap() {
         return types[top] == TYPE_MAP;
     }
+
+    public void reset() {
+        top = 0;
+    }
 }
 
diff --git a/src/test/java/org/msgpack/type/ProxyValue.java b/src/test/java/org/msgpack/type/ProxyValue.java
@@ -0,0 +1,92 @@
+package org.msgpack.type;
+
+import java.io.IOException;
+
+import org.msgpack.packer.Packer;
+
+public abstract class ProxyValue implements Value {
+    public ProxyValue() { }
+
+    protected abstract Value getValue();
+
+    public ValueType getType() {
+        return getValue().getType();
+    }
+
+    public boolean isNil() {
+        return getValue().isNil();
+    }
+
+    public boolean isBoolean() {
+        return getValue().isBoolean();
+    }
+
+    public boolean isInteger() {
+        return getValue().isInteger();
+    }
+
+    public boolean isFloat() {
+        return getValue().isFloat();
+    }
+
+    public boolean isArray() {
+        return getValue().isArray();
+    }
+
+    public boolean isMap() {
+        return getValue().isMap();
+    }
+
+    public boolean isRaw() {
+        return getValue().isRaw();
+    }
+
+    public NilValue asNilValue() {
+        return getValue().asNilValue();
+    }
+
+    public BooleanValue asBooleanValue() {
+        return getValue().asBooleanValue();
+    }
+
+    public IntegerValue asIntegerValue() {
+        return getValue().asIntegerValue();
+    }
+
+    public FloatValue asFloatValue() {
+        return getValue().asFloatValue();
+    }
+
+    public ArrayValue asArrayValue() {
+        return getValue().asArrayValue();
+    }
+
+    public MapValue asMapValue() {
+        return getValue().asMapValue();
+    }
+
+    public RawValue asRawValue() {
+        return getValue().asRawValue();
+    }
+
+    public void writeTo(Packer pk) throws IOException {
+        getValue().writeTo(pk);
+    }
+
+    public StringBuilder toString(StringBuilder sb) {
+        return getValue().toString(sb);
+    }
+
+    public String toString() {
+        return getValue().toString();
+    }
+
+    public int hashCode() {
+        return getValue().hashCode();
+    }
+
+    public boolean equals(Object o) {
+        return getValue().equals(o);
+    }
+}
+
diff --git a/src/test/java/org/msgpack/type/TestEquals.java b/src/test/java/org/msgpack/type/TestEquals.java
diff --git a/src/test/java/org/msgpack/type/TestHashCode.java b/src/test/java/org/msgpack/type/TestHashCode.java

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public static AnyTemplate getInstance(TemplateRegistry registry) {`
`37`	`37`	`private TemplateRegistry registry;`
`38`	`38`
`39`	`39`	`private AnyTemplate(TemplateRegistry registry) {`
`40`		`-`
	`40`	`+ this.registry = registry;`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`public void write(Packer pk, T target, boolean required) throws IOException {`
Original file line number	Diff line number	Diff line change
`@@ -36,11 +36,15 @@ public boolean equals(Object o) {`
`36`	`36`	`if(this == o) {`
`37`	`37`	`return true;`
`38`	`38`	`}`
`39`		`- if(!(o instanceof RawValue)) {`
	`39`	`+ if(!(o instanceof Value)) {`
	`40`	`+ return false;`
	`41`	`+ }`
	`42`	`+ Value v = (Value) o;`
	`43`	`+ if(!v.isRaw()) {`
`40`	`44`	`return false;`
`41`	`45`	`}`
`42`	`46`
`43`		`- return Arrays.equals(getByteArray(), ((RawValue) o).getByteArray());`
	`47`	`+ return Arrays.equals(getByteArray(), v.asRawValue().getByteArray());`
`44`	`48`	`}`
`45`	`49`
`46`	`50`	`public int hashCode() {`
Original file line number	Diff line number	Diff line change
`@@ -109,11 +109,15 @@ public boolean equals(Object o) {`
`109`	`109`	`if(o == this) {`
`110`	`110`	`return true;`
`111`	`111`	`}`
`112`		`- if(!(o instanceof IntegerValue)) {`
	`112`	`+ if(!(o instanceof Value)) {`
	`113`	`+ return false;`
	`114`	`+ }`
	`115`	`+ Value v = (Value) o;`
	`116`	`+ if(!v.isInteger()) {`
`113`	`117`	`return false;`
`114`	`118`	`}`
`115`	`119`
`116`		`- return value.equals(((IntegerValue) o).bigIntegerValue());`
	`120`	`+ return value.equals(v.asIntegerValue().bigIntegerValue());`
`117`	`121`	`}`
`118`	`122`
`119`	`123`	`public int hashCode() {`
Original file line number	Diff line number	Diff line change
`@@ -68,11 +68,15 @@ public boolean equals(Object o) {`
`68`	`68`	`if(this == o) {`
`69`	`69`	`return true;`
`70`	`70`	`}`
`71`		`- if(!(o instanceof RawValue)) {`
	`71`	`+ if(!(o instanceof Value)) {`
	`72`	`+ return false;`
	`73`	`+ }`
	`74`	`+ Value v = (Value) o;`
	`75`	`+ if(!v.isRaw()) {`
`72`	`76`	`return false;`
`73`	`77`	`}`
`74`	`78`
`75`		`- return Arrays.equals(bytes, ((RawValue) o).getByteArray());`
	`79`	`+ return Arrays.equals(bytes, v.asRawValue().getByteArray());`
`76`	`80`	`}`
`77`	`81`
`78`	`82`	`public int hashCode() {`
Original file line number	Diff line number	Diff line change
`@@ -74,11 +74,15 @@ public boolean equals(Object o) {`
`74`	`74`	`if(o == this) {`
`75`	`75`	`return true;`
`76`	`76`	`}`
`77`		`- if(!(o instanceof FloatValue)) {`
	`77`	`+ if(!(o instanceof Value)) {`
	`78`	`+ return false;`
	`79`	`+ }`
	`80`	`+ Value v = (Value) o;`
	`81`	`+ if(!v.isFloat()) {`
`78`	`82`	`return false;`
`79`	`83`	`}`
`80`	`84`
`81`		`- return value == ((FloatValue) o).getDouble();`
	`85`	`+ return value == v.asFloatValue().getDouble();`
`82`	`86`	`}`
`83`	`87`
`84`	`88`	`// TODO compareTo`
Original file line number	Diff line number	Diff line change
`@@ -41,11 +41,15 @@ public boolean equals(Object o) {`
`41`	`41`	`if(o == this) {`
`42`	`42`	`return true;`
`43`	`43`	`}`
`44`		`- if(!(o instanceof BooleanValue)) {`
	`44`	`+ if(!(o instanceof Value)) {`
	`45`	`+ return false;`
	`46`	`+ }`
	`47`	`+ Value v = (Value) o;`
	`48`	`+ if(!v.isBoolean()) {`
`45`	`49`	`return false;`
`46`	`50`	`}`
`47`	`51`
`48`		`- return ((BooleanValue) o).getBoolean() == false;`
	`52`	`+ return v.asBooleanValue().getBoolean() == false;`
`49`	`53`	`}`
`50`	`54`
`51`	`55`	`public int hashCode() {`
Original file line number	Diff line number	Diff line change
`@@ -70,11 +70,15 @@ public boolean equals(Object o) {`
`70`	`70`	`if(o == this) {`
`71`	`71`	`return true;`
`72`	`72`	`}`
`73`		`- if(!(o instanceof FloatValue)) {`
	`73`	`+ if(!(o instanceof Value)) {`
	`74`	`+ return false;`
	`75`	`+ }`
	`76`	`+ Value v = (Value) o;`
	`77`	`+ if(!v.isFloat()) {`
`74`	`78`	`return false;`
`75`	`79`	`}`
`76`	`80`
`77`		`- return (double)value == ((FloatValue) o).getDouble();`
	`81`	`+ return (double)value == v.asFloatValue().getDouble();`
`78`	`82`	`}`
`79`	`83`
`80`	`84`	`public void writeTo(Packer pk) throws IOException {`
Original file line number	Diff line number	Diff line change
`@@ -99,13 +99,17 @@ public boolean equals(Object o) {`
`99`	`99`	`if(o == this) {`
`100`	`100`	`return true;`
`101`	`101`	`}`
`102`		`- if(!(o instanceof IntegerValue)) {`
	`102`	`+ if(!(o instanceof Value)) {`
	`103`	`+ return false;`
	`104`	`+ }`
	`105`	`+ Value v = (Value) o;`
	`106`	`+ if(!v.isInteger()) {`
`103`	`107`	`return false;`
`104`	`108`	`}`
`105`	`109`
`106`	`110`	`try {`
`107`	`111`	`// TODO`
`108`		`- return value == ((IntegerValue) o).getInt();`
	`112`	`+ return value == v.asIntegerValue().getInt();`
`109`	`113`	`} catch (MessageTypeException ex) {`
`110`	`114`	`return false;`
`111`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -104,13 +104,17 @@ public boolean equals(Object o) {`
`104`	`104`	`if(o == this) {`
`105`	`105`	`return true;`
`106`	`106`	`}`
`107`		`- if(!(o instanceof IntegerValue)) {`
	`107`	`+ if(!(o instanceof Value)) {`
	`108`	`+ return false;`
	`109`	`+ }`
	`110`	`+ Value v = (Value) o;`
	`111`	`+ if(!v.isInteger()) {`
`108`	`112`	`return false;`
`109`	`113`	`}`
`110`	`114`
`111`	`115`	`try {`
`112`	`116`	`// TODO`
`113`		`- return value == ((IntegerValue) o).getLong();`
	`117`	`+ return value == v.asIntegerValue().getLong();`
`114`	`118`	`} catch (MessageTypeException ex) {`
`115`	`119`	`return false;`
`116`	`120`	`}`