Use JsonFactory's _generatorFeatures and _parserFeatures in MessagePackFactory

komamitsu · komamitsu · commit 72cfaa74fd8f · 2015-05-28T00:27:11.000+09: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
@@ -23,12 +23,10 @@
 
 public class MessagePackFactory extends JsonFactory {
     private static final long serialVersionUID = 2578263992015504347L;
-    protected int messagePackGeneratorFeature = 0;
-    protected int messagePackParserFeature = 0;
 
     @Override
     public JsonGenerator createGenerator(OutputStream out, JsonEncoding enc) throws IOException {
-        return new MessagePackGenerator(messagePackGeneratorFeature, _objectCodec, out);
+        return new MessagePackGenerator(_generatorFeatures, _objectCodec, out);
     }
 
     @Override
@@ -55,7 +53,7 @@ public JsonParser createParser(InputStream in) throws IOException, JsonParseExce
 
     @Override
     protected MessagePackParser _createParser(InputStream in, IOContext ctxt) throws IOException {
-        MessagePackParser parser = new MessagePackParser(ctxt, messagePackParserFeature, in);
+        MessagePackParser parser = new MessagePackParser(ctxt, _parserFeatures, in);
         return parser;
     }
 
@@ -64,7 +62,7 @@ protected JsonParser _createParser(byte[] data, int offset, int len, IOContext c
         if (offset != 0 || len != data.length) {
             data = Arrays.copyOfRange(data, offset, offset + len);
         }
-        MessagePackParser parser = new MessagePackParser(ctxt, messagePackParserFeature, data);
+        MessagePackParser parser = new MessagePackParser(ctxt, _parserFeatures, data);
         return parser;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -23,12 +23,10 @@`
`23`	`23`
`24`	`24`	`public class MessagePackFactory extends JsonFactory {`
`25`	`25`	`private static final long serialVersionUID = 2578263992015504347L;`
`26`		`- protected int messagePackGeneratorFeature = 0;`
`27`		`- protected int messagePackParserFeature = 0;`
`28`	`26`
`29`	`27`	`@Override`
`30`	`28`	`public JsonGenerator createGenerator(OutputStream out, JsonEncoding enc) throws IOException {`
`31`		`- return new MessagePackGenerator(messagePackGeneratorFeature, _objectCodec, out);`
	`29`	`+ return new MessagePackGenerator(_generatorFeatures, _objectCodec, out);`
`32`	`30`	`}`
`33`	`31`
`34`	`32`	`@Override`
`@@ -55,7 +53,7 @@ public JsonParser createParser(InputStream in) throws IOException, JsonParseExce`
`55`	`53`
`56`	`54`	`@Override`
`57`	`55`	`protected MessagePackParser _createParser(InputStream in, IOContext ctxt) throws IOException {`
`58`		`- MessagePackParser parser = new MessagePackParser(ctxt, messagePackParserFeature, in);`
	`56`	`+ MessagePackParser parser = new MessagePackParser(ctxt, _parserFeatures, in);`
`59`	`57`	`return parser;`
`60`	`58`	`}`
`61`	`59`
`@@ -64,7 +62,7 @@ protected JsonParser _createParser(byte[] data, int offset, int len, IOContext c`
`64`	`62`	`if (offset != 0 \|\| len != data.length) {`
`65`	`63`	`data = Arrays.copyOfRange(data, offset, offset + len);`
`66`	`64`	`}`
`67`		`- MessagePackParser parser = new MessagePackParser(ctxt, messagePackParserFeature, data);`
	`65`	`+ MessagePackParser parser = new MessagePackParser(ctxt, _parserFeatures, data);`
`68`	`66`	`return parser;`
`69`	`67`	`}`
`70`	`68`	`}`