Skip to content

AbstractJackson2Decoder#decodeToMono support non-blocking parsing #34585

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

AbstractJackson2Decoder#decodeToMono support non-blocking parsing #34585

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions spring-web/src/main/java/org/springframework/http/codec/json/AbstractJackson2Decoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,10 @@ public boolean canDecode(ResolvableType elementType, @Nullable MimeType mimeType
public Flux<Object> decode(Publisher<DataBuffer> input, ResolvableType elementType,
@Nullable MimeType mimeType, @Nullable Map<String, Object> hints) {

return decodeToFlux(input, elementType, mimeType, hints,null);
}

private Flux<Object> decodeToFlux(Publisher<DataBuffer> input, ResolvableType elementType, @Nullable MimeType mimeType, @Nullable Map<String, Object> hints,@Nullable Boolean tokenizeArrays) {
ObjectMapper mapper = selectObjectMapper(elementType, mimeType);
if (mapper == null) {
return Flux.error(new IllegalStateException("No ObjectMapper for " + elementType));
Expand All @@ -138,8 +142,10 @@ public Flux<Object> decode(Publisher<DataBuffer> input, ResolvableType elementTy
forceUseOfBigDecimal = true;
}

boolean tokenizeArrays = (!elementType.isArray() &&
!Collection.class.isAssignableFrom(elementType.resolve(Object.class)));
if (tokenizeArrays == null) {
tokenizeArrays = (!elementType.isArray() &&
!Collection.class.isAssignableFrom(elementType.resolve(Object.class)));
}

Flux<DataBuffer> processed = processInput(input, elementType, mimeType, hints);
Flux<TokenBuffer> tokens = Jackson2Tokenizer.tokenize(processed, mapper.getFactory(), mapper,
Expand Down Expand Up @@ -188,15 +194,7 @@ protected Flux<DataBuffer> processInput(Publisher<DataBuffer> input, ResolvableT
@Override
public Mono<Object> decodeToMono(Publisher<DataBuffer> input, ResolvableType elementType,
@Nullable MimeType mimeType, @Nullable Map<String, Object> hints) {

return Mono.deferContextual(contextView -> {

Map<String, Object> hintsToUse = contextView.isEmpty() ? hints :
Hints.merge(hints, ContextView.class.getName(), contextView);

return DataBufferUtils.join(input, this.maxInMemorySize).flatMap(dataBuffer ->
Mono.justOrEmpty(decode(dataBuffer, elementType, mimeType, hintsToUse)));
});
return decodeToFlux(input, elementType, mimeType, hints, false).singleOrEmpty();
}

@Override
Expand Down
Loading