Merge branch '2.11' into 2.12

3 files changed, 68 insertions, 24 deletions

diff --git a/src/main/java/com/fasterxml/jackson/databind/ObjectMapper.java b/src/main/java/com/fasterxml/jackson/databind/ObjectMapper.java
index ab273ffc1..275411ba4 100644
--- a/src/main/java/com/fasterxml/jackson/databind/ObjectMapper.java
+++ b/src/main/java/com/fasterxml/jackson/databind/ObjectMapper.java
@@ -1197,7 +1197,9 @@ public class ObjectMapper
      */
     public JsonParser createParser(File src) throws IOException {
         _assertNotNull("src", src);
-        return _jsonFactory.createParser(src);
+        JsonParser p = _jsonFactory.createParser(src);
+        _deserializationConfig.initialize(p);
+        return p;
     }
 
     /**
@@ -1210,7 +1212,9 @@ public class ObjectMapper
      */
     public JsonParser createParser(URL src) throws IOException {
         _assertNotNull("src", src);
-        return _jsonFactory.createParser(src);
+        JsonParser p = _jsonFactory.createParser(src);
+        _deserializationConfig.initialize(p);
+        return p;
     }
 
     /**
@@ -1223,7 +1227,9 @@ public class ObjectMapper
      */
     public JsonParser createParser(InputStream in) throws IOException {
         _assertNotNull("in", in);
-        return _jsonFactory.createParser(in);
+        JsonParser p = _jsonFactory.createParser(in);
+        _deserializationConfig.initialize(p);
+        return p;
     }
 
     /**
@@ -1236,7 +1242,9 @@ public class ObjectMapper
      */
     public JsonParser createParser(Reader r) throws IOException {
         _assertNotNull("r", r);
-        return _jsonFactory.createParser(r);
+        JsonParser p = _jsonFactory.createParser(r);
+        _deserializationConfig.initialize(p);
+        return p;
     }
 
     /**
@@ -1249,7 +1257,9 @@ public class ObjectMapper
      */
     public JsonParser createParser(byte[] content) throws IOException {
         _assertNotNull("content", content);
-        return _jsonFactory.createParser(content);
+        JsonParser p = _jsonFactory.createParser(content);
+        _deserializationConfig.initialize(p);
+        return p;
     }
 
     /**
@@ -1262,7 +1272,9 @@ public class ObjectMapper
      */
     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;
     }
 
     /**
@@ -1275,7 +1287,9 @@ public class ObjectMapper
      */
     public JsonParser createParser(String content) throws IOException {
         _assertNotNull("content", content);
-        return _jsonFactory.createParser(content);
+        JsonParser p = _jsonFactory.createParser(content);
+        _deserializationConfig.initialize(p);
+        return p;
     }
 
     /**
@@ -1288,7 +1302,9 @@ public class ObjectMapper
      */
     public JsonParser createParser(char[] content) throws IOException {
         _assertNotNull("content", content);
-        return _jsonFactory.createParser(content);
+        JsonParser p = _jsonFactory.createParser(content);
+        _deserializationConfig.initialize(p);
+        return p;
     }
 
     /**
@@ -1301,7 +1317,9 @@ public class ObjectMapper
      */
     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;
     }
 
     /**
@@ -1314,7 +1332,9 @@ public class ObjectMapper
      */
     public JsonParser createParser(DataInput content) throws IOException {
         _assertNotNull("content", content);
-        return _jsonFactory.createParser(content);
+        JsonParser p = _jsonFactory.createParser(content);
+        _deserializationConfig.initialize(p);
+        return p;
     }
 
     /**
@@ -1326,7 +1346,9 @@ public class ObjectMapper
      * @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
index 313f39276..ac7a6a978 100644
--- 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 class ObjectReader
      */
     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 class ObjectReader
      */
     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 class ObjectReader
      */
     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 class ObjectReader
      */
     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 class ObjectReader
      */
     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 class ObjectReader
      */
     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 class ObjectReader
      */
     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 class ObjectReader
      */
     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 class ObjectReader
      */
     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 class ObjectReader
      */
     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 class ObjectReader
      * @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
index 794ee0366..13559a934 100644
--- 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 class ObjectReaderTest extends BaseMapTest
         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 class ObjectReaderTest extends BaseMapTest
         }
     }
 
-    public void testGeneratorConfigViaMapper() throws Exception
+    public void testGeneratorConfigViaReader() throws Exception
     {
         StringWriter sw = new StringWriter();
         try (JsonGenerator g = MAPPER.writer()