Leverage Jackson non-blocking parser
This commit introduces the Jackson2Tokenizer as a replacement for the JsonObjectDecoder. The latter was dropped because of its complexity, and hard dependency on Netty's ByteBuf. The new Jackson2Tokenizer leverages the new non-blocking JSON parser, using it to parse the incoming data buffers into TokenBuffers, each token buffer representing one JSON object. As with JsonObjectDecoder, it also supports streaming individual JSON array elements. Issue: SPR-14528
This commit is contained in:
Arjen Poutsma
@@ -0,0 +1,181 @@
|
||||
/*
|
||||
* Copyright 2002-2017 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.http.codec.json;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.List;
|
||||
import java.util.function.Consumer;
|
||||
|
||||
import com.fasterxml.jackson.core.JsonFactory;
|
||||
import com.fasterxml.jackson.core.JsonParser;
|
||||
import com.fasterxml.jackson.core.TreeNode;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import org.eclipse.jetty.io.RuntimeIOException;
|
||||
import org.json.JSONException;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.skyscreamer.jsonassert.JSONAssert;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.test.StepVerifier;
|
||||
|
||||
import org.springframework.core.io.buffer.AbstractDataBufferAllocatingTestCase;
|
||||
import org.springframework.core.io.buffer.DataBuffer;
|
||||
|
||||
import static java.util.Arrays.asList;
|
||||
import static java.util.Collections.singletonList;
|
||||
|
||||
/**
|
||||
* @author Arjen Poutsma
|
||||
*/
|
||||
public class Jackson2TokenizerTests extends AbstractDataBufferAllocatingTestCase {
|
||||
|
||||
private JsonParser jsonParser;
|
||||
|
||||
private Jackson2Tokenizer tokenizer;
|
||||
|
||||
private ObjectMapper objectMapper;
|
||||
|
||||
@Before
|
||||
public void createParser() throws IOException {
|
||||
JsonFactory factory = new JsonFactory();
|
||||
this.jsonParser = factory.createNonBlockingByteArrayParser();
|
||||
this.objectMapper = new ObjectMapper(factory);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void noTokenizeArrayElements() {
|
||||
this.tokenizer = new Jackson2Tokenizer(this.jsonParser, false);
|
||||
|
||||
testTokenize(
|
||||
singletonList("{\"foo\": \"foofoo\", \"bar\": \"barbar\"}"),
|
||||
singletonList("{\"foo\": \"foofoo\", \"bar\": \"barbar\"}"));
|
||||
|
||||
testTokenize(
|
||||
asList("{\"foo\": \"foofoo\"",
|
||||
", \"bar\": \"barbar\"}"),
|
||||
singletonList("{\"foo\":\"foofoo\",\"bar\":\"barbar\"}"));
|
||||
|
||||
testTokenize(
|
||||
singletonList("[{\"foo\": \"foofoo\", \"bar\": \"barbar\"},{\"foo\": \"foofoofoo\", \"bar\": \"barbarbar\"}]"),
|
||||
singletonList("[{\"foo\": \"foofoo\", \"bar\": \"barbar\"},{\"foo\": \"foofoofoo\", \"bar\": \"barbarbar\"}]"));
|
||||
|
||||
testTokenize(
|
||||
singletonList("[{\"foo\": \"bar\"},{\"foo\": \"baz\"}]"),
|
||||
singletonList("[{\"foo\": \"bar\"},{\"foo\": \"baz\"}]"));
|
||||
|
||||
testTokenize(
|
||||
asList("[{\"foo\": \"foofoo\", \"bar\"",
|
||||
": \"barbar\"},{\"foo\": \"foofoofoo\", \"bar\": \"barbarbar\"}]"),
|
||||
singletonList("[{\"foo\": \"foofoo\", \"bar\": \"barbar\"},{\"foo\": \"foofoofoo\", \"bar\": \"barbarbar\"}]"));
|
||||
|
||||
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\"}]"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void tokenizeArrayElements() {
|
||||
this.tokenizer = new Jackson2Tokenizer(this.jsonParser, true);
|
||||
|
||||
testTokenize(
|
||||
singletonList("{\"foo\": \"foofoo\", \"bar\": \"barbar\"}"),
|
||||
singletonList("{\"foo\": \"foofoo\", \"bar\": \"barbar\"}"));
|
||||
|
||||
testTokenize(
|
||||
asList("{\"foo\": \"foofoo\"",
|
||||
", \"bar\": \"barbar\"}"),
|
||||
singletonList("{\"foo\":\"foofoo\",\"bar\":\"barbar\"}"));
|
||||
|
||||
testTokenize(
|
||||
singletonList("[{\"foo\": \"foofoo\", \"bar\": \"barbar\"},{\"foo\": \"foofoofoo\", \"bar\": \"barbarbar\"}]"),
|
||||
asList("{\"foo\": \"foofoo\", \"bar\": \"barbar\"}",
|
||||
"{\"foo\": \"foofoofoo\", \"bar\": \"barbarbar\"}"));
|
||||
|
||||
testTokenize(
|
||||
singletonList("[{\"foo\": \"bar\"},{\"foo\": \"baz\"}]"),
|
||||
asList("{\"foo\": \"bar\"}",
|
||||
"{\"foo\": \"baz\"}"));
|
||||
|
||||
testTokenize(
|
||||
asList("[{\"foo\": \"foofoo\", \"bar\"",
|
||||
": \"barbar\"},{\"foo\": \"foofoofoo\", \"bar\": \"barbarbar\"}]"),
|
||||
asList("{\"foo\": \"foofoo\", \"bar\": \"barbar\"}",
|
||||
"{\"foo\": \"foofoofoo\", \"bar\": \"barbarbar\"}"));
|
||||
|
||||
testTokenize(
|
||||
asList("[",
|
||||
"{\"id\":1,\"name\":\"Robert\"}",
|
||||
",",
|
||||
"{\"id\":2,\"name\":\"Raide\"}",
|
||||
",",
|
||||
"{\"id\":3,\"name\":\"Ford\"}",
|
||||
"]"),
|
||||
asList("{\"id\":1,\"name\":\"Robert\"}",
|
||||
"{\"id\":2,\"name\":\"Raide\"}",
|
||||
"{\"id\":3,\"name\":\"Ford\"}"));
|
||||
}
|
||||
|
||||
private void testTokenize(List<String> source, List<String> expected) {
|
||||
Flux<DataBuffer> sourceFlux = Flux.fromIterable(source)
|
||||
.map(this::stringBuffer);
|
||||
|
||||
Flux<String> result = sourceFlux
|
||||
.flatMap(this.tokenizer)
|
||||
.map(tokenBuffer -> {
|
||||
try {
|
||||
TreeNode root = this.objectMapper.readTree(tokenBuffer.asParser());
|
||||
return this.objectMapper.writeValueAsString(root);
|
||||
}
|
||||
catch (IOException ex) {
|
||||
throw new RuntimeIOException(ex);
|
||||
}
|
||||
});
|
||||
|
||||
StepVerifier.FirstStep<String> builder = StepVerifier.create(result);
|
||||
for (String s : expected) {
|
||||
builder.assertNext(new JSONAssertConsumer(s));
|
||||
}
|
||||
builder.verifyComplete();
|
||||
}
|
||||
|
||||
private static class JSONAssertConsumer implements Consumer<String> {
|
||||
|
||||
private final String expected;
|
||||
|
||||
public JSONAssertConsumer(String expected) {
|
||||
this.expected = expected;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void accept(String s) {
|
||||
try {
|
||||
JSONAssert.assertEquals(this.expected, s, true);
|
||||
}
|
||||
catch (JSONException ex) {
|
||||
throw new RuntimeException(ex);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -1,131 +0,0 @@
|
||||
/*
|
||||
* Copyright 2002-2016 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.http.codec.json;
|
||||
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.Collections;
|
||||
|
||||
import org.junit.Test;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.test.StepVerifier;
|
||||
|
||||
import org.springframework.core.io.buffer.AbstractDataBufferAllocatingTestCase;
|
||||
import org.springframework.core.io.buffer.DataBuffer;
|
||||
|
||||
/**
|
||||
* @author Sebastien Deleuze
|
||||
*/
|
||||
public class JsonObjectDecoderTests extends AbstractDataBufferAllocatingTestCase {
|
||||
|
||||
@Test
|
||||
public void decodeSingleChunkToJsonObject() throws Exception {
|
||||
JsonObjectDecoder decoder = new JsonObjectDecoder();
|
||||
Flux<DataBuffer> source =
|
||||
Flux.just(stringBuffer("{\"foo\": \"foofoo\", \"bar\": \"barbar\"}"));
|
||||
Flux<String> output =
|
||||
decoder.decode(source, null, null, Collections.emptyMap()).map(JsonObjectDecoderTests::toString);
|
||||
StepVerifier.create(output)
|
||||
.expectNext("{\"foo\": \"foofoo\", \"bar\": \"barbar\"}")
|
||||
.expectComplete()
|
||||
.verify();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void decodeMultipleChunksToJsonObject() throws InterruptedException {
|
||||
JsonObjectDecoder decoder = new JsonObjectDecoder();
|
||||
Flux<DataBuffer> source = Flux.just(stringBuffer("{\"foo\": \"foofoo\""),
|
||||
stringBuffer(", \"bar\": \"barbar\"}"));
|
||||
Flux<String> output =
|
||||
decoder.decode(source, null, null, Collections.emptyMap()).map(JsonObjectDecoderTests::toString);
|
||||
StepVerifier.create(output)
|
||||
.expectNext("{\"foo\": \"foofoo\", \"bar\": \"barbar\"}")
|
||||
.expectComplete()
|
||||
.verify();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void decodeSingleChunkToArray() throws InterruptedException {
|
||||
JsonObjectDecoder decoder = new JsonObjectDecoder();
|
||||
|
||||
Flux<DataBuffer> source = Flux.just(stringBuffer(
|
||||
"[{\"foo\": \"foofoo\", \"bar\": \"barbar\"},{\"foo\": \"foofoofoo\", \"bar\": \"barbarbar\"}]"));
|
||||
Flux<String> output =
|
||||
decoder.decode(source, null, null, Collections.emptyMap()).map(JsonObjectDecoderTests::toString);
|
||||
StepVerifier.create(output)
|
||||
.expectNext("{\"foo\": \"foofoo\", \"bar\": \"barbar\"}")
|
||||
.expectNext("{\"foo\": \"foofoofoo\", \"bar\": \"barbarbar\"}")
|
||||
.expectComplete()
|
||||
.verify();
|
||||
|
||||
source = Flux.just(stringBuffer("[{\"foo\": \"bar\"},{\"foo\": \"baz\"}]"));
|
||||
output = decoder.decode(source, null, null, Collections.emptyMap()).map(JsonObjectDecoderTests::toString);
|
||||
StepVerifier.create(output)
|
||||
.expectNext("{\"foo\": \"bar\"}")
|
||||
.expectNext("{\"foo\": \"baz\"}")
|
||||
.expectComplete()
|
||||
.verify();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void decodeMultipleChunksToArray() throws InterruptedException {
|
||||
JsonObjectDecoder decoder = new JsonObjectDecoder();
|
||||
|
||||
Flux<DataBuffer> source =
|
||||
Flux.just(stringBuffer("[{\"foo\": \"foofoo\", \"bar\""), stringBuffer(
|
||||
": \"barbar\"},{\"foo\": \"foofoofoo\", \"bar\": \"barbarbar\"}]"));
|
||||
Flux<String> output =
|
||||
decoder.decode(source, null, null, Collections.emptyMap()).map(JsonObjectDecoderTests::toString);
|
||||
StepVerifier.create(output)
|
||||
.expectNext("{\"foo\": \"foofoo\", \"bar\": \"barbar\"}")
|
||||
.expectNext("{\"foo\": \"foofoofoo\", \"bar\": \"barbarbar\"}")
|
||||
.expectComplete()
|
||||
.verify();
|
||||
|
||||
source = Flux.just(
|
||||
stringBuffer("[{\"foo\": \""),
|
||||
stringBuffer("bar\"},{\"fo"),
|
||||
stringBuffer("o\": \"baz\"}"),
|
||||
stringBuffer("]"));
|
||||
output = decoder.decode(source, null, null, Collections.emptyMap()).map(JsonObjectDecoderTests::toString);
|
||||
StepVerifier.create(output)
|
||||
.expectNext("{\"foo\": \"bar\"}")
|
||||
.expectNext("{\"foo\": \"baz\"}")
|
||||
.expectComplete()
|
||||
.verify();
|
||||
|
||||
// SPR-15013
|
||||
source = Flux.just(stringBuffer("["), stringBuffer("{\"id\":1,\"name\":\"Robert\"}"),
|
||||
stringBuffer(","), stringBuffer("{\"id\":2,\"name\":\"Raide\"}"),
|
||||
stringBuffer(","), stringBuffer("{\"id\":3,\"name\":\"Ford\"}"),
|
||||
stringBuffer("]"));
|
||||
output = decoder.decode(source, null, null, Collections.emptyMap()).map(JsonObjectDecoderTests::toString);
|
||||
StepVerifier.create(output)
|
||||
.expectNext("{\"id\":1,\"name\":\"Robert\"}")
|
||||
.expectNext("{\"id\":2,\"name\":\"Raide\"}")
|
||||
.expectNext("{\"id\":3,\"name\":\"Ford\"}")
|
||||
.expectComplete()
|
||||
.verify();
|
||||
}
|
||||
|
||||
|
||||
private static String toString(DataBuffer buffer) {
|
||||
byte[] b = new byte[buffer.readableByteCount()];
|
||||
buffer.read(b);
|
||||
return new String(b, StandardCharsets.UTF_8);
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user