Skip to content

Commit d0ada56

Browse files
committed
Polish
See: SPR-17054
1 parent 0948edb commit d0ada56

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ private static <T, S extends Publisher<T>> S readWithMessageReaders(
200200
private static <T> Supplier<Flux<T>> skipBodyAsFlux(ReactiveHttpInputMessage message,
201201
BodyExtractor.Context context) {
202202

203-
if (isExtractingForClient(message, context)) {
203+
if (isExtractingForClient(message)) {
204204
return () -> consumeAndCancel(message).thenMany(Flux.empty());
205205
}
206206
else {
@@ -211,7 +211,7 @@ private static <T> Supplier<Flux<T>> skipBodyAsFlux(ReactiveHttpInputMessage mes
211211
private static <T> Supplier<Mono<T>> skipBodyAsMono(ReactiveHttpInputMessage message,
212212
BodyExtractor.Context context) {
213213

214-
if (isExtractingForClient(message, context)) {
214+
if (isExtractingForClient(message)) {
215215
return () -> consumeAndCancel(message).then(Mono.empty());
216216
}
217217
else {
@@ -259,7 +259,7 @@ private static <T> Flux<T> unsupportedErrorHandler(
259259
else {
260260
result = Flux.error(ex);
261261
}
262-
return isExtractingForClient(inputMessage, context) ?
262+
return isExtractingForClient(inputMessage) ?
263263
consumeAndCancel(inputMessage).thenMany(result) : result;
264264
}
265265

@@ -279,10 +279,8 @@ private static <T> HttpMessageReader<T> cast(HttpMessageReader<?> reader) {
279279
return (HttpMessageReader<T>) reader;
280280
}
281281

282-
private static boolean isExtractingForClient(ReactiveHttpInputMessage message,
283-
BodyExtractor.Context context) {
284-
return !context.serverResponse().isPresent()
285-
&& message instanceof ClientHttpResponse;
282+
private static boolean isExtractingForClient(ReactiveHttpInputMessage message) {
283+
return message instanceof ClientHttpResponse;
286284
}
287285

288286
private static Mono<Void> consumeAndCancel(ReactiveHttpInputMessage message) {

0 commit comments

Comments
 (0)