aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/com
diff options
context:
space:
mode:
authorTatu Saloranta <tatu.saloranta@iki.fi>2020-07-02 15:19:43 -0700
committerTatu Saloranta <tatu.saloranta@iki.fi>2020-07-02 15:19:43 -0700
commitca417a16753fe626814ba1b41195ebe990e9051c (patch)
treeaee6bdb8653bb01c1d6db1e7fb7b3889b3d5ab59 /src/main/java/com
parentd16b8b1e0c70707ec294e4b0515ac316491ac24e (diff)
downloadjackson-databind-ca417a16753fe626814ba1b41195ebe990e9051c.tar.gz
Fix first part of #2783 (parser initialization)
Diffstat (limited to 'src/main/java/com')
-rw-r--r--src/main/java/com/fasterxml/jackson/databind/ObjectMapper.java44
-rw-r--r--src/main/java/com/fasterxml/jackson/databind/ObjectReader.java44
2 files changed, 66 insertions, 22 deletions
diff --git a/src/main/java/com/fasterxml/jackson/databind/ObjectMapper.java b/src/main/java/com/fasterxml/jackson/databind/ObjectMapper.java
index 3ed65ecac..382f33cb6 100644
--- 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 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;
}
/**
@@ -1196,7 +1198,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;
}
/**
@@ -1209,7 +1213,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;
}
/**
@@ -1222,7 +1228,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;
}
/**
@@ -1235,7 +1243,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;
}
/**
@@ -1248,7 +1258,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;
}
/**
@@ -1261,7 +1273,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;
}
/**
@@ -1274,7 +1288,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;
}
/**
@@ -1287,7 +1303,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;
}
/**
@@ -1300,7 +1318,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;
}
/**
@@ -1312,7 +1332,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 7d59a492b..483e55338 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;
}
/*