From 7a516170ef7fbaf6433adfd355baf7f6a96ce924 Mon Sep 17 00:00:00 2001 From: rstoyanchev Date: Thu, 7 Sep 2023 15:14:03 +0100 Subject: [PATCH 1/2] WebClientResponseException supports decoding empty content Closes gh-31179 --- .../client/DefaultClientResponse.java | 6 +++- .../client/WebClientResponseException.java | 11 +++--- .../client/DefaultClientResponseTests.java | 36 +++++++++++++++++++ 3 files changed, 46 insertions(+), 7 deletions(-) diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultClientResponse.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultClientResponse.java index 53f7e7ca80..6b4e35a713 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultClientResponse.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultClientResponse.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2022 the original author or authors. + * Copyright 2002-2023 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. @@ -50,6 +50,7 @@ import org.springframework.lang.Nullable; import org.springframework.util.Assert; import org.springframework.util.MimeType; import org.springframework.util.MultiValueMap; +import org.springframework.util.ObjectUtils; import org.springframework.web.reactive.function.BodyExtractor; import org.springframework.web.reactive.function.BodyExtractors; @@ -233,6 +234,9 @@ class DefaultClientResponse implements ClientResponse { private Function initDecodeFunction(byte[] body, @Nullable MediaType contentType) { return targetType -> { + if (ObjectUtils.isEmpty(body)) { + return null; + } Decoder decoder = null; for (HttpMessageReader reader : strategies().messageReaders()) { if (reader.canRead(targetType, contentType)) { diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClientResponseException.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClientResponseException.java index d08ed1ab58..057cc0b095 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClientResponseException.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClientResponseException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2022 the original author or authors. + * Copyright 2002-2023 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. @@ -233,22 +233,21 @@ public class WebClientResponseException extends WebClientException { */ @Nullable public E getResponseBodyAs(Class targetType) { - return getResponseBodyAs(ResolvableType.forClass(targetType)); + return decodeBody(ResolvableType.forClass(targetType)); } /** - * Variant of {@link #getResponseBodyAs(Class)} with - * {@link ParameterizedTypeReference}. + * Variant of {@link #getResponseBodyAs(Class)} with {@link ParameterizedTypeReference}. * @since 6.0 */ @Nullable public E getResponseBodyAs(ParameterizedTypeReference targetType) { - return getResponseBodyAs(ResolvableType.forType(targetType.getType())); + return decodeBody(ResolvableType.forType(targetType.getType())); } @SuppressWarnings("unchecked") @Nullable - private E getResponseBodyAs(ResolvableType targetType) { + private E decodeBody(ResolvableType targetType) { Assert.state(this.bodyDecodeFunction != null, "Decoder function not set"); return (E) this.bodyDecodeFunction.apply(targetType); } diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientResponseTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientResponseTests.java index 1885b66d4e..97f0253796 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientResponseTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientResponseTests.java @@ -21,6 +21,7 @@ import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; import java.util.Collections; import java.util.List; +import java.util.Map; import java.util.OptionalLong; import org.junit.jupiter.api.BeforeEach; @@ -45,6 +46,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.http.client.reactive.ClientHttpResponse; import org.springframework.http.codec.DecoderHttpMessageReader; import org.springframework.http.codec.HttpMessageReader; +import org.springframework.http.codec.json.Jackson2JsonDecoder; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; @@ -346,6 +348,40 @@ class DefaultClientResponseTests { assertThat(exception.getResponseBodyAsByteArray()).isEqualTo(bytes); } + @Test + void createExceptionAndDecodeContent() { + byte[] bytes = "{\"name\":\"Jason\"}".getBytes(StandardCharsets.UTF_8); + DataBuffer buffer = DefaultDataBufferFactory.sharedInstance.wrap(bytes); + + httpHeaders.setContentType(MediaType.APPLICATION_JSON); + given(mockResponse.getStatusCode()).willReturn(HttpStatus.NOT_FOUND); + given(mockResponse.getBody()).willReturn(Flux.just(buffer)); + + given(mockExchangeStrategies.messageReaders()).willReturn(List.of( + new DecoderHttpMessageReader<>(new ByteArrayDecoder()), + new DecoderHttpMessageReader<>(new Jackson2JsonDecoder()))); + + WebClientResponseException ex = defaultClientResponse.createException().block(); + assertThat(ex.getResponseBodyAs(Map.class)).hasSize(1).containsEntry("name", "Jason"); + } + + @Test + void createExceptionAndDecodeWithoutContent() { + byte[] bytes = new byte[0]; + DataBuffer buffer = DefaultDataBufferFactory.sharedInstance.wrap(bytes); + + httpHeaders.setContentType(MediaType.APPLICATION_JSON); + given(mockResponse.getStatusCode()).willReturn(HttpStatus.NOT_FOUND); + given(mockResponse.getBody()).willReturn(Flux.just(buffer)); + + given(mockExchangeStrategies.messageReaders()).willReturn(List.of( + new DecoderHttpMessageReader<>(new ByteArrayDecoder()), + new DecoderHttpMessageReader<>(new Jackson2JsonDecoder()))); + + WebClientResponseException ex = defaultClientResponse.createException().block(); + assertThat(ex.getResponseBodyAs(Map.class)).isNull(); + } + @Test @SuppressWarnings("deprecation") void createError() { From a6b567a630dcddc7134b9f79de3610a75f55cb4d Mon Sep 17 00:00:00 2001 From: rstoyanchev Date: Thu, 7 Sep 2023 15:26:37 +0100 Subject: [PATCH 2/2] Polishing --- .../client/DefaultClientResponseTests.java | 163 +++++++----------- 1 file changed, 64 insertions(+), 99 deletions(-) diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientResponseTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientResponseTests.java index 97f0253796..0ad854924a 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientResponseTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientResponseTests.java @@ -17,7 +17,6 @@ package org.springframework.web.reactive.function.client; import java.net.InetSocketAddress; -import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; import java.util.Collections; import java.util.List; @@ -34,7 +33,6 @@ import org.springframework.core.ParameterizedTypeReference; import org.springframework.core.codec.ByteArrayDecoder; import org.springframework.core.codec.StringDecoder; import org.springframework.core.io.buffer.DataBuffer; -import org.springframework.core.io.buffer.DefaultDataBuffer; import org.springframework.core.io.buffer.DefaultDataBufferFactory; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpRange; @@ -45,7 +43,6 @@ import org.springframework.http.ResponseCookie; import org.springframework.http.ResponseEntity; import org.springframework.http.client.reactive.ClientHttpResponse; import org.springframework.http.codec.DecoderHttpMessageReader; -import org.springframework.http.codec.HttpMessageReader; import org.springframework.http.codec.json.Jackson2JsonDecoder; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; @@ -62,11 +59,14 @@ import static org.springframework.web.reactive.function.BodyExtractors.toMono; */ class DefaultClientResponseTests { - private ClientHttpResponse mockResponse = mock(); + private static final ParameterizedTypeReference STRING_TYPE = new ParameterizedTypeReference<>() {}; + + + private final ClientHttpResponse mockResponse = mock(); private final HttpHeaders httpHeaders = new HttpHeaders(); - private ExchangeStrategies mockExchangeStrategies = mock(); + private final ExchangeStrategies mockExchangeStrategies = mock(); private DefaultClientResponse defaultClientResponse; @@ -74,7 +74,6 @@ class DefaultClientResponseTests { @BeforeEach void configureMocks() { given(mockResponse.getHeaders()).willReturn(this.httpHeaders); - defaultClientResponse = new DefaultClientResponse(mockResponse, mockExchangeStrategies, "", "", () -> null); } @@ -121,13 +120,11 @@ class DefaultClientResponseTests { @Test void body() { byte[] bytes = "foo".getBytes(StandardCharsets.UTF_8); - DefaultDataBuffer dataBuffer = DefaultDataBufferFactory.sharedInstance.wrap(ByteBuffer.wrap(bytes)); - Flux body = Flux.just(dataBuffer); - mockTextPlainResponse(body); + DataBuffer dataBuffer = DefaultDataBufferFactory.sharedInstance.wrap(bytes); + mockTextPlainResponse(Flux.just(dataBuffer)); - List> messageReaders = Collections - .singletonList(new DecoderHttpMessageReader<>(StringDecoder.allMimeTypes())); - given(mockExchangeStrategies.messageReaders()).willReturn(messageReaders); + given(mockExchangeStrategies.messageReaders()).willReturn( + Collections.singletonList(new DecoderHttpMessageReader<>(StringDecoder.allMimeTypes()))); Mono resultMono = defaultClientResponse.body(toMono(String.class)); assertThat(resultMono.block()).isEqualTo("foo"); @@ -136,13 +133,11 @@ class DefaultClientResponseTests { @Test void bodyToMono() { byte[] bytes = "foo".getBytes(StandardCharsets.UTF_8); - DefaultDataBuffer dataBuffer = DefaultDataBufferFactory.sharedInstance.wrap(ByteBuffer.wrap(bytes)); - Flux body = Flux.just(dataBuffer); - mockTextPlainResponse(body); + DataBuffer dataBuffer = DefaultDataBufferFactory.sharedInstance.wrap(bytes); + mockTextPlainResponse(Flux.just(dataBuffer)); - List> messageReaders = Collections - .singletonList(new DecoderHttpMessageReader<>(StringDecoder.allMimeTypes())); - given(mockExchangeStrategies.messageReaders()).willReturn(messageReaders); + given(mockExchangeStrategies.messageReaders()).willReturn( + Collections.singletonList(new DecoderHttpMessageReader<>(StringDecoder.allMimeTypes()))); Mono resultMono = defaultClientResponse.bodyToMono(String.class); assertThat(resultMono.block()).isEqualTo("foo"); @@ -151,30 +146,24 @@ class DefaultClientResponseTests { @Test void bodyToMonoTypeReference() { byte[] bytes = "foo".getBytes(StandardCharsets.UTF_8); - DefaultDataBuffer dataBuffer = DefaultDataBufferFactory.sharedInstance.wrap(ByteBuffer.wrap(bytes)); - Flux body = Flux.just(dataBuffer); - mockTextPlainResponse(body); + DataBuffer dataBuffer = DefaultDataBufferFactory.sharedInstance.wrap(bytes); + mockTextPlainResponse(Flux.just(dataBuffer)); - List> messageReaders = Collections - .singletonList(new DecoderHttpMessageReader<>(StringDecoder.allMimeTypes())); - given(mockExchangeStrategies.messageReaders()).willReturn(messageReaders); + given(mockExchangeStrategies.messageReaders()).willReturn( + Collections.singletonList(new DecoderHttpMessageReader<>(StringDecoder.allMimeTypes()))); - Mono resultMono = - defaultClientResponse.bodyToMono(new ParameterizedTypeReference() { - }); + Mono resultMono = defaultClientResponse.bodyToMono(STRING_TYPE); assertThat(resultMono.block()).isEqualTo("foo"); } @Test void bodyToFlux() { byte[] bytes = "foo".getBytes(StandardCharsets.UTF_8); - DefaultDataBuffer dataBuffer = DefaultDataBufferFactory.sharedInstance.wrap(ByteBuffer.wrap(bytes)); - Flux body = Flux.just(dataBuffer); - mockTextPlainResponse(body); + DataBuffer dataBuffer = DefaultDataBufferFactory.sharedInstance.wrap(bytes); + mockTextPlainResponse(Flux.just(dataBuffer)); - List> messageReaders = Collections - .singletonList(new DecoderHttpMessageReader<>(StringDecoder.allMimeTypes())); - given(mockExchangeStrategies.messageReaders()).willReturn(messageReaders); + given(mockExchangeStrategies.messageReaders()).willReturn( + Collections.singletonList(new DecoderHttpMessageReader<>(StringDecoder.allMimeTypes()))); Flux resultFlux = defaultClientResponse.bodyToFlux(String.class); Mono> result = resultFlux.collectList(); @@ -184,17 +173,13 @@ class DefaultClientResponseTests { @Test void bodyToFluxTypeReference() { byte[] bytes = "foo".getBytes(StandardCharsets.UTF_8); - DefaultDataBuffer dataBuffer = DefaultDataBufferFactory.sharedInstance.wrap(ByteBuffer.wrap(bytes)); - Flux body = Flux.just(dataBuffer); - mockTextPlainResponse(body); + DataBuffer dataBuffer = DefaultDataBufferFactory.sharedInstance.wrap(bytes); + mockTextPlainResponse(Flux.just(dataBuffer)); - List> messageReaders = Collections - .singletonList(new DecoderHttpMessageReader<>(StringDecoder.allMimeTypes())); - given(mockExchangeStrategies.messageReaders()).willReturn(messageReaders); + given(mockExchangeStrategies.messageReaders()).willReturn( + Collections.singletonList(new DecoderHttpMessageReader<>(StringDecoder.allMimeTypes()))); - Flux resultFlux = - defaultClientResponse.bodyToFlux(new ParameterizedTypeReference() { - }); + Flux resultFlux = defaultClientResponse.bodyToFlux(STRING_TYPE); Mono> result = resultFlux.collectList(); assertThat(result.block()).isEqualTo(Collections.singletonList("foo")); } @@ -203,13 +188,11 @@ class DefaultClientResponseTests { @SuppressWarnings("deprecation") void toEntity() { byte[] bytes = "foo".getBytes(StandardCharsets.UTF_8); - DefaultDataBuffer dataBuffer = DefaultDataBufferFactory.sharedInstance.wrap(ByteBuffer.wrap(bytes)); - Flux body = Flux.just(dataBuffer); - mockTextPlainResponse(body); + DataBuffer dataBuffer = DefaultDataBufferFactory.sharedInstance.wrap(bytes); + mockTextPlainResponse(Flux.just(dataBuffer)); - List> messageReaders = Collections - .singletonList(new DecoderHttpMessageReader<>(StringDecoder.allMimeTypes())); - given(mockExchangeStrategies.messageReaders()).willReturn(messageReaders); + given(mockExchangeStrategies.messageReaders()).willReturn( + Collections.singletonList(new DecoderHttpMessageReader<>(StringDecoder.allMimeTypes()))); ResponseEntity result = defaultClientResponse.toEntity(String.class).block(); assertThat(result.getBody()).isEqualTo("foo"); @@ -220,19 +203,17 @@ class DefaultClientResponseTests { @Test @SuppressWarnings("deprecation") - void toEntityWithUnknownStatusCode() throws Exception { + void toEntityWithUnknownStatusCode() { byte[] bytes = "foo".getBytes(StandardCharsets.UTF_8); - DefaultDataBuffer dataBuffer = DefaultDataBufferFactory.sharedInstance.wrap(ByteBuffer.wrap(bytes)); - Flux body = Flux.just(dataBuffer); + DataBuffer dataBuffer = DefaultDataBufferFactory.sharedInstance.wrap(bytes); httpHeaders.setContentType(MediaType.TEXT_PLAIN); given(mockResponse.getHeaders()).willReturn(httpHeaders); given(mockResponse.getStatusCode()).willReturn(HttpStatusCode.valueOf(999)); - given(mockResponse.getBody()).willReturn(body); + given(mockResponse.getBody()).willReturn(Flux.just(dataBuffer)); - List> messageReaders = Collections - .singletonList(new DecoderHttpMessageReader<>(StringDecoder.allMimeTypes())); - given(mockExchangeStrategies.messageReaders()).willReturn(messageReaders); + given(mockExchangeStrategies.messageReaders()).willReturn( + Collections.singletonList(new DecoderHttpMessageReader<>(StringDecoder.allMimeTypes()))); ResponseEntity result = defaultClientResponse.toEntity(String.class).block(); assertThat(result.getBody()).isEqualTo("foo"); @@ -245,17 +226,13 @@ class DefaultClientResponseTests { @SuppressWarnings("deprecation") void toEntityTypeReference() { byte[] bytes = "foo".getBytes(StandardCharsets.UTF_8); - DefaultDataBuffer dataBuffer = DefaultDataBufferFactory.sharedInstance.wrap(ByteBuffer.wrap(bytes)); - Flux body = Flux.just(dataBuffer); - mockTextPlainResponse(body); + DataBuffer dataBuffer = DefaultDataBufferFactory.sharedInstance.wrap(bytes); + mockTextPlainResponse(Flux.just(dataBuffer)); - List> messageReaders = Collections - .singletonList(new DecoderHttpMessageReader<>(StringDecoder.allMimeTypes())); - given(mockExchangeStrategies.messageReaders()).willReturn(messageReaders); + given(mockExchangeStrategies.messageReaders()).willReturn( + Collections.singletonList(new DecoderHttpMessageReader<>(StringDecoder.allMimeTypes()))); - ResponseEntity result = defaultClientResponse.toEntity( - new ParameterizedTypeReference() { - }).block(); + ResponseEntity result = defaultClientResponse.toEntity(STRING_TYPE).block(); assertThat(result.getBody()).isEqualTo("foo"); assertThat(result.getStatusCode()).isEqualTo(HttpStatus.OK); assertThat(result.getStatusCodeValue()).isEqualTo(HttpStatus.OK.value()); @@ -266,13 +243,11 @@ class DefaultClientResponseTests { @SuppressWarnings("deprecation") void toEntityList() { byte[] bytes = "foo".getBytes(StandardCharsets.UTF_8); - DefaultDataBuffer dataBuffer = DefaultDataBufferFactory.sharedInstance.wrap(ByteBuffer.wrap(bytes)); - Flux body = Flux.just(dataBuffer); - mockTextPlainResponse(body); + DataBuffer dataBuffer = DefaultDataBufferFactory.sharedInstance.wrap(bytes); + mockTextPlainResponse(Flux.just(dataBuffer)); - List> messageReaders = Collections - .singletonList(new DecoderHttpMessageReader<>(StringDecoder.allMimeTypes())); - given(mockExchangeStrategies.messageReaders()).willReturn(messageReaders); + given(mockExchangeStrategies.messageReaders()).willReturn( + Collections.singletonList(new DecoderHttpMessageReader<>(StringDecoder.allMimeTypes()))); ResponseEntity> result = defaultClientResponse.toEntityList(String.class).block(); assertThat(result.getBody()).isEqualTo(Collections.singletonList("foo")); @@ -285,17 +260,15 @@ class DefaultClientResponseTests { @SuppressWarnings("deprecation") void toEntityListWithUnknownStatusCode() { byte[] bytes = "foo".getBytes(StandardCharsets.UTF_8); - DefaultDataBuffer dataBuffer = DefaultDataBufferFactory.sharedInstance.wrap(ByteBuffer.wrap(bytes)); - Flux body = Flux.just(dataBuffer); + DataBuffer dataBuffer = DefaultDataBufferFactory.sharedInstance.wrap(bytes); httpHeaders.setContentType(MediaType.TEXT_PLAIN); given(mockResponse.getHeaders()).willReturn(httpHeaders); given(mockResponse.getStatusCode()).willReturn(HttpStatusCode.valueOf(999)); - given(mockResponse.getBody()).willReturn(body); + given(mockResponse.getBody()).willReturn(Flux.just(dataBuffer)); - List> messageReaders = Collections - .singletonList(new DecoderHttpMessageReader<>(StringDecoder.allMimeTypes())); - given(mockExchangeStrategies.messageReaders()).willReturn(messageReaders); + given(mockExchangeStrategies.messageReaders()).willReturn( + Collections.singletonList(new DecoderHttpMessageReader<>(StringDecoder.allMimeTypes()))); ResponseEntity> result = defaultClientResponse.toEntityList(String.class).block(); assertThat(result.getBody()).isEqualTo(Collections.singletonList("foo")); @@ -308,17 +281,14 @@ class DefaultClientResponseTests { @SuppressWarnings("deprecation") void toEntityListTypeReference() { byte[] bytes = "foo".getBytes(StandardCharsets.UTF_8); - DefaultDataBuffer dataBuffer = DefaultDataBufferFactory.sharedInstance.wrap(ByteBuffer.wrap(bytes)); - Flux body = Flux.just(dataBuffer); + DataBuffer dataBuffer = DefaultDataBufferFactory.sharedInstance.wrap(bytes); - mockTextPlainResponse(body); + mockTextPlainResponse(Flux.just(dataBuffer)); - List> messageReaders = Collections - .singletonList(new DecoderHttpMessageReader<>(StringDecoder.allMimeTypes())); - given(mockExchangeStrategies.messageReaders()).willReturn(messageReaders); + given(mockExchangeStrategies.messageReaders()).willReturn( + Collections.singletonList(new DecoderHttpMessageReader<>(StringDecoder.allMimeTypes()))); - ResponseEntity> result = defaultClientResponse.toEntityList( - new ParameterizedTypeReference() {}).block(); + ResponseEntity> result = defaultClientResponse.toEntityList(STRING_TYPE).block(); assertThat(result.getBody()).isEqualTo(Collections.singletonList("foo")); assertThat(result.getStatusCode()).isEqualTo(HttpStatus.OK); assertThat(result.getStatusCodeValue()).isEqualTo(HttpStatus.OK.value()); @@ -326,18 +296,16 @@ class DefaultClientResponseTests { } @Test - @SuppressWarnings("deprecation") void createException() { byte[] bytes = "foo".getBytes(StandardCharsets.UTF_8); - DefaultDataBuffer dataBuffer = DefaultDataBufferFactory.sharedInstance.wrap(ByteBuffer.wrap(bytes)); - Flux body = Flux.just(dataBuffer); + DataBuffer dataBuffer = DefaultDataBufferFactory.sharedInstance.wrap(bytes); + httpHeaders.setContentType(MediaType.TEXT_PLAIN); given(mockResponse.getStatusCode()).willReturn(HttpStatus.NOT_FOUND); - given(mockResponse.getBody()).willReturn(body); + given(mockResponse.getBody()).willReturn(Flux.just(dataBuffer)); - List> messageReaders = Collections.singletonList( - new DecoderHttpMessageReader<>(new ByteArrayDecoder())); - given(mockExchangeStrategies.messageReaders()).willReturn(messageReaders); + given(mockExchangeStrategies.messageReaders()).willReturn( + Collections.singletonList(new DecoderHttpMessageReader<>(new ByteArrayDecoder()))); Mono resultMono = defaultClientResponse.createException(); WebClientResponseException exception = resultMono.block(); @@ -383,18 +351,16 @@ class DefaultClientResponseTests { } @Test - @SuppressWarnings("deprecation") void createError() { byte[] bytes = "foo".getBytes(StandardCharsets.UTF_8); - DefaultDataBuffer dataBuffer = DefaultDataBufferFactory.sharedInstance.wrap(ByteBuffer.wrap(bytes)); - Flux body = Flux.just(dataBuffer); + DataBuffer dataBuffer = DefaultDataBufferFactory.sharedInstance.wrap(bytes); + httpHeaders.setContentType(MediaType.TEXT_PLAIN); given(mockResponse.getStatusCode()).willReturn(HttpStatus.NOT_FOUND); - given(mockResponse.getBody()).willReturn(body); + given(mockResponse.getBody()).willReturn(Flux.just(dataBuffer)); - List> messageReaders = Collections.singletonList( - new DecoderHttpMessageReader<>(new ByteArrayDecoder())); - given(mockExchangeStrategies.messageReaders()).willReturn(messageReaders); + given(mockExchangeStrategies.messageReaders()).willReturn( + Collections.singletonList(new DecoderHttpMessageReader<>(new ByteArrayDecoder()))); Mono resultMono = defaultClientResponse.createError(); StepVerifier.create(resultMono) @@ -412,7 +378,6 @@ class DefaultClientResponseTests { } - @SuppressWarnings("deprecation") private void mockTextPlainResponse(Flux body) { httpHeaders.setContentType(MediaType.TEXT_PLAIN); given(mockResponse.getStatusCode()).willReturn(HttpStatus.OK);