root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Polish 

See: SPR-17054
This commit is contained in:
Brian Clozel 2018-09-18 11:20:33 +02:00
parent 0948edb39d
commit d0ada5653f
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spring-webflux/src/main/java/org/springframework/web/reactive/function/BodyExtractors.java
View File

@ -200,7 +200,7 @@ public abstract class BodyExtractors {
private static <T> Supplier<Flux<T>> skipBodyAsFlux(ReactiveHttpInputMessage message, private static <T> Supplier<Flux<T>> skipBodyAsFlux(ReactiveHttpInputMessage message,
BodyExtractor.Context context) { BodyExtractor.Context context) {
if (isExtractingForClient(message, context)) { if (isExtractingForClient(message)) {
return () -> consumeAndCancel(message).thenMany(Flux.empty()); return () -> consumeAndCancel(message).thenMany(Flux.empty());
} }
else { else {
@ -211,7 +211,7 @@ public abstract class BodyExtractors {
private static <T> Supplier<Mono<T>> skipBodyAsMono(ReactiveHttpInputMessage message, private static <T> Supplier<Mono<T>> skipBodyAsMono(ReactiveHttpInputMessage message,
BodyExtractor.Context context) { BodyExtractor.Context context) {
if (isExtractingForClient(message, context)) { if (isExtractingForClient(message)) {
return () -> consumeAndCancel(message).then(Mono.empty()); return () -> consumeAndCancel(message).then(Mono.empty());
} }
else { else {
@ -259,7 +259,7 @@ public abstract class BodyExtractors {
else { else {
result = Flux.error(ex); result = Flux.error(ex);
} }
return isExtractingForClient(inputMessage, context) ? return isExtractingForClient(inputMessage) ?
consumeAndCancel(inputMessage).thenMany(result) : result; consumeAndCancel(inputMessage).thenMany(result) : result;
} }
@ -279,10 +279,8 @@ public abstract class BodyExtractors {
return (HttpMessageReader<T>) reader; return (HttpMessageReader<T>) reader;
} }
private static boolean isExtractingForClient(ReactiveHttpInputMessage message, private static boolean isExtractingForClient(ReactiveHttpInputMessage message) {
BodyExtractor.Context context) { return message instanceof ClientHttpResponse;
return !context.serverResponse().isPresent()
&& message instanceof ClientHttpResponse;
} }
private static Mono<Void> consumeAndCancel(ReactiveHttpInputMessage message) { private static Mono<Void> consumeAndCancel(ReactiveHttpInputMessage message) {