Skip to content

V07 value impl revision 2 #249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xerial merged 29 commits into from
Jun 19, 2015
Merged

V07 value impl revision 2 #249

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
e2fc4e6
Renmae ExtendedType -> ExtensionType
xerial Jun 13, 2015
bc7e503
ValueFactory.newXXXValue -> newXXX for brevity
xerial Jun 13, 2015
b123089
immutableValue() -> toImmutable()
xerial Jun 13, 2015
4bcfab5
Add visitor interface
xerial Jun 13, 2015
de6d1f5
Add augumented constructor for ExtensionTypeHeader
xerial Jun 13, 2015
04819a3
Fix test case
xerial Jun 13, 2015
d1807a5
Add ValueType bit mask to improve type check performance
xerial Jun 13, 2015
770f013
Preserve float and double differences
xerial Jun 13, 2015
775379d
Renamed xxxValue that returns primitive type value as toXXX
xerial Jun 13, 2015
301ae10
Remove public scope from interface
xerial Jun 13, 2015
9db3537
Fix compilation error of msgpack-jackson
xerial Jun 13, 2015
c782451
toImmutable -> immutableValue
xerial Jun 15, 2015
ed45331
Remove visitor, ExtensionTypeHeader constructor. Fix exception type o…
xerial Jun 15, 2015
787533c
Remove ValueFactory.newArrayOf
xerial Jun 15, 2015
53557e9
Removed ValueType.bitMask
xerial Jun 15, 2015
9e8c806
Fix test compile error
xerial Jun 15, 2015
33f9ccf
Changed the extension type interface to use byte
xerial Jun 15, 2015
3df8f36
FloatHolder test is no longer necesary
xerial Jun 15, 2015
5289289
Remove RawValue
xerial Jun 15, 2015
4cba605
Fix test case that checks nil value
xerial Jun 15, 2015
c14c87c
Fix test cases and range check of extension types
xerial Jun 15, 2015
f6f9e8f
Fixes test case to use getString to extract raw string value
xerial Jun 15, 2015
e1b8105
Removed obsolete classes
xerial Jun 15, 2015
1d1da11
Moved example codes to test folder
xerial Jun 15, 2015
005edf4
Map.Entry based builder. Add putAll methods
xerial Jun 16, 2015
bef3c55
nil() -> newNil() for method name consisitency
xerial Jun 16, 2015
ca2fb1e
Add comment to ExtensionTypeHeader
xerial Jun 16, 2015
5ba7366
Fix unit test errors
komamitsu Jun 18, 2015
080deb3
Merge pull request #1 from komamitsu/v07-value-impl-rev2-fix-jackson-…
xerial Jun 18, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
toImmutable -> immutableValue
  • Loading branch information
@xerial
xerial committed Jun 15, 2015
commit c78245174b2e5a697395338f38a1f336edc75312
2 changes: 1 addition & 1 deletion msgpack-core/src/main/java/org/msgpack/value/Value.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
28 changes: 14 additions & 14 deletions msgpack-core/src/main/java/org/msgpack/value/Variable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ public NilValue asNilValue() {
}

@Override
public ImmutableNilValue toImmutable() {
public ImmutableNilValue immutableValue() {
return ValueFactory.nil();
}

Expand Down Expand Up @@ -270,7 +270,7 @@ public BooleanValue asBooleanValue() {
}

@Override
public ImmutableBooleanValue toImmutable() {
public ImmutableBooleanValue immutableValue() {
return ValueFactory.newBoolean(getBoolean());
}

Expand Down Expand Up @@ -413,7 +413,7 @@ public IntegerValue asIntegerValue() {
}

@Override
public ImmutableIntegerValue toImmutable() {
public ImmutableIntegerValue immutableValue() {
if (type == Type.BIG_INTEGER) {
return ValueFactory.newInteger((BigInteger) objectValue);
}
Expand Down Expand Up @@ -535,7 +535,7 @@ public FloatValue asFloatValue() {
}

@Override
public ImmutableFloatValue toImmutable() {
public ImmutableFloatValue immutableValue() {
return ValueFactory.newFloat(doubleValue);
}

Expand Down Expand Up @@ -628,7 +628,7 @@ public BinaryValue asBinaryValue() {
}

@Override
public ImmutableBinaryValue toImmutable() {
public ImmutableBinaryValue immutableValue() {
return ValueFactory.newBinary(getByteArray());
}

Expand Down Expand Up @@ -673,7 +673,7 @@ public StringValue asStringValue() {
}

@Override
public ImmutableStringValue toImmutable() {
public ImmutableStringValue immutableValue() {
return ValueFactory.newString((byte[]) objectValue);
}

Expand Down Expand Up @@ -714,7 +714,7 @@ public ArrayValue asArrayValue() {
}

@Override
public ImmutableArrayValue toImmutable() {
public ImmutableArrayValue immutableValue() {
return ValueFactory.newArray(list());
}

Expand Down Expand Up @@ -786,7 +786,7 @@ public MapValue asMapValue() {
}

@Override
public ImmutableMapValue toImmutable() {
public ImmutableMapValue immutableValue() {
return ValueFactory.newMap(map());
}

Expand Down Expand Up @@ -870,7 +870,7 @@ public ExtensionValue asExtensionValue() {
}

@Override
public ImmutableExtensionValue toImmutable() {
public ImmutableExtensionValue immutableValue() {
return (ImmutableExtensionValue) objectValue;
}

Expand Down Expand Up @@ -901,8 +901,8 @@ public void accept(ValueVisitor visitor) {
//

@Override
public ImmutableValue toImmutable() {
return accessor.toImmutable();
public ImmutableValue immutableValue() {
return accessor.immutableValue();
}

@Override
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion msgpack-core/src/main/java/org/msgpack/value/impl/ImmutableArrayValueImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public ValueType getValueType() {
}

@Override
public ImmutableArrayValue toImmutable() {
public ImmutableArrayValue immutableValue() {
return this;
}

Expand Down
2 changes: 1 addition & 1 deletion msgpack-core/src/main/java/org/msgpack/value/impl/ImmutableBigIntegerValueImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public ValueType getValueType() {
}

@Override
public ImmutableIntegerValue toImmutable() {
public ImmutableIntegerValue immutableValue() {
return this;
}

Expand Down
2 changes: 1 addition & 1 deletion msgpack-core/src/main/java/org/msgpack/value/impl/ImmutableBinaryValueImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public ValueType getValueType() {
}

@Override
public ImmutableBinaryValue toImmutable() {
public ImmutableBinaryValue immutableValue() {
return this;
}

Expand Down
2 changes: 1 addition & 1 deletion msgpack-core/src/main/java/org/msgpack/value/impl/ImmutableBooleanValueImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public ValueType getValueType() {
}

@Override
public ImmutableBooleanValue toImmutable() {
public ImmutableBooleanValue immutableValue() {
return this;
}

Expand Down
2 changes: 1 addition & 1 deletion msgpack-core/src/main/java/org/msgpack/value/impl/ImmutableDoubleValueImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public ValueType getValueType() {
}

@Override
public ImmutableDoubleValueImpl toImmutable() {
public ImmutableDoubleValueImpl immutableValue() {
return this;
}

Expand Down
2 changes: 1 addition & 1 deletion msgpack-core/src/main/java/org/msgpack/value/impl/ImmutableExtensionValueImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public ValueType getValueType() {
}

@Override
public ImmutableExtensionValue toImmutable() {
public ImmutableExtensionValue immutableValue() {
return this;
}

Expand Down
2 changes: 1 addition & 1 deletion msgpack-core/src/main/java/org/msgpack/value/impl/ImmutableLongValueImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public ValueType getValueType() {
}

@Override
public ImmutableIntegerValue toImmutable() {
public ImmutableIntegerValue immutableValue() {
return this;
}

Expand Down
2 changes: 1 addition & 1 deletion msgpack-core/src/main/java/org/msgpack/value/impl/ImmutableMapValueImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public ValueType getValueType() {
}

@Override
public ImmutableMapValue toImmutable() {
public ImmutableMapValue immutableValue() {
return this;
}

Expand Down
2 changes: 1 addition & 1 deletion msgpack-core/src/main/java/org/msgpack/value/impl/ImmutableNilValueImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public ValueType getValueType() {
}

@Override
public ImmutableNilValue toImmutable() {
public ImmutableNilValue immutableValue() {
return this;
}

Expand Down
2 changes: 1 addition & 1 deletion msgpack-core/src/main/java/org/msgpack/value/impl/ImmutableStringValueImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public ValueType getValueType() {
}

@Override
public ImmutableStringValue toImmutable() {
public ImmutableStringValue immutableValue() {
return this;
}

Expand Down