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

Change from flatMap to map

Browse Source 
Changed main tokenbuffer decoding loop from using flatMap to using map.
This commit is contained in:
Arjen Poutsma
2017-07-04 10:50:42 +02:00
parent 839b6c18d4
commit de9196bbdc
1 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
spring-web/src/main/java/org/springframework/http/codec/json/Jackson2JsonDecoder.java
View File

@@ -82,11 +82,7 @@ public class Jackson2JsonDecoder extends Jackson2CodecSupport implements HttpMes
public Flux<Object> decode(Publisher<DataBuffer> input, ResolvableType elementType, public Flux<Object> decode(Publisher<DataBuffer> input, ResolvableType elementType,
@Nullable MimeType mimeType, @Nullable Map<String, Object> hints) { @Nullable MimeType mimeType, @Nullable Map<String, Object> hints) {
Jackson2Tokenizer tokenizer = new Jackson2Tokenizer(nonBlockingParser(), true); Flux<TokenBuffer> tokens = tokenize(input, true);
Flux<TokenBuffer> tokens = Flux.from(input)
.flatMap(tokenizer)
.doFinally(t -> tokenizer.endOfInput());
return decodeInternal(tokens, elementType, mimeType, hints); return decodeInternal(tokens, elementType, mimeType, hints);
} }
@@ -94,14 +90,26 @@ public class Jackson2JsonDecoder extends Jackson2CodecSupport implements HttpMes
public Mono<Object> decodeToMono(Publisher<DataBuffer> input, ResolvableType elementType, public Mono<Object> decodeToMono(Publisher<DataBuffer> input, ResolvableType elementType,
@Nullable MimeType mimeType, @Nullable Map<String, Object> hints) { @Nullable MimeType mimeType, @Nullable Map<String, Object> hints) {
Jackson2Tokenizer tokenizer = new Jackson2Tokenizer(nonBlockingParser(), false); Flux<TokenBuffer> tokens = tokenize(input, false);
Flux<TokenBuffer> tokens = Flux.from(input)
.flatMap(tokenizer)
.doFinally(t -> tokenizer.endOfInput());
return decodeInternal(tokens, elementType, mimeType, hints).singleOrEmpty(); return decodeInternal(tokens, elementType, mimeType, hints).singleOrEmpty();
} }
private Flux<TokenBuffer> tokenize(Publisher<DataBuffer> input, boolean tokenizeArrayElements) {
try {
JsonFactory factory = objectMapper().getFactory();
JsonParser nonBlockingParser = factory.createNonBlockingByteArrayParser();
Jackson2Tokenizer tokenizer = new Jackson2Tokenizer(nonBlockingParser,
tokenizeArrayElements);
return Flux.from(input)
.flatMap(tokenizer)
.doFinally(t -> tokenizer.endOfInput());
}
catch (IOException ex) {
return Flux.error(new UncheckedIOException(ex));
}
}
private Flux<Object> decodeInternal(Flux<TokenBuffer> tokens, private Flux<Object> decodeInternal(Flux<TokenBuffer> tokens,
ResolvableType elementType, @Nullable MimeType mimeType, ResolvableType elementType, @Nullable MimeType mimeType,
@Nullable Map<String, Object> hints) { @Nullable Map<String, Object> hints) {
@@ -118,19 +126,18 @@ public class Jackson2JsonDecoder extends Jackson2CodecSupport implements HttpMes
objectMapper().readerWithView(jsonView).forType(javaType) : objectMapper().readerWithView(jsonView).forType(javaType) :
objectMapper().readerFor(javaType)); objectMapper().readerFor(javaType));
return tokens.flatMap(tokenBuffer -> { return tokens.map(tokenBuffer -> {
try { try {
Object value = reader.readValue(tokenBuffer.asParser()); return reader.readValue(tokenBuffer.asParser());
return Mono.just(value);
} }
catch (InvalidDefinitionException ex) { catch (InvalidDefinitionException ex) {
return Mono.error(new CodecException("Type definition error: " + ex.getType(), ex)); throw new CodecException("Type definition error: " + ex.getType(), ex);
} }
catch (JsonProcessingException ex) { catch (JsonProcessingException ex) {
return Mono.error(new DecodingException("JSON decoding error: " + ex.getOriginalMessage(), ex)); throw new DecodingException("JSON decoding error: " + ex.getOriginalMessage(), ex);
} }
catch (IOException ex) { catch (IOException ex) {
return Mono.error(new DecodingException("I/O error while parsing input stream", ex)); throw new DecodingException("I/O error while parsing input stream", ex);
} }
}); });
} }
@@ -150,13 +157,4 @@ public class Jackson2JsonDecoder extends Jackson2CodecSupport implements HttpMes
return parameter.getParameterAnnotation(annotType); return parameter.getParameterAnnotation(annotType);
} }
private JsonParser nonBlockingParser() {
try {
JsonFactory factory = this.objectMapper().getFactory();
return factory.createNonBlockingByteArrayParser();
}
catch (IOException ex) {
throw new UncheckedIOException(ex);
}
}
} }