toImmutable -> immutableValue

xerial · xerial · commit c78245174b2e · 2015-06-15T12:02:11.000+09:00
diff --git a/msgpack-core/src/main/java/org/msgpack/value/Value.java b/msgpack-core/src/main/java/org/msgpack/value/Value.java
@@ -37,7 +37,7 @@ public interface Value {
      * <p/>
      * This method simply returns <code>this</code> without copying the value if this value is already immutable.
      */
-    ImmutableValue toImmutable();
+    ImmutableValue immutableValue();
 
     /**
      * Returns true if type of this value is Nil.
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 toImmutable() {
+        public ImmutableNilValue immutableValue() {
             return ValueFactory.nil();
         }
 
@@ -270,7 +270,7 @@ public BooleanValue asBooleanValue() {
         }
 
         @Override
-        public ImmutableBooleanValue toImmutable() {
+        public ImmutableBooleanValue immutableValue() {
             return ValueFactory.newBoolean(getBoolean());
         }
 
@@ -413,7 +413,7 @@ public IntegerValue asIntegerValue() {
         }
 
         @Override
-        public ImmutableIntegerValue toImmutable() {
+        public ImmutableIntegerValue immutableValue() {
             if (type == Type.BIG_INTEGER) {
                 return ValueFactory.newInteger((BigInteger) objectValue);
             }
@@ -535,7 +535,7 @@ public FloatValue asFloatValue() {
         }
 
         @Override
-        public ImmutableFloatValue toImmutable() {
+        public ImmutableFloatValue immutableValue() {
             return ValueFactory.newFloat(doubleValue);
         }
 
@@ -628,7 +628,7 @@ public BinaryValue asBinaryValue() {
         }
 
         @Override
-        public ImmutableBinaryValue toImmutable() {
+        public ImmutableBinaryValue immutableValue() {
             return ValueFactory.newBinary(getByteArray());
         }
 
@@ -673,7 +673,7 @@ public StringValue asStringValue() {
         }
 
         @Override
-        public ImmutableStringValue toImmutable() {
+        public ImmutableStringValue immutableValue() {
             return ValueFactory.newString((byte[]) objectValue);
         }
 
@@ -714,7 +714,7 @@ public ArrayValue asArrayValue() {
         }
 
         @Override
-        public ImmutableArrayValue toImmutable() {
+        public ImmutableArrayValue immutableValue() {
             return ValueFactory.newArray(list());
         }
 
@@ -786,7 +786,7 @@ public MapValue asMapValue() {
         }
 
         @Override
-        public ImmutableMapValue toImmutable() {
+        public ImmutableMapValue immutableValue() {
             return ValueFactory.newMap(map());
         }
 
@@ -870,7 +870,7 @@ public ExtensionValue asExtensionValue() {
         }
 
         @Override
-        public ImmutableExtensionValue toImmutable() {
+        public ImmutableExtensionValue immutableValue() {
             return (ImmutableExtensionValue) objectValue;
         }
 
@@ -901,8 +901,8 @@ public void accept(ValueVisitor visitor) {
     //
 
     @Override
-    public ImmutableValue toImmutable() {
-        return accessor.toImmutable();
+    public ImmutableValue immutableValue() {
+        return accessor.immutableValue();
     }
 
     @Override
@@ -917,17 +917,17 @@ public void accept(ValueVisitor visitor) {
 
     @Override
     public int hashCode() {
-        return toImmutable().hashCode();  // TODO optimize
+        return immutableValue().hashCode();  // TODO optimize
     }
 
     @Override
     public boolean equals(Object o) {
-        return toImmutable().equals(o);  // TODO optimize
+        return immutableValue().equals(o);  // TODO optimize
     }
 
     @Override
     public String toString() {
-        return toImmutable().toString();  // TODO optimize
+        return immutableValue().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
@@ -50,7 +50,7 @@ public ValueType getValueType() {
     }
 
     @Override
-    public ImmutableArrayValue toImmutable() {
+    public ImmutableArrayValue immutableValue() {
         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
@@ -50,7 +50,7 @@ public ValueType getValueType() {
     }
 
     @Override
-    public ImmutableIntegerValue toImmutable() {
+    public ImmutableIntegerValue immutableValue() {
         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
@@ -42,7 +42,7 @@ public ValueType getValueType() {
     }
 
     @Override
-    public ImmutableBinaryValue toImmutable() {
+    public ImmutableBinaryValue immutableValue() {
         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
@@ -44,7 +44,7 @@ public ValueType getValueType() {
     }
 
     @Override
-    public ImmutableBooleanValue toImmutable() {
+    public ImmutableBooleanValue immutableValue() {
         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
@@ -41,7 +41,7 @@ public ValueType getValueType() {
     }
 
     @Override
-    public ImmutableDoubleValueImpl toImmutable() {
+    public ImmutableDoubleValueImpl immutableValue() {
         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
@@ -42,7 +42,7 @@ public ValueType getValueType() {
     }
 
     @Override
-    public ImmutableExtensionValue toImmutable() {
+    public ImmutableExtensionValue immutableValue() {
         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
@@ -48,7 +48,7 @@ public ValueType getValueType() {
     }
 
     @Override
-    public ImmutableIntegerValue toImmutable() {
+    public ImmutableIntegerValue immutableValue() {
         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
@@ -54,7 +54,7 @@ public ValueType getValueType() {
     }
 
     @Override
-    public ImmutableMapValue toImmutable() {
+    public ImmutableMapValue immutableValue() {
         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
@@ -46,7 +46,7 @@ public ValueType getValueType() {
     }
 
     @Override
-    public ImmutableNilValue toImmutable() {
+    public ImmutableNilValue immutableValue() {
         return this;
     }
 
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
@@ -46,7 +46,7 @@ public ValueType getValueType() {
     }
 
     @Override
-    public ImmutableStringValue toImmutable() {
+    public ImmutableStringValue immutableValue() {
         return this;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,7 @@ public NilValue asNilValue() {`
`231`	`231`	`}`
`232`	`232`
`233`	`233`	`@Override`
`234`		`- public ImmutableNilValue toImmutable() {`
	`234`	`+ public ImmutableNilValue immutableValue() {`
`235`	`235`	`return ValueFactory.nil();`
`236`	`236`	`}`
`237`	`237`
`@@ -270,7 +270,7 @@ public BooleanValue asBooleanValue() {`
`270`	`270`	`}`
`271`	`271`
`272`	`272`	`@Override`
`273`		`- public ImmutableBooleanValue toImmutable() {`
	`273`	`+ public ImmutableBooleanValue immutableValue() {`
`274`	`274`	`return ValueFactory.newBoolean(getBoolean());`
`275`	`275`	`}`
`276`	`276`
`@@ -413,7 +413,7 @@ public IntegerValue asIntegerValue() {`
`413`	`413`	`}`
`414`	`414`
`415`	`415`	`@Override`
`416`		`- public ImmutableIntegerValue toImmutable() {`
	`416`	`+ public ImmutableIntegerValue immutableValue() {`
`417`	`417`	`if (type == Type.BIG_INTEGER) {`
`418`	`418`	`return ValueFactory.newInteger((BigInteger) objectValue);`
`419`	`419`	`}`
`@@ -535,7 +535,7 @@ public FloatValue asFloatValue() {`
`535`	`535`	`}`
`536`	`536`
`537`	`537`	`@Override`
`538`		`- public ImmutableFloatValue toImmutable() {`
	`538`	`+ public ImmutableFloatValue immutableValue() {`
`539`	`539`	`return ValueFactory.newFloat(doubleValue);`
`540`	`540`	`}`
`541`	`541`
`@@ -628,7 +628,7 @@ public BinaryValue asBinaryValue() {`
`628`	`628`	`}`
`629`	`629`
`630`	`630`	`@Override`
`631`		`- public ImmutableBinaryValue toImmutable() {`
	`631`	`+ public ImmutableBinaryValue immutableValue() {`
`632`	`632`	`return ValueFactory.newBinary(getByteArray());`
`633`	`633`	`}`
`634`	`634`
`@@ -673,7 +673,7 @@ public StringValue asStringValue() {`
`673`	`673`	`}`
`674`	`674`
`675`	`675`	`@Override`
`676`		`- public ImmutableStringValue toImmutable() {`
	`676`	`+ public ImmutableStringValue immutableValue() {`
`677`	`677`	`return ValueFactory.newString((byte[]) objectValue);`
`678`	`678`	`}`
`679`	`679`
`@@ -714,7 +714,7 @@ public ArrayValue asArrayValue() {`
`714`	`714`	`}`
`715`	`715`
`716`	`716`	`@Override`
`717`		`- public ImmutableArrayValue toImmutable() {`
	`717`	`+ public ImmutableArrayValue immutableValue() {`
`718`	`718`	`return ValueFactory.newArray(list());`
`719`	`719`	`}`
`720`	`720`
`@@ -786,7 +786,7 @@ public MapValue asMapValue() {`
`786`	`786`	`}`
`787`	`787`
`788`	`788`	`@Override`
`789`		`- public ImmutableMapValue toImmutable() {`
	`789`	`+ public ImmutableMapValue immutableValue() {`
`790`	`790`	`return ValueFactory.newMap(map());`
`791`	`791`	`}`
`792`	`792`
`@@ -870,7 +870,7 @@ public ExtensionValue asExtensionValue() {`
`870`	`870`	`}`
`871`	`871`
`872`	`872`	`@Override`
`873`		`- public ImmutableExtensionValue toImmutable() {`
	`873`	`+ public ImmutableExtensionValue immutableValue() {`
`874`	`874`	`return (ImmutableExtensionValue) objectValue;`
`875`	`875`	`}`
`876`	`876`
`@@ -901,8 +901,8 @@ public void accept(ValueVisitor visitor) {`
`901`	`901`	`//`
`902`	`902`
`903`	`903`	`@Override`
`904`		`- public ImmutableValue toImmutable() {`
`905`		`- return accessor.toImmutable();`
	`904`	`+ public ImmutableValue immutableValue() {`
	`905`	`+ return accessor.immutableValue();`
`906`	`906`	`}`
`907`	`907`
`908`	`908`	`@Override`
`@@ -917,17 +917,17 @@ public void accept(ValueVisitor visitor) {`
`917`	`917`
`918`	`918`	`@Override`
`919`	`919`	`public int hashCode() {`
`920`		`- return toImmutable().hashCode(); // TODO optimize`
	`920`	`+ return immutableValue().hashCode(); // TODO optimize`
`921`	`921`	`}`
`922`	`922`
`923`	`923`	`@Override`
`924`	`924`	`public boolean equals(Object o) {`
`925`		`- return toImmutable().equals(o); // TODO optimize`
	`925`	`+ return immutableValue().equals(o); // TODO optimize`
`926`	`926`	`}`
`927`	`927`
`928`	`928`	`@Override`
`929`	`929`	`public String toString() {`
`930`		`- return toImmutable().toString(); // TODO optimize`
	`930`	`+ return immutableValue().toString(); // TODO optimize`
`931`	`931`	`}`
`932`	`932`
`933`	`933`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public ValueType getValueType() {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`@Override`
`53`		`- public ImmutableArrayValue toImmutable() {`
	`53`	`+ public ImmutableArrayValue immutableValue() {`
`54`	`54`	`return this;`
`55`	`55`	`}`
`56`	`56`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public ValueType getValueType() {`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`@Override`
`45`		`- public ImmutableBinaryValue toImmutable() {`
	`45`	`+ public ImmutableBinaryValue immutableValue() {`
`46`	`46`	`return this;`
`47`	`47`	`}`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public ValueType getValueType() {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`@Override`
`47`		`- public ImmutableBooleanValue toImmutable() {`
	`47`	`+ public ImmutableBooleanValue immutableValue() {`
`48`	`48`	`return this;`
`49`	`49`	`}`
`50`	`50`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public ValueType getValueType() {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`@Override`
`44`		`- public ImmutableDoubleValueImpl toImmutable() {`
	`44`	`+ public ImmutableDoubleValueImpl immutableValue() {`
`45`	`45`	`return this;`
`46`	`46`	`}`
`47`	`47`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public ValueType getValueType() {`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`@Override`
`51`		`- public ImmutableIntegerValue toImmutable() {`
	`51`	`+ public ImmutableIntegerValue immutableValue() {`
`52`	`52`	`return this;`
`53`	`53`	`}`
`54`	`54`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public ValueType getValueType() {`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`@Override`
`57`		`- public ImmutableMapValue toImmutable() {`
	`57`	`+ public ImmutableMapValue immutableValue() {`
`58`	`58`	`return this;`
`59`	`59`	`}`
`60`	`60`