immutableValue() -> toImmutable()

xerial · xerial · commit b1230894c0cc · 2015-06-13T23:06:06.000+09:00
diff --git a/msgpack-core/src/main/java/org/msgpack/value/ArrayValue.java b/msgpack-core/src/main/java/org/msgpack/value/ArrayValue.java
@@ -25,7 +25,7 @@
  */
 public interface ArrayValue extends Value, Iterable<Value> {
     @Override
-    public ImmutableArrayValue immutableValue();
+    public ImmutableArrayValue toImmutable();
 
     /**
      * Returns number of elements in this array.
diff --git a/msgpack-core/src/main/java/org/msgpack/value/BinaryValue.java b/msgpack-core/src/main/java/org/msgpack/value/BinaryValue.java
@@ -24,5 +24,5 @@
  */
 public interface BinaryValue extends RawValue {
     @Override
-    public ImmutableBinaryValue immutableValue();
+    public ImmutableBinaryValue toImmutable();
 }
diff --git a/msgpack-core/src/main/java/org/msgpack/value/BooleanValue.java b/msgpack-core/src/main/java/org/msgpack/value/BooleanValue.java
@@ -22,7 +22,7 @@
  */
 public interface BooleanValue extends Value {
     @Override
-    public ImmutableBooleanValue immutableValue();
+    public ImmutableBooleanValue toImmutable();
 
     /**
      * Returns the value as a {@code boolean}.
diff --git a/msgpack-core/src/main/java/org/msgpack/value/ExtensionValue.java b/msgpack-core/src/main/java/org/msgpack/value/ExtensionValue.java
@@ -25,7 +25,7 @@
  */
 public interface ExtensionValue extends Value {
     @Override
-    public ImmutableExtensionValue immutableValue();
+    public ImmutableExtensionValue toImmutable();
 
     public byte getType();
 
diff --git a/msgpack-core/src/main/java/org/msgpack/value/FloatValue.java b/msgpack-core/src/main/java/org/msgpack/value/FloatValue.java
@@ -24,5 +24,5 @@
  */
 public interface FloatValue extends NumberValue {
     @Override
-    public ImmutableFloatValue immutableValue();
+    public ImmutableFloatValue toImmutable();
 }
diff --git a/msgpack-core/src/main/java/org/msgpack/value/IntegerValue.java b/msgpack-core/src/main/java/org/msgpack/value/IntegerValue.java
@@ -24,7 +24,7 @@
  */
 public interface IntegerValue extends NumberValue {
     @Override
-    public ImmutableIntegerValue immutableValue();
+    public ImmutableIntegerValue toImmutable();
 
     /**
      * Returns true if the value is in the range of [-2<sup>7</sup> to 2<sup>7</sup>-1].
diff --git a/msgpack-core/src/main/java/org/msgpack/value/MapValue.java b/msgpack-core/src/main/java/org/msgpack/value/MapValue.java
@@ -26,7 +26,7 @@
  */
 public interface MapValue extends Value {
     @Override
-    public ImmutableMapValue immutableValue();
+    public ImmutableMapValue toImmutable();
 
     /**
      * Returns number of key-value pairs in this array.
diff --git a/msgpack-core/src/main/java/org/msgpack/value/NilValue.java b/msgpack-core/src/main/java/org/msgpack/value/NilValue.java
@@ -20,5 +20,5 @@
  */
 public interface NilValue extends Value {
     @Override
-    public ImmutableNilValue immutableValue();
+    public ImmutableNilValue toImmutable();
 }
diff --git a/msgpack-core/src/main/java/org/msgpack/value/NumberValue.java b/msgpack-core/src/main/java/org/msgpack/value/NumberValue.java
@@ -25,7 +25,7 @@
  */
 public interface NumberValue extends Value {
     @Override
-    public ImmutableNumberValue immutableValue();
+    public ImmutableNumberValue toImmutable();
 
     /**
      * Returns the value as a {@code byte}, which may involve rounding or truncation.
diff --git a/msgpack-core/src/main/java/org/msgpack/value/RawValue.java b/msgpack-core/src/main/java/org/msgpack/value/RawValue.java
@@ -27,7 +27,7 @@
  */
 public interface RawValue extends Value {
     @Override
-    public ImmutableRawValue immutableValue();
+    public ImmutableRawValue toImmutable();
 
     /**
      * Returns the value as {@code byte[]}.
diff --git a/msgpack-core/src/main/java/org/msgpack/value/StringValue.java b/msgpack-core/src/main/java/org/msgpack/value/StringValue.java
@@ -26,5 +26,5 @@
  */
 public interface StringValue extends RawValue {
     @Override
-    public ImmutableStringValue immutableValue();
+    public ImmutableStringValue toImmutable();
 }
diff --git a/msgpack-core/src/main/java/org/msgpack/value/Variable.java b/msgpack-core/src/main/java/org/msgpack/value/Variable.java
@@ -231,7 +231,7 @@ public NilValue asNilValue() {
         }
 
         @Override
-        public ImmutableNilValue immutableValue() {
+        public ImmutableNilValue toImmutable() {
             return ValueFactory.nil();
         }
 
@@ -265,7 +265,7 @@ public BooleanValue asBooleanValue() {
         }
 
         @Override
-        public ImmutableBooleanValue immutableValue() {
+        public ImmutableBooleanValue toImmutable() {
             return ValueFactory.newBoolean(getBoolean());
         }
 
@@ -403,7 +403,7 @@ public IntegerValue asIntegerValue() {
         }
 
         @Override
-        public ImmutableIntegerValue immutableValue() {
+        public ImmutableIntegerValue toImmutable() {
             if (type == Type.BIG_INTEGER) {
                 return ValueFactory.newInteger((BigInteger) objectValue);
             }
@@ -513,7 +513,7 @@ public FloatValue asFloatValue() {
         }
 
         @Override
-        public ImmutableFloatValue immutableValue() {
+        public ImmutableFloatValue toImmutable() {
             return ValueFactory.newFloat(doubleValue);
         }
 
@@ -601,7 +601,7 @@ public BinaryValue asBinaryValue() {
         }
 
         @Override
-        public ImmutableBinaryValue immutableValue() {
+        public ImmutableBinaryValue toImmutable() {
             return ValueFactory.newBinary(getByteArray());
         }
 
@@ -641,7 +641,7 @@ public StringValue asStringValue() {
         }
 
         @Override
-        public ImmutableStringValue immutableValue() {
+        public ImmutableStringValue toImmutable() {
             return ValueFactory.newString((byte[]) objectValue);
         }
 
@@ -677,7 +677,7 @@ public ArrayValue asArrayValue() {
         }
 
         @Override
-        public ImmutableArrayValue immutableValue() {
+        public ImmutableArrayValue toImmutable() {
             return ValueFactory.newArray(list());
         }
 
@@ -744,7 +744,7 @@ public MapValue asMapValue() {
         }
 
         @Override
-        public ImmutableMapValue immutableValue() {
+        public ImmutableMapValue toImmutable() {
             return ValueFactory.newMap(map());
         }
 
@@ -798,13 +798,17 @@ public void writeTo(MessagePacker pk) throws IOException {
                 pair.getValue().writeTo(pk);
             }
         }
+
+        @Override
+        public void accept(ValueVisitor visitor) {
+            visitor.visitMap(this);
+        }
     }
 
 
     ////
     // ExtensionValue
     //
-
     public Variable setExtensionValue(byte type, byte[] data) {
         this.type = Type.EXTENSION;
         this.accessor = extensionAccessor;
@@ -824,7 +828,7 @@ public ExtensionValue asExtensionValue() {
         }
 
         @Override
-        public ImmutableExtensionValue immutableValue() {
+        public ImmutableExtensionValue toImmutable() {
             return (ImmutableExtensionValue) objectValue;
         }
 
@@ -850,28 +854,33 @@ public void writeTo(MessagePacker pk) throws IOException {
     //
 
     @Override
-    public ImmutableValue immutableValue() {
-        return accessor.immutableValue();
+    public ImmutableValue toImmutable() {
+        return accessor.toImmutable();
     }
 
     @Override
     public void writeTo(MessagePacker pk) throws IOException {
         accessor.writeTo(pk);
     }
 
+    @Override
+    public void accept(ValueVisitor visitor) {
+        accessor.accept(visitor);
+    }
+
     @Override
     public int hashCode() {
-        return immutableValue().hashCode();  // TODO optimize
+        return toImmutable().hashCode();  // TODO optimize
     }
 
     @Override
     public boolean equals(Object o) {
-        return immutableValue().equals(o);  // TODO optimize
+        return toImmutable().equals(o);  // TODO optimize
     }
 
     @Override
     public String toString() {
-        return immutableValue().toString();  // TODO optimize
+        return toImmutable().toString();  // TODO optimize
     }
 
     @Override
diff --git a/msgpack-core/src/main/java/org/msgpack/value/impl/ImmutableArrayValueImpl.java b/msgpack-core/src/main/java/org/msgpack/value/impl/ImmutableArrayValueImpl.java
@@ -16,10 +16,7 @@
 package org.msgpack.value.impl;
 
 import org.msgpack.core.MessagePacker;
-import org.msgpack.value.Value;
-import org.msgpack.value.ValueType;
-import org.msgpack.value.ArrayValue;
-import org.msgpack.value.ImmutableArrayValue;
+import org.msgpack.value.*;
 
 import java.util.List;
 import java.util.AbstractList;
@@ -53,7 +50,7 @@ public ValueType getValueType() {
     }
 
     @Override
-    public ImmutableArrayValue immutableValue() {
+    public ImmutableArrayValue toImmutable() {
         return this;
     }
 
diff --git a/msgpack-core/src/main/java/org/msgpack/value/impl/ImmutableBigIntegerValueImpl.java b/msgpack-core/src/main/java/org/msgpack/value/impl/ImmutableBigIntegerValueImpl.java
@@ -17,11 +17,7 @@
 
 import org.msgpack.core.MessagePacker;
 import org.msgpack.core.MessageIntegerOverflowException;
-import org.msgpack.value.Value;
-import org.msgpack.value.ValueType;
-import org.msgpack.value.IntegerValue;
-import org.msgpack.value.ImmutableNumberValue;
-import org.msgpack.value.ImmutableIntegerValue;
+import org.msgpack.value.*;
 
 import java.io.IOException;
 import java.math.BigInteger;
@@ -54,7 +50,7 @@ public ValueType getValueType() {
     }
 
     @Override
-    public ImmutableIntegerValue immutableValue() {
+    public ImmutableIntegerValue toImmutable() {
         return this;
     }
 
diff --git a/msgpack-core/src/main/java/org/msgpack/value/impl/ImmutableBinaryValueImpl.java b/msgpack-core/src/main/java/org/msgpack/value/impl/ImmutableBinaryValueImpl.java
@@ -19,6 +19,7 @@
 import org.msgpack.value.Value;
 import org.msgpack.value.ValueType;
 import org.msgpack.value.ImmutableBinaryValue;
+import org.msgpack.value.ValueVisitor;
 
 import java.util.Arrays;
 import java.io.IOException;
@@ -41,7 +42,7 @@ public ValueType getValueType() {
     }
 
     @Override
-    public ImmutableBinaryValue immutableValue() {
+    public ImmutableBinaryValue toImmutable() {
         return this;
     }
 
diff --git a/msgpack-core/src/main/java/org/msgpack/value/impl/ImmutableBooleanValueImpl.java b/msgpack-core/src/main/java/org/msgpack/value/impl/ImmutableBooleanValueImpl.java
@@ -16,10 +16,7 @@
 package org.msgpack.value.impl;
 
 import org.msgpack.core.MessagePacker;
-import org.msgpack.value.Value;
-import org.msgpack.value.ValueType;
-import org.msgpack.value.BooleanValue;
-import org.msgpack.value.ImmutableBooleanValue;
+import org.msgpack.value.*;
 
 import java.io.IOException;
 
@@ -47,7 +44,7 @@ public ValueType getValueType() {
     }
 
     @Override
-    public ImmutableBooleanValue immutableValue() {
+    public ImmutableBooleanValue toImmutable() {
         return this;
     }
 
diff --git a/msgpack-core/src/main/java/org/msgpack/value/impl/ImmutableDoubleValueImpl.java b/msgpack-core/src/main/java/org/msgpack/value/impl/ImmutableDoubleValueImpl.java
@@ -16,10 +16,7 @@
 package org.msgpack.value.impl;
 
 import org.msgpack.core.MessagePacker;
-import org.msgpack.value.Value;
-import org.msgpack.value.ValueType;
-import org.msgpack.value.FloatValue;
-import org.msgpack.value.ImmutableFloatValue;
+import org.msgpack.value.*;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -44,7 +41,7 @@ public ValueType getValueType() {
     }
 
     @Override
-    public ImmutableDoubleValueImpl immutableValue() {
+    public ImmutableDoubleValueImpl toImmutable() {
         return this;
     }
 
diff --git a/msgpack-core/src/main/java/org/msgpack/value/impl/ImmutableExtensionValueImpl.java b/msgpack-core/src/main/java/org/msgpack/value/impl/ImmutableExtensionValueImpl.java
@@ -16,10 +16,7 @@
 package org.msgpack.value.impl;
 
 import org.msgpack.core.MessagePacker;
-import org.msgpack.value.Value;
-import org.msgpack.value.ValueType;
-import org.msgpack.value.ExtensionValue;
-import org.msgpack.value.ImmutableExtensionValue;
+import org.msgpack.value.*;
 
 import java.util.Arrays;
 import java.io.IOException;
@@ -45,7 +42,7 @@ public ValueType getValueType() {
     }
 
     @Override
-    public ImmutableExtensionValue immutableValue() {
+    public ImmutableExtensionValue toImmutable() {
         return this;
     }
 
diff --git a/msgpack-core/src/main/java/org/msgpack/value/impl/ImmutableLongValueImpl.java b/msgpack-core/src/main/java/org/msgpack/value/impl/ImmutableLongValueImpl.java
@@ -17,11 +17,7 @@
 
 import org.msgpack.core.MessagePacker;
 import org.msgpack.core.MessageIntegerOverflowException;
-import org.msgpack.value.ValueType;
-import org.msgpack.value.Value;
-import org.msgpack.value.IntegerValue;
-import org.msgpack.value.ImmutableIntegerValue;
-import org.msgpack.value.ImmutableNumberValue;
+import org.msgpack.value.*;
 
 import java.io.IOException;
 import java.math.BigInteger;
@@ -52,7 +48,7 @@ public ValueType getValueType() {
     }
 
     @Override
-    public ImmutableIntegerValue immutableValue() {
+    public ImmutableIntegerValue toImmutable() {
         return this;
     }
 
diff --git a/msgpack-core/src/main/java/org/msgpack/value/impl/ImmutableMapValueImpl.java b/msgpack-core/src/main/java/org/msgpack/value/impl/ImmutableMapValueImpl.java
@@ -16,10 +16,7 @@
 package org.msgpack.value.impl;
 
 import org.msgpack.core.MessagePacker;
-import org.msgpack.value.Value;
-import org.msgpack.value.ValueType;
-import org.msgpack.value.MapValue;
-import org.msgpack.value.ImmutableMapValue;
+import org.msgpack.value.*;
 
 import java.io.IOException;
 import java.util.Map;
@@ -57,7 +54,7 @@ public ValueType getValueType() {
     }
 
     @Override
-    public ImmutableMapValue immutableValue() {
+    public ImmutableMapValue toImmutable() {
         return this;
     }
 
diff --git a/msgpack-core/src/main/java/org/msgpack/value/impl/ImmutableNilValueImpl.java b/msgpack-core/src/main/java/org/msgpack/value/impl/ImmutableNilValueImpl.java
diff --git a/msgpack-core/src/main/java/org/msgpack/value/impl/ImmutableStringValueImpl.java b/msgpack-core/src/main/java/org/msgpack/value/impl/ImmutableStringValueImpl.java
diff --git a/msgpack-core/src/test/scala/org/msgpack/core/MessagePackTest.scala b/msgpack-core/src/test/scala/org/msgpack/core/MessagePackTest.scala

Original file line number	Diff line number	Diff line change
`@@ -24,5 +24,5 @@`
`24`	`24`	`*/`
`25`	`25`	`public interface BinaryValue extends RawValue {`
`26`	`26`	`@Override`
`27`		`- public ImmutableBinaryValue immutableValue();`
	`27`	`+ public ImmutableBinaryValue toImmutable();`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,5 +20,5 @@`
`20`	`20`	`*/`
`21`	`21`	`public interface NilValue extends Value {`
`22`	`22`	`@Override`
`23`		`- public ImmutableNilValue immutableValue();`
	`23`	`+ public ImmutableNilValue toImmutable();`
`24`	`24`	`}`