Merge pull request #362 from komamitsu/minor_improve_pr_361

komamitsu · komamitsu · commit 57ea2a09a164 · 2016-04-20T01:09:26.000+09:00
Minor improvement of pull request 361
diff --git a/msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/MessagePackSerializerFactory.java b/msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/MessagePackSerializerFactory.java
@@ -24,12 +24,20 @@
 public class MessagePackSerializerFactory
         extends BeanSerializerFactory
 {
+    /**
+     * Constructor for creating instances without configuration.
+     */
+    public MessagePackSerializerFactory()
+    {
+        super(null);
+    }
+
     /**
      * Constructor for creating instances with specified configuration.
      *
      * @param config
      */
-    protected MessagePackSerializerFactory(SerializerFactoryConfig config)
+    public MessagePackSerializerFactory(SerializerFactoryConfig config)
     {
         super(config);
     }
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
@@ -655,7 +655,7 @@ public void testNonStringKey()
 
             ObjectMapper objectMapper = new ObjectMapper(new MessagePackFactory());
             if (mapHolder instanceof NonStringKeyMapHolderWithoutAnnotation) {
-                objectMapper.setSerializerFactory(new MessagePackSerializerFactory(null));
+                objectMapper.setSerializerFactory(new MessagePackSerializerFactory());
             }
 
             byte[] bytes = objectMapper.writeValueAsBytes(mapHolder);

Original file line number	Diff line number	Diff line change
`@@ -24,12 +24,20 @@`
`24`	`24`	`public class MessagePackSerializerFactory`
`25`	`25`	`extends BeanSerializerFactory`
`26`	`26`	`{`
	`27`	`+ /**`
	`28`	`+ * Constructor for creating instances without configuration.`
	`29`	`+ */`
	`30`	`+ public MessagePackSerializerFactory()`
	`31`	`+ {`
	`32`	`+ super(null);`
	`33`	`+ }`
	`34`	`+`
`27`	`35`	`/**`
`28`	`36`	`* Constructor for creating instances with specified configuration.`
`29`	`37`	`*`
`30`	`38`	`* @param config`
`31`	`39`	`*/`
`32`		`- protected MessagePackSerializerFactory(SerializerFactoryConfig config)`
	`40`	`+ public MessagePackSerializerFactory(SerializerFactoryConfig config)`
`33`	`41`	`{`
`34`	`42`	`super(config);`
`35`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -655,7 +655,7 @@ public void testNonStringKey()`
`655`	`655`
`656`	`656`	`ObjectMapper objectMapper = new ObjectMapper(new MessagePackFactory());`
`657`	`657`	`if (mapHolder instanceof NonStringKeyMapHolderWithoutAnnotation) {`
`658`		`- objectMapper.setSerializerFactory(new MessagePackSerializerFactory(null));`
	`658`	`+ objectMapper.setSerializerFactory(new MessagePackSerializerFactory());`
`659`	`659`	`}`
`660`	`660`
`661`	`661`	`byte[] bytes = objectMapper.writeValueAsBytes(mapHolder);`