Merge v07-develop and fix code style

xerial · xerial · commit e261c59080f5 · 2016-01-04T12:16:44.000+09:00
diff --git a/msgpack-core/src/main/java/org/msgpack/core/MessagePack.java b/msgpack-core/src/main/java/org/msgpack/core/MessagePack.java
@@ -15,20 +15,11 @@
 //
 package org.msgpack.core;
 
-import org.msgpack.core.buffer.ArrayBufferInput;
-import org.msgpack.core.buffer.ChannelBufferInput;
-import org.msgpack.core.buffer.ChannelBufferOutput;
-import org.msgpack.core.buffer.InputStreamBufferInput;
-import org.msgpack.core.buffer.OutputStreamBufferOutput;
-
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.channels.ReadableByteChannel;
 import java.nio.channels.WritableByteChannel;
 import java.nio.charset.Charset;
-import java.nio.charset.CodingErrorAction;
-
-import static org.msgpack.core.Preconditions.checkArgument;
 
 /**
  * This class has MessagePack prefix code definitions and packer/unpacker factory methods.
@@ -53,7 +44,8 @@ public static MessagePackFactory getDefaultFactory()
     }
 
     private MessagePack()
-    { }
+    {
+    }
 
     /**
      * Equivalent to getDefaultFactory().newPacker(out).
@@ -80,7 +72,6 @@ public static MessagePacker newDefaultPacker(WritableByteChannel channel)
     /**
      * Equivalent to getDefaultFactory().newBufferPacker()
      *
-     * @param channel
      * @return
      */
     public static MessageBufferPacker newDefaultBufferPacker()
diff --git a/msgpack-core/src/main/java/org/msgpack/core/MessagePackFactory.java b/msgpack-core/src/main/java/org/msgpack/core/MessagePackFactory.java
@@ -19,17 +19,15 @@
 import org.msgpack.core.buffer.ChannelBufferInput;
 import org.msgpack.core.buffer.ChannelBufferOutput;
 import org.msgpack.core.buffer.InputStreamBufferInput;
-import org.msgpack.core.buffer.OutputStreamBufferOutput;
 import org.msgpack.core.buffer.MessageBufferInput;
 import org.msgpack.core.buffer.MessageBufferOutput;
+import org.msgpack.core.buffer.OutputStreamBufferOutput;
 
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.nio.channels.WritableByteChannel;
 import java.nio.channels.ReadableByteChannel;
-
+import java.nio.channels.WritableByteChannel;
 import java.nio.charset.CodingErrorAction;
-import static org.msgpack.core.Preconditions.checkArgument;
 
 public class MessagePackFactory
 {
@@ -42,8 +40,8 @@ public class MessagePackFactory
     private int unpackStringSizeLimit = Integer.MAX_VALUE;
     private int unpackStringDecoderBufferSize = 8192;
 
-    private int inputBufferSize = 16*1024;
-    private int outputBufferSize = 16*1024;
+    private int inputBufferSize = 16 * 1024;
+    private int outputBufferSize = 16 * 1024;
 
     public MessagePacker newPacker(OutputStream out)
     {
@@ -58,13 +56,13 @@ public MessagePacker newPacker(WritableByteChannel channel)
     public MessagePacker newPacker(MessageBufferOutput output)
     {
         return new MessagePacker(output)
-            .setSmallStringOptimizationThreshold(packerSmallStringOptimizationThreshold);
+                .setSmallStringOptimizationThreshold(packerSmallStringOptimizationThreshold);
     }
 
     public MessageBufferPacker newBufferPacker()
     {
         return new MessageBufferPacker()
-            .setSmallStringOptimizationThreshold(packerSmallStringOptimizationThreshold);
+                .setSmallStringOptimizationThreshold(packerSmallStringOptimizationThreshold);
     }
 
     public MessageUnpacker newUnpacker(byte[] contents)
@@ -90,12 +88,12 @@ public MessageUnpacker newUnpacker(ReadableByteChannel channel)
     public MessageUnpacker newUnpacker(MessageBufferInput input)
     {
         return new MessageUnpacker(input)
-            .setAllowStringAsBinary(unpackAllowStringAsBinary)
-            .setAllowBinaryAsString(unpackAllowBinaryAsString)
-            .setActionOnMalformedString(unpackActionOnMalformedString)
-            .setActionOnUnmappableString(unpackActionOnUnmappableString)
-            .setStringSizeLimit(unpackStringSizeLimit)
-            .setStringDecoderBufferSize(unpackStringDecoderBufferSize);
+                .setAllowStringAsBinary(unpackAllowStringAsBinary)
+                .setAllowBinaryAsString(unpackAllowBinaryAsString)
+                .setActionOnMalformedString(unpackActionOnMalformedString)
+                .setActionOnUnmappableString(unpackActionOnUnmappableString)
+                .setStringSizeLimit(unpackStringSizeLimit)
+                .setStringDecoderBufferSize(unpackStringDecoderBufferSize);
     }
 
     /**
diff --git a/msgpack-core/src/main/java/org/msgpack/core/MessagePacker.java b/msgpack-core/src/main/java/org/msgpack/core/MessagePacker.java
@@ -27,7 +27,6 @@
 import java.nio.charset.CharacterCodingException;
 import java.nio.charset.CharsetEncoder;
 import java.nio.charset.CoderResult;
-import java.nio.charset.CodingErrorAction;
 
 import static org.msgpack.core.MessageFormat.Code.ARRAY16;
 import static org.msgpack.core.MessageFormat.Code.ARRAY32;
diff --git a/msgpack-core/src/main/java/org/msgpack/core/MessageUnpacker.java b/msgpack-core/src/main/java/org/msgpack/core/MessageUnpacker.java
@@ -24,7 +24,6 @@
 import org.msgpack.value.Variable;
 
 import java.io.Closeable;
-import java.io.EOFException;
 import java.io.IOException;
 import java.math.BigInteger;
 import java.nio.ByteBuffer;
@@ -33,13 +32,11 @@
 import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CoderResult;
 import java.nio.charset.CodingErrorAction;
-import java.nio.charset.MalformedInputException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static org.msgpack.core.Preconditions.checkArgument;
 import static org.msgpack.core.Preconditions.checkNotNull;
 
 /**
@@ -1019,7 +1016,7 @@ else if (bufferRemaining == 0) {
     }
 
     private void handleCoderError(CoderResult cr)
-        throws CharacterCodingException
+            throws CharacterCodingException
     {
         if ((cr.isMalformed() && actionOnMalformedString == CodingErrorAction.REPORT) ||
                 (cr.isUnmappable() && actionOnUnmappableString == CodingErrorAction.REPORT)) {
diff --git a/msgpack-core/src/main/java/org/msgpack/core/buffer/ArrayBufferInput.java b/msgpack-core/src/main/java/org/msgpack/core/buffer/ArrayBufferInput.java
@@ -87,5 +87,4 @@ public void close()
         buffer = null;
         isRead = false;
     }
-
 }
diff --git a/msgpack-core/src/main/java/org/msgpack/core/buffer/ChannelBufferInput.java b/msgpack-core/src/main/java/org/msgpack/core/buffer/ChannelBufferInput.java
@@ -78,5 +78,4 @@ public void close()
     {
         channel.close();
     }
-
 }
diff --git a/msgpack-core/src/main/java/org/msgpack/core/buffer/MessageBufferBE.java b/msgpack-core/src/main/java/org/msgpack/core/buffer/MessageBufferBE.java
@@ -15,8 +15,6 @@
 //
 package org.msgpack.core.buffer;
 
-import java.nio.ByteBuffer;
-
 import static org.msgpack.core.Preconditions.checkArgument;
 
 /**
diff --git a/msgpack-core/src/main/java/org/msgpack/core/buffer/MessageBufferInput.java b/msgpack-core/src/main/java/org/msgpack/core/buffer/MessageBufferInput.java
@@ -26,13 +26,12 @@ public interface MessageBufferInput
 {
     /**
      * Get a next buffer to read.
-     *
-     * When this method is called twice, the formally allocated buffer can be safely discarded.
+     * <p>
+     * When this method is called, the formally allocated buffer can be safely discarded.
      *
      * @return the next MessageBuffer, or return null if no more buffer is available.
      * @throws IOException when error occurred when reading the data
      */
     public MessageBuffer next()
             throws IOException;
-
 }
diff --git a/msgpack-core/src/main/java/org/msgpack/core/buffer/MessageBufferU.java b/msgpack-core/src/main/java/org/msgpack/core/buffer/MessageBufferU.java
@@ -16,10 +16,8 @@
 package org.msgpack.core.buffer;
 
 import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
 
 import static org.msgpack.core.Preconditions.checkArgument;
-import static org.msgpack.core.Preconditions.checkNotNull;
 
 /**
  * Universal MessageBuffer implementation supporting Java6 and Android.
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
@@ -196,7 +196,8 @@ private static void appendString(StringBuilder sb, Value value)
     {
         if (value.isRawValue()) {
             sb.append(value.toJson());
-        } else {
+        }
+        else {
             sb.append(value.toString());
         }
     }
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
@@ -38,24 +38,23 @@ public class ImmutableBigIntegerValueImpl
 {
     public static MessageFormat mostSuccinctMessageFormat(IntegerValue v)
     {
-        if(v.isInByteRange()) {
+        if (v.isInByteRange()) {
             return MessageFormat.INT8;
         }
-        else if(v.isInShortRange()) {
+        else if (v.isInShortRange()) {
             return MessageFormat.INT16;
         }
-        else if(v.isInIntRange()) {
+        else if (v.isInIntRange()) {
             return MessageFormat.INT32;
         }
-        else if(v.isInLongRange()) {
+        else if (v.isInLongRange()) {
             return MessageFormat.INT64;
         }
         else {
             return MessageFormat.UINT64;
         }
     }
 
-
     private final BigInteger value;
 
     public ImmutableBigIntegerValueImpl(BigInteger value)
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
@@ -130,7 +130,8 @@ public String toJson()
     {
         if (Double.isNaN(value) || Double.isInfinite(value)) {
             return "null";
-        } else {
+        }
+        else {
             return Double.toString(value);
         }
     }
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
@@ -172,7 +172,8 @@ private static void appendJsonKey(StringBuilder sb, Value key)
     {
         if (key.isRawValue()) {
             sb.append(key.toJson());
-        } else {
+        }
+        else {
             ImmutableStringValueImpl.appendJsonString(sb, key.toString());
         }
     }
@@ -202,7 +203,8 @@ private static void appendString(StringBuilder sb, Value value)
     {
         if (value.isRawValue()) {
             sb.append(value.toJson());
-        } else {
+        }
+        else {
             sb.append(value.toString());
         }
     }
diff --git a/msgpack-core/src/test/scala/org/msgpack/core/MessagePackTest.scala b/msgpack-core/src/test/scala/org/msgpack/core/MessagePackTest.scala
@@ -60,7 +60,6 @@ class MessagePackTest extends MessagePackSpec {
     }
 
     "detect fixarray values" in {
-
       val packer = new MessagePackFactory().newBufferPacker()
       packer.packArrayHeader(0)
       packer.close
@@ -76,7 +75,6 @@ class MessagePackTest extends MessagePackSpec {
     }
 
     "detect fixmap values" in {
-
       val packer = new MessagePackFactory().newBufferPacker()
       packer.packMapHeader(0)
       packer.close
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
@@ -32,7 +32,12 @@
 import org.msgpack.core.buffer.ArrayBufferInput;
 import org.msgpack.core.buffer.InputStreamBufferInput;
 import org.msgpack.core.buffer.MessageBufferInput;
-import org.msgpack.value.*;
+import org.msgpack.value.ExtensionValue;
+import org.msgpack.value.IntegerValue;
+import org.msgpack.value.Value;
+import org.msgpack.value.ValueFactory;
+import org.msgpack.value.ValueType;
+import org.msgpack.value.Variable;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -278,7 +283,8 @@ else if (newStack instanceof StackItemForObject) {
     @Override
     protected void _handleEOF()
             throws JsonParseException
-    {}
+    {
+    }
 
     @Override
     public String getText()
diff --git a/msgpack-jackson/src/test/java/org/msgpack/jackson/dataformat/MessagePackGeneratorTest.java b/msgpack-jackson/src/test/java/org/msgpack/jackson/dataformat/MessagePackGeneratorTest.java
@@ -24,6 +24,7 @@
 import org.msgpack.core.MessageUnpacker;
 import org.msgpack.core.buffer.ArrayBufferInput;
 
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -36,6 +37,11 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
@@ -379,4 +385,54 @@ public void testWritePrimitiveObjectViaObjectMapper()
         assertEquals(4, unpacker.unpackInt());
         assertEquals(5, unpacker.unpackLong());
     }
+
+    @Test
+    public void testInMultiThreads()
+            throws Exception
+    {
+        int threadCount = 8;
+        final int loopCount = 4000;
+        ExecutorService executorService = Executors.newFixedThreadPool(threadCount);
+        final ObjectMapper objectMapper = new ObjectMapper(new MessagePackFormatFactory());
+        objectMapper.configure(JsonGenerator.Feature.AUTO_CLOSE_TARGET, false);
+        final List<ByteArrayOutputStream> buffers = new ArrayList<ByteArrayOutputStream>(threadCount);
+        List<Future<Exception>> results = new ArrayList<Future<Exception>>();
+
+        for (int ti = 0; ti < threadCount; ti++) {
+            buffers.add(new ByteArrayOutputStream());
+            final int threadIndex = ti;
+            results.add(executorService.submit(new Callable<Exception>()
+            {
+                @Override
+                public Exception call()
+                        throws Exception
+                {
+                    try {
+                        for (int i = 0; i < loopCount; i++) {
+                            objectMapper.writeValue(buffers.get(threadIndex), threadIndex);
+                        }
+                        return null;
+                    }
+                    catch (IOException e) {
+                        return e;
+                    }
+                }
+            }));
+        }
+
+        for (int ti = 0; ti < threadCount; ti++) {
+            Future<Exception> exceptionFuture = results.get(ti);
+            Exception exception = exceptionFuture.get(20, TimeUnit.SECONDS);
+            if (exception != null) {
+                throw exception;
+            }
+            else {
+                ByteArrayOutputStream outputStream = buffers.get(ti);
+                MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(outputStream.toByteArray());
+                for (int i = 0; i < loopCount; i++) {
+                    assertEquals(ti, unpacker.unpackInt());
+                }
+            }
+        }
+    }
 }
diff --git a/msgpack-jackson/src/test/java/org/msgpack/jackson/dataformat/benchmark/MessagePackDataformatPojoBenchmarkTest.java b/msgpack-jackson/src/test/java/org/msgpack/jackson/dataformat/benchmark/MessagePackDataformatPojoBenchmarkTest.java

Original file line number	Diff line number	Diff line change
`@@ -87,5 +87,4 @@ public void close()`
`87`	`87`	`buffer = null;`
`88`	`88`	`isRead = false;`
`89`	`89`	`}`
`90`		`-`
`91`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,5 +78,4 @@ public void close()`
`78`	`78`	`{`
`79`	`79`	`channel.close();`
`80`	`80`	`}`
`81`		`-`
`82`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,13 +26,12 @@ public interface MessageBufferInput`
`26`	`26`	`{`
`27`	`27`	`/**`
`28`	`28`	`* Get a next buffer to read.`
`29`		`- *`
`30`		`- * When this method is called twice, the formally allocated buffer can be safely discarded.`
	`29`	`+ * <p>`
	`30`	`+ * When this method is called, the formally allocated buffer can be safely discarded.`
`31`	`31`	`*`
`32`	`32`	`* @return the next MessageBuffer, or return null if no more buffer is available.`
`33`	`33`	`* @throws IOException when error occurred when reading the data`
`34`	`34`	`*/`
`35`	`35`	`public MessageBuffer next()`
`36`	`36`	`throws IOException;`
`37`		`-`
`38`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,8 @@ private static void appendString(StringBuilder sb, Value value)`
`196`	`196`	`{`
`197`	`197`	`if (value.isRawValue()) {`
`198`	`198`	`sb.append(value.toJson());`
`199`		`- } else {`
	`199`	`+ }`
	`200`	`+ else {`
`200`	`201`	`sb.append(value.toString());`
`201`	`202`	`}`
`202`	`203`	`}`