adding the ability to inject PackerConfig to MessagePackFactory.

marenzo · marenzo · commit 215df1749bdd · 2016-04-06T17:39:55.000+03:00
diff --git a/msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/MessagePackFactory.java b/msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/MessagePackFactory.java
@@ -21,6 +21,7 @@
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.io.IOContext;
+import org.msgpack.core.MessagePack;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -35,11 +36,21 @@ public class MessagePackFactory
 {
     private static final long serialVersionUID = 2578263992015504347L;
 
+    private final MessagePack.PackerConfig packerConfig;
+
+    public MessagePackFactory() {
+        this(MessagePack.DEFAULT_PACKER_CONFIG);
+    }
+
+    public MessagePackFactory(final MessagePack.PackerConfig packerConfig) {
+        this.packerConfig = packerConfig;
+    }
+
     @Override
     public JsonGenerator createGenerator(OutputStream out, JsonEncoding enc)
             throws IOException
     {
-        return new MessagePackGenerator(_generatorFeatures, _objectCodec, out);
+        return new MessagePackGenerator(_generatorFeatures, _objectCodec, out, packerConfig);
     }
 
     @Override
diff --git a/msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/MessagePackGenerator.java b/msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/MessagePackGenerator.java
@@ -38,7 +38,7 @@ public class MessagePackGenerator
         extends GeneratorBase
 {
     private static final Charset DEFAULT_CHARSET = Charset.forName("UTF-8");
-    private static ThreadLocal<MessagePacker> messagePackersHolder = new ThreadLocal<MessagePacker>();
+    private final MessagePacker messagePacker;
     private static ThreadLocal<OutputStreamBufferOutput> messageBufferOutputHolder = new ThreadLocal<OutputStreamBufferOutput>();
     private LinkedList<StackItem> stack;
     private StackItem rootStackItem;
@@ -95,11 +95,10 @@ List<String> getKeys()
         }
     }
 
-    public MessagePackGenerator(int features, ObjectCodec codec, OutputStream out)
+    public MessagePackGenerator(int features, ObjectCodec codec, OutputStream out, final MessagePack.PackerConfig packerConfig)
             throws IOException
     {
         super(features, codec);
-        MessagePacker messagePacker = messagePackersHolder.get();
         OutputStreamBufferOutput messageBufferOutput = messageBufferOutputHolder.get();
         if (messageBufferOutput == null) {
             messageBufferOutput = new OutputStreamBufferOutput(out);
@@ -109,14 +108,7 @@ public MessagePackGenerator(int features, ObjectCodec codec, OutputStream out)
         }
         messageBufferOutputHolder.set(messageBufferOutput);
 
-        if (messagePacker == null) {
-            messagePacker = MessagePack.newDefaultPacker(messageBufferOutput);
-        }
-        else {
-            messagePacker.reset(messageBufferOutput);
-        }
-        messagePackersHolder.set(messagePacker);
-
+        this.messagePacker = packerConfig.newPacker(messageBufferOutput);
         this.stack = new LinkedList<StackItem>();
     }
 
@@ -548,10 +540,6 @@ private void popStackAndStoreTheItemAsValue()
 
     private MessagePacker getMessagePacker()
     {
-        MessagePacker messagePacker = messagePackersHolder.get();
-        if (messagePacker == null) {
-            throw new IllegalStateException("messagePacker is null");
-        }
         return messagePacker;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public class MessagePackGenerator`
`38`	`38`	`extends GeneratorBase`
`39`	`39`	`{`
`40`	`40`	`private static final Charset DEFAULT_CHARSET = Charset.forName("UTF-8");`
`41`		`- private static ThreadLocal<MessagePacker> messagePackersHolder = new ThreadLocal<MessagePacker>();`
	`41`	`+ private final MessagePacker messagePacker;`
`42`	`42`	`private static ThreadLocal<OutputStreamBufferOutput> messageBufferOutputHolder = new ThreadLocal<OutputStreamBufferOutput>();`
`43`	`43`	`private LinkedList<StackItem> stack;`
`44`	`44`	`private StackItem rootStackItem;`
`@@ -95,11 +95,10 @@ List<String> getKeys()`
`95`	`95`	`}`
`96`	`96`	`}`
`97`	`97`
`98`		`- public MessagePackGenerator(int features, ObjectCodec codec, OutputStream out)`
	`98`	`+ public MessagePackGenerator(int features, ObjectCodec codec, OutputStream out, final MessagePack.PackerConfig packerConfig)`
`99`	`99`	`throws IOException`
`100`	`100`	`{`
`101`	`101`	`super(features, codec);`
`102`		`- MessagePacker messagePacker = messagePackersHolder.get();`
`103`	`102`	`OutputStreamBufferOutput messageBufferOutput = messageBufferOutputHolder.get();`
`104`	`103`	`if (messageBufferOutput == null) {`
`105`	`104`	`messageBufferOutput = new OutputStreamBufferOutput(out);`
`@@ -109,14 +108,7 @@ public MessagePackGenerator(int features, ObjectCodec codec, OutputStream out)`
`109`	`108`	`}`
`110`	`109`	`messageBufferOutputHolder.set(messageBufferOutput);`
`111`	`110`
`112`		`- if (messagePacker == null) {`
`113`		`- messagePacker = MessagePack.newDefaultPacker(messageBufferOutput);`
`114`		`- }`
`115`		`- else {`
`116`		`- messagePacker.reset(messageBufferOutput);`
`117`		`- }`
`118`		`- messagePackersHolder.set(messagePacker);`
`119`		`-`
	`111`	`+ this.messagePacker = packerConfig.newPacker(messageBufferOutput);`
`120`	`112`	`this.stack = new LinkedList<StackItem>();`
`121`	`113`	`}`
`122`	`114`
`@@ -548,10 +540,6 @@ private void popStackAndStoreTheItemAsValue()`
`548`	`540`
`549`	`541`	`private MessagePacker getMessagePacker()`
`550`	`542`	`{`
`551`		`- MessagePacker messagePacker = messagePackersHolder.get();`
`552`		`- if (messagePacker == null) {`
`553`		`- throw new IllegalStateException("messagePacker is null");`
`554`		`- }`
`555`	`543`	`return messagePacker;`
`556`	`544`	`}`
`557`	`545`	`}`