Merge pull request #10439 from rozagerardo/rozagerardo/JAVA-4284_Fix-issues-in-spring-5-weblcient-article

[JAVA-4284] Fix issues in "Spring Webclient" article

spring-5-reactive/pom.xml

@@ -149,7 +149,6 @@
     </build>
 
     <properties>
-        <reactor-spring.version>1.0.1.RELEASE</reactor-spring.version>
         <johnzon.version>1.1.3</johnzon.version>
         <jsonb-api.version>1.0</jsonb-api.version>
         <geronimo-json_1.1_spec.version>1.0</geronimo-json_1.1_spec.version>

spring-5-reactive/src/main/java/com/baeldung/web/reactive/client/WebClientApplication.java

@@ -0,0 +1,13 @@
+package com.baeldung.web.reactive.client;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class WebClientApplication{
+
+    public static void main(String[] args) {
+        SpringApplication.run(WebClientApplication.class, args);
+    }
+
+}

spring-5-reactive/src/main/java/com/baeldung/web/reactive/client/WebClientController.java

@@ -1,28 +1,46 @@
 package com.baeldung.web.reactive.client;
 
+import java.net.URI;
+import java.nio.charset.Charset;
+import java.time.ZonedDateTime;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
 import org.reactivestreams.Publisher;
 import org.reactivestreams.Subscriber;
-import org.springframework.http.*;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ReactiveHttpOutputMessage;
+import org.springframework.http.client.reactive.ClientHttpRequest;
+import org.springframework.http.client.reactive.ReactorClientHttpConnector;
 import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.reactive.function.BodyInserter;
 import org.springframework.web.reactive.function.BodyInserters;
 import org.springframework.web.reactive.function.client.WebClient;
-import reactor.core.publisher.Mono;
 
-import java.net.URI;
+import io.netty.channel.ChannelOption;
-import java.nio.charset.Charset;
+import io.netty.handler.timeout.ReadTimeoutHandler;
-import java.time.ZonedDateTime;
+import io.netty.handler.timeout.WriteTimeoutHandler;
-import java.util.Collections;
+import reactor.core.publisher.Mono;
+import reactor.netty.http.client.HttpClient;
 
 @RestController
 public class WebClientController {
 
     @ResponseStatus(HttpStatus.OK)
     @GetMapping("/resource")
-    public void getResource() {
+    public Map<String, String> getResource() {
+        Map<String, String> response = new HashMap<>();
+        response.put("field", "value");
+        return response;
     }
 
     public void demonstrateWebClient() {
@@ -38,18 +56,18 @@ public class WebClientController {
 
         // request header specification
         WebClient.RequestHeadersSpec<?> requestSpec1 = uri1.body(BodyInserters.fromPublisher(Mono.just("data"), String.class));
-        WebClient.RequestHeadersSpec<?> requestSpec2 = uri2.body(BodyInserters.fromObject("data"));
+        WebClient.RequestHeadersSpec<?> requestSpec2 = uri2.body(BodyInserters.fromValue("data"));
 
         // inserters
-        BodyInserter<Publisher<String>, ReactiveHttpOutputMessage> inserter1 = BodyInserters
+        BodyInserter<Publisher<String>, ReactiveHttpOutputMessage> inserter1 = BodyInserters.fromPublisher(Subscriber::onComplete, String.class);
-                .fromPublisher(Subscriber::onComplete, String.class);
 
         LinkedMultiValueMap<String, String> map = new LinkedMultiValueMap<>();
         map.add("key1", "value1");
         map.add("key2", "value2");
 
-        // BodyInserter<MultiValueMap<String, ?>, ClientHttpRequest> inserter2 = BodyInserters.fromMultipartData(map);
+        BodyInserter<MultiValueMap<String, Object>, ClientHttpRequest> inserter2 = BodyInserters.fromMultipartData(map);
-        BodyInserter<String, ReactiveHttpOutputMessage> inserter3 = BodyInserters.fromObject("body");
+        BodyInserter<Object, ReactiveHttpOutputMessage> inserter3 = BodyInserters.fromValue(new Object());
+        BodyInserter<String, ReactiveHttpOutputMessage> inserter4 = BodyInserters.fromValue("body");
 
         // responses
         WebClient.ResponseSpec response1 = uri1.body(inserter3)
@@ -59,8 +77,12 @@ public class WebClientController {
             .ifNoneMatch("*")
             .ifModifiedSince(ZonedDateTime.now())
             .retrieve();
-        WebClient.ResponseSpec response2 = requestSpec2.retrieve();
+        String response2 = uri1.exchangeToMono(response -> response.bodyToMono(String.class))
-
+            .block();
+        String response3 = uri2.retrieve()
+            .bodyToMono(String.class)
+            .block();
+        WebClient.ResponseSpec response4 = requestSpec2.retrieve();
     }
 
     private WebClient createWebClient() {
@@ -71,6 +93,17 @@ public class WebClientController {
         return WebClient.create("http://localhost:8081");
     }
 
+    private WebClient createWebClientConfiguringTimeout() {
+        HttpClient httpClient = HttpClient.create()
+            .option(ChannelOption.CONNECT_TIMEOUT_MILLIS, 5000)
+            .doOnConnected(conn -> conn.addHandlerLast(new ReadTimeoutHandler(5000, TimeUnit.MILLISECONDS))
+                .addHandlerLast(new WriteTimeoutHandler(5000, TimeUnit.MILLISECONDS)));
+
+        return WebClient.builder()
+            .clientConnector(new ReactorClientHttpConnector(httpClient))
+            .build();
+    }
+
     private WebClient createWebClientWithServerURLAndDefaultValues() {
         return WebClient.builder()
             .baseUrl("http://localhost:8081")

spring-5-reactive/src/test/java/com/baeldung/web/client/SpringContextTest.java

@@ -0,0 +1,14 @@
+package com.baeldung.web.client;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import com.baeldung.web.reactive.client.WebClientApplication;
+
+@SpringBootTest(classes = WebClientApplication.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}

spring-5-reactive/src/test/java/com/baeldung/web/client/WebTestClientIntegrationTest.java

@@ -1,11 +1,11 @@
 package com.baeldung.web.client;
 
-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.boot.test.context.SpringBootTest;
 import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.context.ApplicationContext;
 import org.springframework.security.test.context.support.WithMockUser;
-import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.reactive.server.WebTestClient;
 import org.springframework.web.reactive.function.server.RequestPredicates;
 import org.springframework.web.reactive.function.server.RouterFunction;
@@ -13,18 +13,23 @@ import org.springframework.web.reactive.function.server.RouterFunctions;
 import org.springframework.web.reactive.function.server.ServerResponse;
 import org.springframework.web.server.WebHandler;
 
-import com.baeldung.reactive.Spring5ReactiveApplication;
+import com.baeldung.web.reactive.client.WebClientApplication;
+import com.baeldung.web.reactive.client.WebClientController;
 
 import reactor.core.publisher.Mono;
 
-@RunWith(SpringRunner.class)
+@SpringBootTest(classes = WebClientApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@SpringBootTest(classes = Spring5ReactiveApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@WithMockUser
 public class WebTestClientIntegrationTest {
 
     @LocalServerPort
     private int port;
 
+    @Autowired
+    private ApplicationContext context;
+
+    @Autowired
+    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();
@@ -49,6 +54,7 @@ public class WebTestClientIntegrationTest {
     }
 
     @Test
+    @WithMockUser
     public void testWebTestClientWithServerURL() {
         WebTestClient.bindToServer()
             .baseUrl("http://localhost:" + port)
@@ -58,7 +64,39 @@ public class WebTestClientIntegrationTest {
             .exchange()
             .expectStatus()
             .isOk()
-            .expectBody();
+            .expectBody()
+            .jsonPath("field")
+            .isEqualTo("value");
+        ;
+    }
+
+    @Test
+    @WithMockUser
+    public void testWebTestClientWithApplicationContext() {
+        WebTestClient.bindToApplicationContext(context)
+            .build()
+            .get()
+            .uri("/resource")
+            .exchange()
+            .expectStatus()
+            .isOk()
+            .expectBody()
+            .jsonPath("field")
+            .isEqualTo("value");
+    }
+
+    @Test
+    public void testWebTestClientWithController() {
+        WebTestClient.bindToController(controller)
+            .build()
+            .get()
+            .uri("/resource")
+            .exchange()
+            .expectStatus()
+            .isOk()
+            .expectBody()
+            .jsonPath("field")
+            .isEqualTo("value");
     }
 
 }