Merge pull request #12148 from hkhan/JAVA-8151-update-spring-webclient

Java 8151 update spring webclient
This commit is contained in:
kwoyke 2022-05-02 11:20:42 +02:00 committed by GitHub
commit e825abd158
5 changed files with 187 additions and 208 deletions

View File

@ -1,24 +1,14 @@
package com.baeldung.reactive.webclient; package com.baeldung.reactive.webclient;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@NoArgsConstructor
@AllArgsConstructor
public class Foo { public class Foo {
private String name; private String name;
public Foo() {
super();
}
public Foo(String name) {
super();
this.name = name;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
} }

View File

@ -15,11 +15,10 @@ public class WebClientApplication {
} }
@Bean @Bean
public SecurityWebFilterChain functionalValidationsSpringSecurityFilterChain(ServerHttpSecurity http) { public SecurityWebFilterChain filterChain(ServerHttpSecurity http) {
http.authorizeExchange() http.csrf().disable()
.anyExchange() .authorizeExchange()
.permitAll(); .anyExchange().permitAll();
http.csrf().disable();
return http.build(); return http.build();
} }
} }

View File

@ -45,13 +45,13 @@ import static org.assertj.core.api.Assertions.assertThat;
@SpringBootTest(classes = WebClientApplication.class, webEnvironment = WebEnvironment.RANDOM_PORT) @SpringBootTest(classes = WebClientApplication.class, webEnvironment = WebEnvironment.RANDOM_PORT)
public class WebClientIntegrationTest { public class WebClientIntegrationTest {
@LocalServerPort
private int port;
private static final String BODY_VALUE = "bodyValue"; private static final String BODY_VALUE = "bodyValue";
private static final ParameterizedTypeReference<Map<String, String>> MAP_RESPONSE_REF = new ParameterizedTypeReference<Map<String, String>>() { private static final ParameterizedTypeReference<Map<String, String>> MAP_RESPONSE_REF = new ParameterizedTypeReference<Map<String, String>>() {
}; };
@LocalServerPort
private int port;
@Test @Test
public void givenDifferentWebClientCreationMethods_whenUsed_thenObtainExpectedResponse() { public void givenDifferentWebClientCreationMethods_whenUsed_thenObtainExpectedResponse() {
// WebClient creation // WebClient creation
@ -106,9 +106,11 @@ public class WebClientIntegrationTest {
public void givenDifferentUriSpecifications_whenUsed_thenObtainExpectedResponse() { public void givenDifferentUriSpecifications_whenUsed_thenObtainExpectedResponse() {
// uri specification // uri specification
RequestBodySpec bodySpecUsingString = createDefaultPostRequest().uri("/resource"); RequestBodySpec bodySpecUsingString = createDefaultPostRequest().uri("/resource");
RequestBodySpec bodySpecUsingUriBuilder = createDefaultPostRequest().uri(uriBuilder -> uriBuilder.pathSegment("resource") RequestBodySpec bodySpecUsingUriBuilder = createDefaultPostRequest().uri(
uriBuilder -> uriBuilder.pathSegment("resource")
.build()); .build());
RequestBodySpec bodySpecusingURI = createDefaultPostRequest().uri(URI.create("http://localhost:" + port + "/resource")); RequestBodySpec bodySpecusingURI = createDefaultPostRequest().uri(
URI.create("http://localhost:" + port + "/resource"));
RequestBodySpec bodySpecOverridenBaseUri = createDefaultPostRequest().uri(URI.create("/resource")); RequestBodySpec bodySpecOverridenBaseUri = createDefaultPostRequest().uri(URI.create("/resource"));
RequestBodySpec bodySpecOverridenBaseUri2 = WebClient.builder() RequestBodySpec bodySpecOverridenBaseUri2 = WebClient.builder()
.baseUrl("http://localhost:" + port) .baseUrl("http://localhost:" + port)
@ -140,8 +142,10 @@ public class WebClientIntegrationTest {
@Test @Test
public void givenDifferentBodySpecifications_whenUsed_thenObtainExpectedResponse() { public void givenDifferentBodySpecifications_whenUsed_thenObtainExpectedResponse() {
// request body specifications // request body specifications
RequestHeadersSpec<?> headersSpecPost1 = createDefaultPostResourceRequest().body(BodyInserters.fromPublisher(Mono.just(BODY_VALUE), String.class)); RequestHeadersSpec<?> headersSpecPost1 = createDefaultPostResourceRequest().body(
RequestHeadersSpec<?> headersSpecPost2 = createDefaultPostResourceRequest().body(BodyInserters.fromValue(BODY_VALUE)); BodyInserters.fromPublisher(Mono.just(BODY_VALUE), String.class));
RequestHeadersSpec<?> headersSpecPost2 = createDefaultPostResourceRequest().body(
BodyInserters.fromValue(BODY_VALUE));
RequestHeadersSpec<?> headersSpecPost3 = createDefaultPostResourceRequest().bodyValue(BODY_VALUE); RequestHeadersSpec<?> headersSpecPost3 = createDefaultPostResourceRequest().bodyValue(BODY_VALUE);
RequestHeadersSpec<?> headersSpecFooPost = createDefaultPostRequest().uri("/resource-foo") RequestHeadersSpec<?> headersSpecFooPost = createDefaultPostRequest().uri("/resource-foo")
.body(Mono.just(new Foo("fooName")), Foo.class); .body(Mono.just(new Foo("fooName")), Foo.class);
@ -152,7 +156,8 @@ public class WebClientIntegrationTest {
LinkedMultiValueMap<String, String> map = new LinkedMultiValueMap<>(); LinkedMultiValueMap<String, String> map = new LinkedMultiValueMap<>();
map.add("key1", "multipartValue1"); map.add("key1", "multipartValue1");
map.add("key2", "multipartValue2"); map.add("key2", "multipartValue2");
BodyInserter<MultiValueMap<String, Object>, ClientHttpRequest> inserterMultipart = BodyInserters.fromMultipartData(map); BodyInserter<MultiValueMap<String, Object>, ClientHttpRequest> inserterMultipart = BodyInserters.fromMultipartData(
map);
RequestHeadersSpec<?> headersSpecInserterMultipart = createDefaultPostRequest().uri("/resource-multipart") RequestHeadersSpec<?> headersSpecInserterMultipart = createDefaultPostRequest().uri("/resource-multipart")
.body(inserterMultipart); .body(inserterMultipart);
@ -177,7 +182,8 @@ public class WebClientIntegrationTest {
.expectError(CodecException.class) .expectError(CodecException.class)
.verify(); .verify();
// assert response for request with no body // assert response for request with no body
Mono<Map<String, String>> responsePostWithNoBody = createDefaultPostResourceRequest().exchangeToMono(responseHandler -> { Mono<Map<String, String>> responsePostWithNoBody = createDefaultPostResourceRequest().exchangeToMono(
responseHandler -> {
assertThat(responseHandler.statusCode()).isEqualTo(HttpStatus.BAD_REQUEST); assertThat(responseHandler.statusCode()).isEqualTo(HttpStatus.BAD_REQUEST);
return responseHandler.bodyToMono(MAP_RESPONSE_REF); return responseHandler.bodyToMono(MAP_RESPONSE_REF);
}); });
@ -190,7 +196,8 @@ public class WebClientIntegrationTest {
@Test @Test
public void givenPostSpecifications_whenHeadersAdded_thenObtainExpectedResponse() { public void givenPostSpecifications_whenHeadersAdded_thenObtainExpectedResponse() {
// request header specification // request header specification
RequestHeadersSpec<?> headersSpecInserterStringWithHeaders = createDefaultPostResourceRequestResponse().header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE) RequestHeadersSpec<?> headersSpecInserterStringWithHeaders = createDefaultPostResourceRequestResponse().header(
HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
.accept(MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML) .accept(MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML)
.acceptCharset(StandardCharsets.UTF_8) .acceptCharset(StandardCharsets.UTF_8)
.ifNoneMatch("*") .ifNoneMatch("*")
@ -209,8 +216,7 @@ public class WebClientIntegrationTest {
Mono<String> responsePostString2 = createDefaultPostResourceRequestResponse().exchangeToMono(response -> { Mono<String> responsePostString2 = createDefaultPostResourceRequestResponse().exchangeToMono(response -> {
if (response.statusCode() == HttpStatus.OK) { if (response.statusCode() == HttpStatus.OK) {
return response.bodyToMono(String.class); return response.bodyToMono(String.class);
} else if (response.statusCode() } else if (response.statusCode().is4xxClientError()) {
.is4xxClientError()) {
return Mono.just("Error response"); return Mono.just("Error response");
} else { } else {
return response.createException() return response.createException()
@ -220,8 +226,7 @@ public class WebClientIntegrationTest {
Mono<String> responsePostNoBody = createDefaultPostResourceRequest().exchangeToMono(response -> { Mono<String> responsePostNoBody = createDefaultPostResourceRequest().exchangeToMono(response -> {
if (response.statusCode() == HttpStatus.OK) { if (response.statusCode() == HttpStatus.OK) {
return response.bodyToMono(String.class); return response.bodyToMono(String.class);
} else if (response.statusCode() } else if (response.statusCode().is4xxClientError()) {
.is4xxClientError()) {
return Mono.just("Error response"); return Mono.just("Error response");
} else { } else {
return response.createException() return response.createException()
@ -268,8 +273,8 @@ public class WebClientIntegrationTest {
StepVerifier.create(neverendingMonoBodyRequest.retrieve() StepVerifier.create(neverendingMonoBodyRequest.retrieve()
.bodyToMono(String.class)) .bodyToMono(String.class))
.expectErrorMatches(ex -> WebClientRequestException.class.isAssignableFrom(ex.getClass()) && ReadTimeoutException.class.isAssignableFrom(ex.getCause() .expectErrorMatches(ex -> WebClientRequestException.class.isAssignableFrom(ex.getClass())
.getClass())) && ReadTimeoutException.class.isAssignableFrom(ex.getCause().getClass()))
.verify(); .verify();
} }

View File

@ -1,22 +1,22 @@
package com.baeldung.reactive.webclient; package com.baeldung.reactive.webclient;
import org.junit.Before; import org.junit.jupiter.api.BeforeEach;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
import org.springframework.boot.web.server.LocalServerPort; import org.springframework.boot.web.server.LocalServerPort;
import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.web.reactive.server.WebTestClient; import org.springframework.test.web.reactive.server.WebTestClient;
@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS) import static org.springframework.test.annotation.DirtiesContext.ClassMode.BEFORE_CLASS;
@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = WebClientApplication.class) @DirtiesContext(classMode = BEFORE_CLASS)
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, classes = WebClientApplication.class)
public class WebControllerIntegrationTest { public class WebControllerIntegrationTest {
@LocalServerPort @LocalServerPort
int randomServerPort; private int randomServerPort;
@Autowired @Autowired
private WebTestClient testClient; private WebTestClient testClient;
@ -24,30 +24,26 @@ public class WebControllerIntegrationTest {
@Autowired @Autowired
private WebController webController; private WebController webController;
@Before @BeforeEach
public void setup() { void setup() {
webController.setServerPort(randomServerPort); webController.setServerPort(randomServerPort);
} }
@Test @Test
public void whenEndpointWithBlockingClientIsCalled_thenThreeTweetsAreReceived() { void whenEndpointWithBlockingClientIsCalled_thenThreeTweetsAreReceived() {
testClient.get() testClient.get()
.uri("/tweets-blocking") .uri("/tweets-blocking")
.exchange() .exchange()
.expectStatus() .expectStatus().isOk()
.isOk() .expectBodyList(Tweet.class).hasSize(3);
.expectBodyList(Tweet.class)
.hasSize(3);
} }
@Test @Test
public void whenEndpointWithNonBlockingClientIsCalled_thenThreeTweetsAreReceived() { void whenEndpointWithNonBlockingClientIsCalled_thenThreeTweetsAreReceived() {
testClient.get() testClient.get()
.uri("/tweets-non-blocking") .uri("/tweets-non-blocking")
.exchange() .exchange()
.expectStatus() .expectStatus().isOk()
.isOk() .expectBodyList(Tweet.class).hasSize(3);
.expectBodyList(Tweet.class)
.hasSize(3);
} }
} }

View File

@ -3,6 +3,7 @@ package com.baeldung.reactive.webclient;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
import org.springframework.boot.web.server.LocalServerPort; import org.springframework.boot.web.server.LocalServerPort;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
import org.springframework.security.test.context.support.WithMockUser; import org.springframework.security.test.context.support.WithMockUser;
@ -14,7 +15,7 @@ import org.springframework.web.reactive.function.server.ServerResponse;
import org.springframework.web.server.WebHandler; import org.springframework.web.server.WebHandler;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
@SpringBootTest(classes = WebClientApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) @SpringBootTest(classes = WebClientApplication.class, webEnvironment = WebEnvironment.RANDOM_PORT)
public class WebTestClientIntegrationTest { public class WebTestClientIntegrationTest {
@LocalServerPort @LocalServerPort
@ -26,73 +27,61 @@ public class WebTestClientIntegrationTest {
@Autowired @Autowired
private WebClientController controller; private WebClientController controller;
private final RouterFunction ROUTER_FUNCTION = RouterFunctions.route(RequestPredicates.GET("/resource"), request -> ServerResponse.ok()
.build());
private final WebHandler WEB_HANDLER = exchange -> Mono.empty();
@Test @Test
public void testWebTestClientWithServerWebHandler() { public void whenBindToWebHandler_thenRequestProcessed() {
WebTestClient.bindToWebHandler(WEB_HANDLER) WebHandler webHandler = exchange -> Mono.empty();
.build();
WebTestClient.bindToWebHandler(webHandler)
.build()
.get()
.exchange()
.expectBody().isEmpty();
} }
@Test @Test
public void testWebTestClientWithRouterFunction() { public void whenBindToRouter_thenRequestProcessed() {
WebTestClient.bindToRouterFunction(ROUTER_FUNCTION) RouterFunction<ServerResponse> routerFunction = RouterFunctions.route(
RequestPredicates.GET("/resource"),
request -> ServerResponse.ok().build()
);
WebTestClient.bindToRouterFunction(routerFunction)
.build() .build()
.get() .get().uri("/resource")
.uri("/resource")
.exchange() .exchange()
.expectStatus() .expectStatus().isOk()
.isOk() .expectBody().isEmpty();
.expectBody()
.isEmpty();
} }
@Test @Test
@WithMockUser @WithMockUser
public void testWebTestClientWithServerURL() { public void whenBindToServer_thenRequestProcessed() {
WebTestClient.bindToServer() WebTestClient.bindToServer()
.baseUrl("http://localhost:" + port) .baseUrl("http://localhost:" + port).build()
.build() .get().uri("/resource")
.get()
.uri("/resource")
.exchange() .exchange()
.expectStatus() .expectStatus().isOk()
.isOk() .expectBody().jsonPath("field").isEqualTo("value");
.expectBody()
.jsonPath("field")
.isEqualTo("value");
;
} }
@Test @Test
@WithMockUser @WithMockUser
public void testWebTestClientWithApplicationContext() { public void whenBindToApplicationContext_thenRequestProcessed() {
WebTestClient.bindToApplicationContext(context) WebTestClient.bindToApplicationContext(context)
.build() .build()
.get() .get().uri("/resource")
.uri("/resource")
.exchange() .exchange()
.expectStatus() .expectStatus().isOk()
.isOk() .expectBody().jsonPath("field").isEqualTo("value");
.expectBody()
.jsonPath("field")
.isEqualTo("value");
} }
@Test @Test
public void testWebTestClientWithController() { public void whenBindToController_thenRequestProcessed() {
WebTestClient.bindToController(controller) WebTestClient.bindToController(controller)
.build() .build()
.get() .get().uri("/resource")
.uri("/resource")
.exchange() .exchange()
.expectStatus() .expectStatus().isOk()
.isOk() .expectBody().jsonPath("field").isEqualTo("value");
.expectBody()
.jsonPath("field")
.isEqualTo("value");
} }
} }