root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Jackson2Tokenizer passes DeserializationContext into all TokenBuffers 

See gh-22510
This commit is contained in:
Juergen Hoeller 2019-03-05 13:47:26 +01:00
parent 216e4eeba4
commit d034c053b3
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-web/src/main/java/org/springframework/http/codec/json/Jackson2Tokenizer.java
View File

@ -48,6 +48,8 @@ final class Jackson2Tokenizer {
private final JsonParser parser; private final JsonParser parser;
private final DeserializationContext deserializationContext;
private final boolean tokenizeArrayElements; private final boolean tokenizeArrayElements;
private TokenBuffer tokenBuffer; private TokenBuffer tokenBuffer;
@ -65,6 +67,7 @@ final class Jackson2Tokenizer {
JsonParser parser, DeserializationContext deserializationContext, boolean tokenizeArrayElements) { JsonParser parser, DeserializationContext deserializationContext, boolean tokenizeArrayElements) {
this.parser = parser; this.parser = parser;
this.deserializationContext = deserializationContext;
this.tokenizeArrayElements = tokenizeArrayElements; this.tokenizeArrayElements = tokenizeArrayElements;
this.tokenBuffer = new TokenBuffer(parser, deserializationContext); this.tokenBuffer = new TokenBuffer(parser, deserializationContext);
this.inputFeeder = (ByteArrayFeeder) this.parser.getNonBlockingInputFeeder(); this.inputFeeder = (ByteArrayFeeder) this.parser.getNonBlockingInputFeeder();
@ -144,7 +147,7 @@ final class Jackson2Tokenizer {
if ((token.isStructEnd() || token.isScalarValue()) && this.objectDepth == 0 && this.arrayDepth == 0) { if ((token.isStructEnd() || token.isScalarValue()) && this.objectDepth == 0 && this.arrayDepth == 0) {
result.add(this.tokenBuffer); result.add(this.tokenBuffer);
this.tokenBuffer = new TokenBuffer(this.parser); this.tokenBuffer = new TokenBuffer(this.parser, this.deserializationContext);
} }
} }
@ -157,7 +160,7 @@ final class Jackson2Tokenizer {
if (this.objectDepth == 0 && (this.arrayDepth == 0 || this.arrayDepth == 1) && if (this.objectDepth == 0 && (this.arrayDepth == 0 || this.arrayDepth == 1) &&
(token == JsonToken.END_OBJECT || token.isScalarValue())) { (token == JsonToken.END_OBJECT || token.isScalarValue())) {
result.add(this.tokenBuffer); result.add(this.tokenBuffer);
this.tokenBuffer = new TokenBuffer(this.parser); this.tokenBuffer = new TokenBuffer(this.parser, this.deserializationContext);
} }
} }