Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Handle nested w/o top-level array in Jackson2JsonTokenizer

Browse Source 
Issue: SPR-15803
This commit is contained in:
Rossen Stoyanchev
2017-07-21 13:43:38 +02:00
parent bd0de7086e
commit 14ccb38523
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -152,8 +152,8 @@ class Jackson2Tokenizer implements Function<DataBuffer, Flux<TokenBuffer>> {
} }
private boolean isTopLevelArrayToken(JsonToken token) { private boolean isTopLevelArrayToken(JsonToken token) {
return (token == JsonToken.START_ARRAY && this.arrayDepth == 1) || return this.objectDepth == 0 && ((token == JsonToken.START_ARRAY && this.arrayDepth == 1) ||
(token == JsonToken.END_ARRAY && this.arrayDepth == 0); (token == JsonToken.END_ARRAY && this.arrayDepth == 0));
} }
public void endOfInput() { public void endOfInput() {

9
spring-web/src/test/java/org/springframework/http/codec/json/Jackson2TokenizerTests.java
View File

@@ -57,7 +57,7 @@ public class Jackson2TokenizerTests extends AbstractDataBufferAllocatingTestCase
} }
@Test @Test
public void noTokenizeArrayElements() { public void doNotTokenizeArrayElements() {
this.tokenizer = new Jackson2Tokenizer(this.jsonParser, false); this.tokenizer = new Jackson2Tokenizer(this.jsonParser, false);
testTokenize( testTokenize(
@@ -116,7 +116,7 @@ public class Jackson2TokenizerTests extends AbstractDataBufferAllocatingTestCase
asList("{\"foo\": \"bar\"}", asList("{\"foo\": \"bar\"}",
"{\"foo\": \"baz\"}")); "{\"foo\": \"baz\"}"));
// SPR-15803 // SPR-15803: nested array
testTokenize( testTokenize(
singletonList("[" + singletonList("[" +
"{\"id\":\"0\",\"start\":[-999999999,1,1],\"end\":[999999999,12,31]}," + "{\"id\":\"0\",\"start\":[-999999999,1,1],\"end\":[999999999,12,31]}," +
@@ -129,6 +129,11 @@ public class Jackson2TokenizerTests extends AbstractDataBufferAllocatingTestCase
"{\"id\":\"2\",\"start\":[-999999999,1,1],\"end\":[999999999,12,31]}") "{\"id\":\"2\",\"start\":[-999999999,1,1],\"end\":[999999999,12,31]}")
); );
// SPR-15803: nested array, no top-level array
testTokenize(
singletonList("{\"speakerIds\":[\"tastapod\"],\"language\":\"ENGLISH\"}"),
singletonList("{\"speakerIds\":[\"tastapod\"],\"language\":\"ENGLISH\"}"));
testTokenize( testTokenize(
asList("[{\"foo\": \"foofoo\", \"bar\"", asList("[{\"foo\": \"foofoo\", \"bar\"",
": \"barbar\"},{\"foo\": \"foofoofoo\", \"bar\": \"barbarbar\"}]"), ": \"barbar\"},{\"foo\": \"foofoofoo\", \"bar\": \"barbarbar\"}]"),