RawStringValueImpl#equals and #hashcode use the same logics with StringValueImpl

komamitsu · komamitsu · commit e4e9e344ec46 · 2015-01-03T20:15:31.000+09:00
diff --git a/msgpack-core/src/main/java/org/msgpack/value/impl/RawStringValueImpl.java b/msgpack-core/src/main/java/org/msgpack/value/impl/RawStringValueImpl.java
@@ -1,6 +1,7 @@
 package org.msgpack.value.impl;
 
 import org.msgpack.core.MessagePacker;
+import org.msgpack.core.MessageStringCodingException;
 import org.msgpack.value.ValueType;
 import org.msgpack.value.*;
 
@@ -54,12 +55,16 @@ public boolean equals(Object o) {
         if (!v.isString()) {
             return false;
         }
-        StringValue sv = v.asString();
-        return sv.toByteBuffer().equals(byteBuffer);
+        try {
+            return toString().equals(v.asString().toString());
+        } catch (MessageStringCodingException ex) {
+            return false;
+        }
+
     }
 
     @Override
     public int hashCode() {
-        return byteBuffer.hashCode();
+        return toString().hashCode();
     }
 }
diff --git a/msgpack-core/src/test/scala/org/msgpack/value/ValueFactoryTest.scala b/msgpack-core/src/test/scala/org/msgpack/value/ValueFactoryTest.scala
@@ -50,4 +50,17 @@ class ValueFactoryTest extends MessagePackSpec {
     }
 
   }
+
+  "StringValue" should {
+    "return the same hash code if they are equal" in {
+      val str = "a"
+      val a1 = ValueFactory.newRawString(str.getBytes("UTF-8"))
+      val a2 = ValueFactory.newString(str)
+
+      a1.shouldEqual(a2)
+      a1.hashCode.shouldEqual(a2.hashCode)
+      a2.shouldEqual(a1)
+      a2.hashCode.shouldEqual(a1.hashCode)
+    }
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package org.msgpack.value.impl;`
`2`	`2`
`3`	`3`	`import org.msgpack.core.MessagePacker;`
	`4`	`+import org.msgpack.core.MessageStringCodingException;`
`4`	`5`	`import org.msgpack.value.ValueType;`
`5`	`6`	`import org.msgpack.value.*;`
`6`	`7`
`@@ -54,12 +55,16 @@ public boolean equals(Object o) {`
`54`	`55`	`if (!v.isString()) {`
`55`	`56`	`return false;`
`56`	`57`	`}`
`57`		`- StringValue sv = v.asString();`
`58`		`- return sv.toByteBuffer().equals(byteBuffer);`
	`58`	`+ try {`
	`59`	`+ return toString().equals(v.asString().toString());`
	`60`	`+ } catch (MessageStringCodingException ex) {`
	`61`	`+ return false;`
	`62`	`+ }`
	`63`	`+`
`59`	`64`	`}`
`60`	`65`
`61`	`66`	`@Override`
`62`	`67`	`public int hashCode() {`
`63`		`- return byteBuffer.hashCode();`
	`68`	`+ return toString().hashCode();`
`64`	`69`	`}`
`65`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,4 +50,17 @@ class ValueFactoryTest extends MessagePackSpec {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`}`
	`53`	`+`
	`54`	`+ "StringValue" should {`
	`55`	`+ "return the same hash code if they are equal" in {`
	`56`	`+ val str = "a"`
	`57`	`+ val a1 = ValueFactory.newRawString(str.getBytes("UTF-8"))`
	`58`	`+ val a2 = ValueFactory.newString(str)`
	`59`	`+`
	`60`	`+ a1.shouldEqual(a2)`
	`61`	`+ a1.hashCode.shouldEqual(a2.hashCode)`
	`62`	`+ a2.shouldEqual(a1)`
	`63`	`+ a2.hashCode.shouldEqual(a1.hashCode)`
	`64`	`+ }`
	`65`	`+ }`
`53`	`66`	`}`