Fix code style

xerial · xerial · commit 55c443c983bd · 2016-04-08T08:55:51.000-07: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
@@ -208,7 +208,7 @@ private MessageBuffer prepareNumberBuffer(int readLength)
             position += readLength;  // here assumes following buffer.getXxx never throws exception
             return buffer; // Return the default buffer
         }
-        else if(remaining == 0) {
+        else if (remaining == 0) {
             buffer = getNextBuffer();
             position = readLength;
             nextReadPosition = 0;
diff --git a/msgpack-core/src/main/java/org/msgpack/value/ValueFactory.java b/msgpack-core/src/main/java/org/msgpack/value/ValueFactory.java
@@ -30,7 +30,6 @@
 import java.util.AbstractMap;
 import java.util.Arrays;
 import java.util.LinkedHashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -232,7 +231,7 @@ public static ImmutableMapValue emptyMap()
     public static MapValue newMap(Map.Entry<? extends Value, ? extends Value>... pairs)
     {
         Value[] kvs = new Value[pairs.length * 2];
-        for (int i=0; i < pairs.length; i += 2) {
+        for (int i = 0; i < pairs.length; i += 2) {
             kvs[i * 2] = pairs[i].getKey();
             kvs[i * 2 + 1] = pairs[i].getValue();
         }
@@ -253,7 +252,9 @@ public static class MapBuilder
     {
         private final Map<Value, Value> map = new LinkedHashMap<Value, Value>();
 
-        public MapBuilder() {}
+        public MapBuilder()
+        {
+        }
 
         public MapValue build()
         {
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
@@ -235,11 +235,13 @@ public JsonToken nextToken()
                         long l = messageUnpacker.unpackLong();
                         if (Integer.MIN_VALUE <= l && l <= Integer.MAX_VALUE) {
                             type = Type.INT;
-                            v = intValue = (int) l;
+                            intValue = (int) l;
+                            v = intValue;
                         }
                         else {
                             type = Type.LONG;
-                            v = longValue = l;
+                            longValue = l;
+                            v = longValue;
                         }
                         break;
                 }
@@ -442,7 +444,7 @@ public BigInteger getBigIntegerValue()
             case LONG:
                 return BigInteger.valueOf(longValue);
             case DOUBLE:
-                return BigInteger.valueOf((long)doubleValue);
+                return BigInteger.valueOf((long) doubleValue);
             case BIG_INT:
                 return biValue;
             default:

Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ private MessageBuffer prepareNumberBuffer(int readLength)`
`208`	`208`	`position += readLength; // here assumes following buffer.getXxx never throws exception`
`209`	`209`	`return buffer; // Return the default buffer`
`210`	`210`	`}`
`211`		`- else if(remaining == 0) {`
	`211`	`+ else if (remaining == 0) {`
`212`	`212`	`buffer = getNextBuffer();`
`213`	`213`	`position = readLength;`
`214`	`214`	`nextReadPosition = 0;`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,6 @@`
`30`	`30`	`import java.util.AbstractMap;`
`31`	`31`	`import java.util.Arrays;`
`32`	`32`	`import java.util.LinkedHashMap;`
`33`		`-import java.util.Iterator;`
`34`	`33`	`import java.util.List;`
`35`	`34`	`import java.util.Map;`
`36`	`35`
`@@ -232,7 +231,7 @@ public static ImmutableMapValue emptyMap()`
`232`	`231`	`public static MapValue newMap(Map.Entry<? extends Value, ? extends Value>... pairs)`
`233`	`232`	`{`
`234`	`233`	`Value[] kvs = new Value[pairs.length * 2];`
`235`		`- for (int i=0; i < pairs.length; i += 2) {`
	`234`	`+ for (int i = 0; i < pairs.length; i += 2) {`
`236`	`235`	`kvs[i * 2] = pairs[i].getKey();`
`237`	`236`	`kvs[i * 2 + 1] = pairs[i].getValue();`
`238`	`237`	`}`
`@@ -253,7 +252,9 @@ public static class MapBuilder`
`253`	`252`	`{`
`254`	`253`	`private final Map<Value, Value> map = new LinkedHashMap<Value, Value>();`
`255`	`254`
`256`		`- public MapBuilder() {}`
	`255`	`+ public MapBuilder()`
	`256`	`+ {`
	`257`	`+ }`
`257`	`258`
`258`	`259`	`public MapValue build()`
`259`	`260`	`{`