Fix first part of #2783 (parser initialization)

cowtowncoder · cowtowncoder · commit ca417a16753f · 2020-07-02T15:19:43.000-07:00
diff --git a/src/main/java/com/fasterxml/jackson/databind/ObjectMapper.java b/src/main/java/com/fasterxml/jackson/databind/ObjectMapper.java
@@ -1183,7 +1183,9 @@ public JsonGenerator createGenerator(DataOutput out) throws IOException {
      */
     public JsonParser createParser(File src) throws IOException {
         _assertNotNull("src", src);
-        return _jsonFactory.createParser(src);
+        JsonParser p = _jsonFactory.createParser(src);
+        _deserializationConfig.initialize(p);
+        return p;
     }
 
     /**
@@ -1196,7 +1198,9 @@ public JsonParser createParser(File src) throws IOException {
      */
     public JsonParser createParser(URL src) throws IOException {
         _assertNotNull("src", src);
-        return _jsonFactory.createParser(src);
+        JsonParser p = _jsonFactory.createParser(src);
+        _deserializationConfig.initialize(p);
+        return p;
     }
 
     /**
@@ -1209,7 +1213,9 @@ public JsonParser createParser(URL src) throws IOException {
      */
     public JsonParser createParser(InputStream in) throws IOException {
         _assertNotNull("in", in);
-        return _jsonFactory.createParser(in);
+        JsonParser p = _jsonFactory.createParser(in);
+        _deserializationConfig.initialize(p);
+        return p;
     }
 
     /**
@@ -1222,7 +1228,9 @@ public JsonParser createParser(InputStream in) throws IOException {
      */
     public JsonParser createParser(Reader r) throws IOException {
         _assertNotNull("r", r);
-        return _jsonFactory.createParser(r);
+        JsonParser p = _jsonFactory.createParser(r);
+        _deserializationConfig.initialize(p);
+        return p;
     }
 
     /**
@@ -1235,7 +1243,9 @@ public JsonParser createParser(Reader r) throws IOException {
      */
     public JsonParser createParser(byte[] content) throws IOException {
         _assertNotNull("content", content);
-        return _jsonFactory.createParser(content);
+        JsonParser p = _jsonFactory.createParser(content);
+        _deserializationConfig.initialize(p);
+        return p;
     }
 
     /**
@@ -1248,7 +1258,9 @@ public JsonParser createParser(byte[] content) throws IOException {
      */
     public JsonParser createParser(byte[] content, int offset, int len) throws IOException {
         _assertNotNull("content", content);
-        return _jsonFactory.createParser(content, offset, len);
+        JsonParser p = _jsonFactory.createParser(content, offset, len);
+        _deserializationConfig.initialize(p);
+        return p;
     }
 
     /**
@@ -1261,7 +1273,9 @@ public JsonParser createParser(byte[] content, int offset, int len) throws IOExc
      */
     public JsonParser createParser(String content) throws IOException {
         _assertNotNull("content", content);
-        return _jsonFactory.createParser(content);
+        JsonParser p = _jsonFactory.createParser(content);
+        _deserializationConfig.initialize(p);
+        return p;
     }
 
     /**
@@ -1274,7 +1288,9 @@ public JsonParser createParser(String content) throws IOException {
      */
     public JsonParser createParser(char[] content) throws IOException {
         _assertNotNull("content", content);
-        return _jsonFactory.createParser(content);
+        JsonParser p = _jsonFactory.createParser(content);
+        _deserializationConfig.initialize(p);
+        return p;
     }
 
     /**
@@ -1287,7 +1303,9 @@ public JsonParser createParser(char[] content) throws IOException {
      */
     public JsonParser createParser(char[] content, int offset, int len) throws IOException {
         _assertNotNull("content", content);
-        return _jsonFactory.createParser(content, offset, len);
+        JsonParser p = _jsonFactory.createParser(content, offset, len);
+        _deserializationConfig.initialize(p);
+        return p;
     }
 
     /**
@@ -1300,7 +1318,9 @@ public JsonParser createParser(char[] content, int offset, int len) throws IOExc
      */
     public JsonParser createParser(DataInput content) throws IOException {
         _assertNotNull("content", content);
-        return _jsonFactory.createParser(content);
+        JsonParser p = _jsonFactory.createParser(content);
+        _deserializationConfig.initialize(p);
+        return p;
     }
 
     /**
@@ -1312,7 +1332,9 @@ public JsonParser createParser(DataInput content) throws IOException {
      * @since 2.11
      */
     public JsonParser createNonBlockingByteArrayParser() throws IOException {
-        return _jsonFactory.createNonBlockingByteArrayParser();
+        JsonParser p = _jsonFactory.createNonBlockingByteArrayParser();
+        _deserializationConfig.initialize(p);
+        return p;
     }
 
     /*
diff --git a/src/main/java/com/fasterxml/jackson/databind/ObjectReader.java b/src/main/java/com/fasterxml/jackson/databind/ObjectReader.java
@@ -1024,7 +1024,9 @@ public JavaType getValueType() {
      */
     public JsonParser createParser(File src) throws IOException {
         _assertNotNull("src", src);
-        return _parserFactory.createParser(src);
+        JsonParser p = _parserFactory.createParser(src);
+        _config.initialize(p);
+        return p;
     }
 
     /**
@@ -1037,7 +1039,9 @@ public JsonParser createParser(File src) throws IOException {
      */
     public JsonParser createParser(URL src) throws IOException {
         _assertNotNull("src", src);
-        return _parserFactory.createParser(src);
+        JsonParser p = _parserFactory.createParser(src);
+        _config.initialize(p);
+        return p;
     }
 
     /**
@@ -1050,7 +1054,9 @@ public JsonParser createParser(URL src) throws IOException {
      */
     public JsonParser createParser(InputStream in) throws IOException {
         _assertNotNull("in", in);
-        return _parserFactory.createParser(in);
+        JsonParser p = _parserFactory.createParser(in);
+        _config.initialize(p);
+        return p;
     }
 
     /**
@@ -1063,7 +1069,9 @@ public JsonParser createParser(InputStream in) throws IOException {
      */
     public JsonParser createParser(Reader r) throws IOException {
         _assertNotNull("r", r);
-        return _parserFactory.createParser(r);
+        JsonParser p = _parserFactory.createParser(r);
+        _config.initialize(p);
+        return p;
     }
 
     /**
@@ -1076,7 +1084,9 @@ public JsonParser createParser(Reader r) throws IOException {
      */
     public JsonParser createParser(byte[] content) throws IOException {
         _assertNotNull("content", content);
-        return _parserFactory.createParser(content);
+        JsonParser p = _parserFactory.createParser(content);
+        _config.initialize(p);
+        return p;
     }
 
     /**
@@ -1089,7 +1099,9 @@ public JsonParser createParser(byte[] content) throws IOException {
      */
     public JsonParser createParser(byte[] content, int offset, int len) throws IOException {
         _assertNotNull("content", content);
-        return _parserFactory.createParser(content, offset, len);
+        JsonParser p = _parserFactory.createParser(content, offset, len);
+        _config.initialize(p);
+        return p;
     }
 
     /**
@@ -1102,7 +1114,9 @@ public JsonParser createParser(byte[] content, int offset, int len) throws IOExc
      */
     public JsonParser createParser(String content) throws IOException {
         _assertNotNull("content", content);
-        return _parserFactory.createParser(content);
+        JsonParser p = _parserFactory.createParser(content);
+        _config.initialize(p);
+        return p;
     }
 
     /**
@@ -1115,7 +1129,9 @@ public JsonParser createParser(String content) throws IOException {
      */
     public JsonParser createParser(char[] content) throws IOException {
         _assertNotNull("content", content);
-        return _parserFactory.createParser(content);
+        JsonParser p = _parserFactory.createParser(content);
+        _config.initialize(p);
+        return p;
     }
 
     /**
@@ -1128,7 +1144,9 @@ public JsonParser createParser(char[] content) throws IOException {
      */
     public JsonParser createParser(char[] content, int offset, int len) throws IOException {
         _assertNotNull("content", content);
-        return _parserFactory.createParser(content, offset, len);
+        JsonParser p = _parserFactory.createParser(content, offset, len);
+        _config.initialize(p);
+        return p;
     }
 
     /**
@@ -1141,7 +1159,9 @@ public JsonParser createParser(char[] content, int offset, int len) throws IOExc
      */
     public JsonParser createParser(DataInput content) throws IOException {
         _assertNotNull("content", content);
-        return _parserFactory.createParser(content);
+        JsonParser p = _parserFactory.createParser(content);
+        _config.initialize(p);
+        return p;
     }
 
     /**
@@ -1153,7 +1173,9 @@ public JsonParser createParser(DataInput content) throws IOException {
      * @since 2.11
      */
     public JsonParser createNonBlockingByteArrayParser() throws IOException {
-        return _parserFactory.createNonBlockingByteArrayParser();
+        JsonParser p = _parserFactory.createNonBlockingByteArrayParser();
+        _config.initialize(p);
+        return p;
     }
 
     /*
diff --git a/src/test/java/com/fasterxml/jackson/databind/ObjectReaderTest.java b/src/test/java/com/fasterxml/jackson/databind/ObjectReaderTest.java
@@ -286,7 +286,7 @@ public void testGetValueType() throws Exception
         assertEquals(MAPPER.constructType(String.class), r.getValueType());
     }
 
-    public void testParserConfigViaMapper() throws Exception
+    public void testParserConfigViaReader() throws Exception
     {
         try (JsonParser p = MAPPER.reader()
                 .with(StreamReadFeature.STRICT_DUPLICATE_DETECTION)
@@ -301,7 +301,7 @@ public void testParserConfigViaMapper() throws Exception
         }
     }
 
-    public void testGeneratorConfigViaMapper() throws Exception
+    public void testGeneratorConfigViaReader() throws Exception
     {
         StringWriter sw = new StringWriter();
         try (JsonGenerator g = MAPPER.writer()

Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,7 @@ public void testGetValueType() throws Exception`
`286`	`286`	`assertEquals(MAPPER.constructType(String.class), r.getValueType());`
`287`	`287`	`}`
`288`	`288`
`289`		`- public void testParserConfigViaMapper() throws Exception`
	`289`	`+ public void testParserConfigViaReader() throws Exception`
`290`	`290`	`{`
`291`	`291`	`try (JsonParser p = MAPPER.reader()`
`292`	`292`	`.with(StreamReadFeature.STRICT_DUPLICATE_DETECTION)`
`@@ -301,7 +301,7 @@ public void testParserConfigViaMapper() throws Exception`
`301`	`301`	`}`
`302`	`302`	`}`
`303`	`303`
`304`		`- public void testGeneratorConfigViaMapper() throws Exception`
	`304`	`+ public void testGeneratorConfigViaReader() throws Exception`
`305`	`305`	`{`
`306`	`306`	`StringWriter sw = new StringWriter();`
`307`	`307`	`try (JsonGenerator g = MAPPER.writer()`