GitHub-Spring
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Polish

pull/1697/merge
Rossen Stoyanchev 8 years ago
parent
6959e66b25
commit
3bfa56dff2
2 changed files with 55 additions and 56 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      spring-web/src/main/java/org/springframework/http/codec/json/Jackson2Tokenizer.java
  2. 102
      spring-web/src/test/java/org/springframework/http/codec/json/Jackson2TokenizerTests.java

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

@ -68,8 +68,7 @@ class Jackson2Tokenizer { @@ -68,8 +68,7 @@ class Jackson2Tokenizer {
}
/**
* Tokenize the given {@link DataBuffer} flux into a {@link TokenBuffer} flux, given the
* parameters.
* Tokenize the given {@code Flux<DataBuffer>} into {@code Flux<TokenBuffer>}.
* @param dataBuffers the source data buffers
* @param jsonFactory the factory to use
* @param tokenizeArrayElements if {@code true} and the "top level" JSON
@ -79,10 +78,10 @@ class Jackson2Tokenizer { @@ -79,10 +78,10 @@ class Jackson2Tokenizer {
*/
public static Flux<TokenBuffer> tokenize(Flux<DataBuffer> dataBuffers, JsonFactory jsonFactory,
boolean tokenizeArrayElements) {
try {
Jackson2Tokenizer tokenizer =
new Jackson2Tokenizer(jsonFactory.createNonBlockingByteArrayParser(),
tokenizeArrayElements);
JsonParser parser = jsonFactory.createNonBlockingByteArrayParser();
Jackson2Tokenizer tokenizer = new Jackson2Tokenizer(parser, tokenizeArrayElements);
return dataBuffers.flatMap(tokenizer::tokenize, Flux::error, tokenizer::endOfInput);
}
catch (IOException ex) {

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

@ -41,6 +41,7 @@ import static java.util.Collections.*; @@ -41,6 +41,7 @@ import static java.util.Collections.*;
/**
* @author Arjen Poutsma
* @author Rossen Stoyanchev
*/
public class Jackson2TokenizerTests extends AbstractDataBufferAllocatingTestCase {
@ -48,10 +49,11 @@ public class Jackson2TokenizerTests extends AbstractDataBufferAllocatingTestCase @@ -48,10 +49,11 @@ public class Jackson2TokenizerTests extends AbstractDataBufferAllocatingTestCase
private JsonFactory jsonFactory;
@Before
public void createParser() throws IOException {
jsonFactory = new JsonFactory();
this.objectMapper = new ObjectMapper(jsonFactory);
public void createParser() {
this.jsonFactory = new JsonFactory();
this.objectMapper = new ObjectMapper(this.jsonFactory);
}
@Test
@ -66,41 +68,44 @@ public class Jackson2TokenizerTests extends AbstractDataBufferAllocatingTestCase @@ -66,41 +68,44 @@ public class Jackson2TokenizerTests extends AbstractDataBufferAllocatingTestCase
singletonList("{\"foo\":\"foofoo\",\"bar\":\"barbar\"}"), false);
testTokenize(
singletonList("[{\"foo\": \"foofoo\", \"bar\": \"barbar\"},{\"foo\": \"foofoofoo\", \"bar\": \"barbarbar\"}]"),
singletonList("[{\"foo\": \"foofoo\", \"bar\": \"barbar\"},{\"foo\": \"foofoofoo\", \"bar\": \"barbarbar\"}]"), false);
singletonList("[" +
"{\"foo\": \"foofoo\", \"bar\": \"barbar\"}," +
"{\"foo\": \"foofoofoo\", \"bar\": \"barbarbar\"}]"),
singletonList("[" +
"{\"foo\": \"foofoo\", \"bar\": \"barbar\"}," +
"{\"foo\": \"foofoofoo\", \"bar\": \"barbarbar\"}]"), false);
testTokenize(
singletonList("[{\"foo\": \"bar\"},{\"foo\": \"baz\"}]"),
singletonList("[{\"foo\": \"bar\"},{\"foo\": \"baz\"}]"), false);
testTokenize(
asList("[{\"foo\": \"foofoo\", \"bar\"",
": \"barbar\"},{\"foo\": \"foofoofoo\", \"bar\": \"barbarbar\"}]"),
singletonList("[{\"foo\": \"foofoo\", \"bar\": \"barbar\"},{\"foo\": \"foofoofoo\", \"bar\": \"barbarbar\"}]"), false);
asList("[" +
"{\"foo\": \"foofoo\", \"bar\"", ": \"barbar\"}," +
"{\"foo\": \"foofoofoo\", \"bar\": \"barbarbar\"}]"),
singletonList("[" +
"{\"foo\": \"foofoo\", \"bar\": \"barbar\"}," +
"{\"foo\": \"foofoofoo\", \"bar\": \"barbarbar\"}]"), false);
testTokenize(
asList("[",
"{\"id\":1,\"name\":\"Robert\"}",
",",
"{\"id\":2,\"name\":\"Raide\"}",
",",
"{\"id\":3,\"name\":\"Ford\"}",
"]"),
singletonList("[{\"id\":1,\"name\":\"Robert\"},{\"id\":2,\"name\":\"Raide\"},{\"id\":3,\"name\":\"Ford\"}]"), false);
"{\"id\":1,\"name\":\"Robert\"}", ",",
"{\"id\":2,\"name\":\"Raide\"}", ",",
"{\"id\":3,\"name\":\"Ford\"}", "]"),
singletonList("[" +
"{\"id\":1,\"name\":\"Robert\"}," +
"{\"id\":2,\"name\":\"Raide\"}," +
"{\"id\":3,\"name\":\"Ford\"}]"), false);
// SPR-16166: top-level JSON values
testTokenize(asList("\"foo", "bar\"")
,singletonList("\"foobar\""), false);
testTokenize(asList("\"foo", "bar\""),singletonList("\"foobar\""), false);
testTokenize(asList("12", "34")
,singletonList("1234"), false);
testTokenize(asList("12", "34"),singletonList("1234"), false);
testTokenize(asList("12.", "34")
,singletonList("12.34"), false);
testTokenize(asList("12.", "34"),singletonList("12.34"), false);
// note that we do not test for null, true, or false, which are also valid top-level values,
// but are unsupported by JSONassert
}
@Test
@ -110,19 +115,20 @@ public class Jackson2TokenizerTests extends AbstractDataBufferAllocatingTestCase @@ -110,19 +115,20 @@ public class Jackson2TokenizerTests extends AbstractDataBufferAllocatingTestCase
singletonList("{\"foo\": \"foofoo\", \"bar\": \"barbar\"}"), true);
testTokenize(
asList("{\"foo\": \"foofoo\"",
", \"bar\": \"barbar\"}"),
asList("{\"foo\": \"foofoo\"", ", \"bar\": \"barbar\"}"),
singletonList("{\"foo\":\"foofoo\",\"bar\":\"barbar\"}"), true);
testTokenize(
singletonList("[{\"foo\": \"foofoo\", \"bar\": \"barbar\"},{\"foo\": \"foofoofoo\", \"bar\": \"barbarbar\"}]"),
asList("{\"foo\": \"foofoo\", \"bar\": \"barbar\"}",
singletonList("[" +
"{\"foo\": \"foofoo\", \"bar\": \"barbar\"}," +
"{\"foo\": \"foofoofoo\", \"bar\": \"barbarbar\"}]"),
asList(
"{\"foo\": \"foofoo\", \"bar\": \"barbar\"}",
"{\"foo\": \"foofoofoo\", \"bar\": \"barbarbar\"}"), true);
testTokenize(
singletonList("[{\"foo\": \"bar\"},{\"foo\": \"baz\"}]"),
asList("{\"foo\": \"bar\"}",
"{\"foo\": \"baz\"}"), true);
asList("{\"foo\": \"bar\"}", "{\"foo\": \"baz\"}"), true);
// SPR-15803: nested array
testTokenize(
@ -134,8 +140,7 @@ public class Jackson2TokenizerTests extends AbstractDataBufferAllocatingTestCase @@ -134,8 +140,7 @@ public class Jackson2TokenizerTests extends AbstractDataBufferAllocatingTestCase
asList(
"{\"id\":\"0\",\"start\":[-999999999,1,1],\"end\":[999999999,12,31]}",
"{\"id\":\"1\",\"start\":[-999999999,1,1],\"end\":[999999999,12,31]}",
"{\"id\":\"2\",\"start\":[-999999999,1,1],\"end\":[999999999,12,31]}"),
true);
"{\"id\":\"2\",\"start\":[-999999999,1,1],\"end\":[999999999,12,31]}"), true);
// SPR-15803: nested array, no top-level array
testTokenize(
@ -143,9 +148,11 @@ public class Jackson2TokenizerTests extends AbstractDataBufferAllocatingTestCase @@ -143,9 +148,11 @@ public class Jackson2TokenizerTests extends AbstractDataBufferAllocatingTestCase
singletonList("{\"speakerIds\":[\"tastapod\"],\"language\":\"ENGLISH\"}"), true);
testTokenize(
asList("[{\"foo\": \"foofoo\", \"bar\"",
": \"barbar\"},{\"foo\": \"foofoofoo\", \"bar\": \"barbarbar\"}]"),
asList("{\"foo\": \"foofoo\", \"bar\": \"barbar\"}",
asList("[" +
"{\"foo\": \"foofoo\", \"bar\"", ": \"barbar\"}," +
"{\"foo\": \"foofoofoo\", \"bar\": \"barbarbar\"}]"),
asList(
"{\"foo\": \"foofoo\", \"bar\": \"barbar\"}",
"{\"foo\": \"foofoofoo\", \"bar\": \"barbarbar\"}"), true);
testTokenize(
@ -161,18 +168,14 @@ public class Jackson2TokenizerTests extends AbstractDataBufferAllocatingTestCase @@ -161,18 +168,14 @@ public class Jackson2TokenizerTests extends AbstractDataBufferAllocatingTestCase
"{\"id\":3,\"name\":\"Ford\"}"), true);
// SPR-16166: top-level JSON values
testTokenize(asList("\"foo", "bar\"")
,singletonList("\"foobar\""), true);
testTokenize(asList("\"foo", "bar\""),singletonList("\"foobar\""), true);
testTokenize(asList("12", "34")
,singletonList("1234"), true);
testTokenize(asList("12", "34"),singletonList("1234"), true);
testTokenize(asList("12.", "34")
,singletonList("12.34"), true);
testTokenize(asList("12.", "34"),singletonList("12.34"), true);
// SPR-16407
testTokenize(asList("[1", ",2,", "3]"),
asList("1", "2", "3"), true);
testTokenize(asList("[1", ",2,", "3]"), asList("1", "2", "3"), true);
}
@Test(expected = DecodingException.class) // SPR-16521
@ -184,11 +187,11 @@ public class Jackson2TokenizerTests extends AbstractDataBufferAllocatingTestCase @@ -184,11 +187,11 @@ public class Jackson2TokenizerTests extends AbstractDataBufferAllocatingTestCase
private void testTokenize(List<String> source, List<String> expected, boolean tokenizeArrayElements) {
Flux<DataBuffer> sourceFlux = Flux.fromIterable(source)
.map(this::stringBuffer);
Flux<TokenBuffer> tokenBufferFlux =
Jackson2Tokenizer.tokenize(sourceFlux, this.jsonFactory, tokenizeArrayElements);
Flux<TokenBuffer> tokenBufferFlux = Jackson2Tokenizer.tokenize(
Flux.fromIterable(source).map(this::stringBuffer),
this.jsonFactory,
tokenizeArrayElements);
Flux<String> result = tokenBufferFlux
.map(tokenBuffer -> {
@ -202,17 +205,16 @@ public class Jackson2TokenizerTests extends AbstractDataBufferAllocatingTestCase @@ -202,17 +205,16 @@ public class Jackson2TokenizerTests extends AbstractDataBufferAllocatingTestCase
});
StepVerifier.FirstStep<String> builder = StepVerifier.create(result);
for (String s : expected) {
builder.assertNext(new JSONAssertConsumer(s));
}
expected.forEach(s -> builder.assertNext(new JSONAssertConsumer(s)));
builder.verifyComplete();
}
private static class JSONAssertConsumer implements Consumer<String> {
private final String expected;
public JSONAssertConsumer(String expected) {
JSONAssertConsumer(String expected) {
this.expected = expected;
}
@ -226,6 +228,4 @@ public class Jackson2TokenizerTests extends AbstractDataBufferAllocatingTestCase @@ -226,6 +228,4 @@ public class Jackson2TokenizerTests extends AbstractDataBufferAllocatingTestCase
}
}
}
}
Write Preview
Loading…
Cancel
Save