nil() -> newNil() for method name consisitency

xerial · xerial · commit bef3c55f0f17 · 2015-06-16T16:52:11.000+09:00
diff --git a/msgpack-core/src/main/java/org/msgpack/core/MessageUnpacker.java b/msgpack-core/src/main/java/org/msgpack/core/MessageUnpacker.java
@@ -540,7 +540,7 @@ public ImmutableValue unpackValue() throws IOException {
         switch(mf.getValueType()) {
             case NIL:
                 unpackNil();
-                return ValueFactory.nil();
+                return ValueFactory.newNil();
             case BOOLEAN:
                 return ValueFactory.newBoolean(unpackBoolean());
             case INTEGER:
diff --git a/msgpack-core/src/main/java/org/msgpack/value/ValueFactory.java b/msgpack-core/src/main/java/org/msgpack/value/ValueFactory.java
@@ -32,7 +32,7 @@
 public final class ValueFactory {
     private ValueFactory() { }
 
-    public static ImmutableNilValue nil() {
+    public static ImmutableNilValue newNil() {
         return ImmutableNilValueImpl.get();
     }
 
diff --git a/msgpack-core/src/main/java/org/msgpack/value/Variable.java b/msgpack-core/src/main/java/org/msgpack/value/Variable.java
@@ -232,7 +232,7 @@ public NilValue asNilValue() {
 
         @Override
         public ImmutableNilValue immutableValue() {
-            return ValueFactory.nil();
+            return ValueFactory.newNil();
         }
 
         @Override
@@ -704,7 +704,7 @@ public Value get(int index) {
         public Value getOrNilValue(int index) {
             List<Value> l = list();
             if (l.size() < index && index >= 0) {
-                return ValueFactory.nil();
+                return ValueFactory.newNil();
             }
             return l.get(index);
         }
diff --git a/msgpack-core/src/test/scala/org/msgpack/value/ValueFactoryTest.scala b/msgpack-core/src/test/scala/org/msgpack/value/ValueFactoryTest.scala
@@ -37,7 +37,7 @@ class ValueFactoryTest extends MessagePackSpec {
   "ValueFactory" should {
 
     "create valid type values" in {
-      isValid(ValueFactory.nil(), expected=ValueType.NIL, isNil = true)
+      isValid(ValueFactory.newNil(), expected=ValueType.NIL, isNil = true)
       forAll{(v:Boolean) => isValid(ValueFactory.newBoolean(v), expected=ValueType.BOOLEAN, isBoolean = true)}
       forAll{(v:Int) => isValid(ValueFactory.newInteger(v), expected=ValueType.INTEGER, isInteger = true, isNumber = true)}
       forAll{(v:Float) => isValid(ValueFactory.newFloat(v), expected=ValueType.FLOAT, isFloat = true, isNumber = true)}
diff --git a/msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/MessagePackParser.java b/msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/MessagePackParser.java
@@ -29,7 +29,7 @@ public class MessagePackParser extends ParserMinimalBase {
     private JsonReadContext parsingContext;
 
     private final LinkedList<StackItem> stack = new LinkedList<StackItem>();
-    private Value value = ValueFactory.nil();
+    private Value value = ValueFactory.newNil();
     private Variable var = new Variable();
     private boolean isClosed;
     private long tokenPosition;
@@ -141,12 +141,12 @@ public JsonToken nextToken() throws IOException, JsonParseException {
         switch (type) {
             case NIL:
                 messageUnpacker.unpackNil();
-                value = ValueFactory.nil();
+                value = ValueFactory.newNil();
                 nextToken = JsonToken.VALUE_NULL;
                 break;
             case BOOLEAN:
                 boolean b = messageUnpacker.unpackBoolean();
-                value = ValueFactory.nil();
+                value = ValueFactory.newNil();
                 nextToken = b ? JsonToken.VALUE_TRUE : JsonToken.VALUE_FALSE;
                 break;
             case INTEGER:
@@ -178,11 +178,11 @@ public JsonToken nextToken() throws IOException, JsonParseException {
                 }
                 break;
             case ARRAY:
-                value = ValueFactory.nil();
+                value = ValueFactory.newNil();
                 newStack = new StackItemForArray(messageUnpacker.unpackArrayHeader());
                 break;
             case MAP:
-                value = ValueFactory.nil();
+                value = ValueFactory.newNil();
                 newStack = new StackItemForObject(messageUnpacker.unpackMapHeader());
                 break;
             case EXTENSION:

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@`
`32`	`32`	`public final class ValueFactory {`
`33`	`33`	`private ValueFactory() { }`
`34`	`34`
`35`		`- public static ImmutableNilValue nil() {`
	`35`	`+ public static ImmutableNilValue newNil() {`
`36`	`36`	`return ImmutableNilValueImpl.get();`
`37`	`37`	`}`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,7 @@ public NilValue asNilValue() {`
`232`	`232`
`233`	`233`	`@Override`
`234`	`234`	`public ImmutableNilValue immutableValue() {`
`235`		`- return ValueFactory.nil();`
	`235`	`+ return ValueFactory.newNil();`
`236`	`236`	`}`
`237`	`237`
`238`	`238`	`@Override`
`@@ -704,7 +704,7 @@ public Value get(int index) {`
`704`	`704`	`public Value getOrNilValue(int index) {`
`705`	`705`	`List<Value> l = list();`
`706`	`706`	`if (l.size() < index && index >= 0) {`
`707`		`- return ValueFactory.nil();`
	`707`	`+ return ValueFactory.newNil();`
`708`	`708`	`}`
`709`	`709`	`return l.get(index);`
`710`	`710`	`}`