Merge pull request eugenp#10461 from osser-sam/JAVA-4312

JAVA-4312: Update deprecations in spring-5-reactive module
MkCons · Feb 4, 2021 · 9bd9400 · 9bd9400
2 parents 604659d + 57bedf6
commit 9bd9400
Show file tree

Hide file tree

Showing 13 changed files with 33 additions and 33 deletions.
diff --git a/spring-5-reactive/src/main/java/com/baeldung/functional/FormHandler.java b/spring-5-reactive/src/main/java/com/baeldung/functional/FormHandler.java
@@ -11,7 +11,7 @@
 
 import static org.springframework.web.reactive.function.BodyExtractors.toDataBuffers;
 import static org.springframework.web.reactive.function.BodyExtractors.toFormData;
-import static org.springframework.web.reactive.function.BodyInserters.fromObject;
+import static org.springframework.web.reactive.function.BodyInserters.fromValue;
 import static org.springframework.web.reactive.function.server.ServerResponse.ok;
 
 public class FormHandler {
@@ -29,7 +29,7 @@ Mono<ServerResponse> handleLogin(ServerRequest request) {
     Mono<ServerResponse> handleUpload(ServerRequest request) {
         return request.body(toDataBuffers())
             .collectList()
-            .flatMap(dataBuffers -> ok().body(fromObject(extractData(dataBuffers).toString())));
+            .flatMap(dataBuffers -> ok().body(fromValue(extractData(dataBuffers).toString())));
     }
 
     private AtomicLong extractData(List<DataBuffer> dataBuffers) {

diff --git a/spring-5-reactive/src/main/java/com/baeldung/functional/FunctionalSpringBootApplication.java b/spring-5-reactive/src/main/java/com/baeldung/functional/FunctionalSpringBootApplication.java
@@ -1,6 +1,6 @@
 package com.baeldung.functional;
 
-import static org.springframework.web.reactive.function.BodyInserters.fromObject;
+import static org.springframework.web.reactive.function.BodyInserters.fromValue;
 import static org.springframework.web.reactive.function.server.RequestPredicates.GET;
 import static org.springframework.web.reactive.function.server.RequestPredicates.POST;
 import static org.springframework.web.reactive.function.server.RequestPredicates.path;
@@ -44,7 +44,7 @@ private RouterFunction<ServerResponse> routingFunction() {
                     .doOnNext(actors::add)
                     .then(ok().build()));
 
-        return route(GET("/test"), serverRequest -> ok().body(fromObject("helloworld")))
+        return route(GET("/test"), serverRequest -> ok().body(fromValue("helloworld")))
             .andRoute(POST("/login"), formHandler::handleLogin)
             .andRoute(POST("/upload"), formHandler::handleUpload)
             .and(RouterFunctions.resources("/files/**", new ClassPathResource("files/")))

diff --git a/spring-5-reactive/src/main/java/com/baeldung/functional/FunctionalWebApplication.java b/spring-5-reactive/src/main/java/com/baeldung/functional/FunctionalWebApplication.java
@@ -1,6 +1,6 @@
 package com.baeldung.functional;
 
-import static org.springframework.web.reactive.function.BodyInserters.fromObject;
+import static org.springframework.web.reactive.function.BodyInserters.fromValue;
 import static org.springframework.web.reactive.function.server.RequestPredicates.GET;
 import static org.springframework.web.reactive.function.server.RequestPredicates.POST;
 import static org.springframework.web.reactive.function.server.RequestPredicates.accept;
@@ -42,7 +42,7 @@ private RouterFunction<ServerResponse> routingFunction() {
             .doOnNext(actors::add)
             .then(ok().build()));
 
-        return route(GET("/test"), serverRequest -> ok().body(fromObject("helloworld"))).andRoute(POST("/login"), formHandler::handleLogin)
+        return route(GET("/test"), serverRequest -> ok().body(fromValue("helloworld"))).andRoute(POST("/login"), formHandler::handleLogin)
             .andRoute(POST("/upload"), formHandler::handleUpload)
             .and(RouterFunctions.resources("/files/**", new ClassPathResource("files/")))
             .andNest(accept(MediaType.APPLICATION_JSON), restfulRouter)

diff --git a/spring-5-reactive/src/main/java/com/baeldung/functional/RootServlet.java b/spring-5-reactive/src/main/java/com/baeldung/functional/RootServlet.java
@@ -2,7 +2,7 @@
 
 import static org.springframework.web.reactive.function.BodyExtractors.toDataBuffers;
 import static org.springframework.web.reactive.function.BodyExtractors.toFormData;
-import static org.springframework.web.reactive.function.BodyInserters.fromObject;
+import static org.springframework.web.reactive.function.BodyInserters.fromValue;
 import static org.springframework.web.reactive.function.server.RequestPredicates.GET;
 import static org.springframework.web.reactive.function.server.RequestPredicates.POST;
 import static org.springframework.web.reactive.function.server.RequestPredicates.path;
@@ -46,7 +46,7 @@ public RootServlet() {
 
     private static RouterFunction<?> routingFunction() {
 
-        return route(GET("/test"), serverRequest -> ok().body(fromObject("helloworld"))).andRoute(POST("/login"), serverRequest -> serverRequest.body(toFormData())
+        return route(GET("/test"), serverRequest -> ok().body(fromValue("helloworld"))).andRoute(POST("/login"), serverRequest -> serverRequest.body(toFormData())
             .map(MultiValueMap::toSingleValueMap)
             .map(formData -> {
                 System.out.println("form data: " + formData.toString());
@@ -65,7 +65,7 @@ private static RouterFunction<?> routingFunction() {
                     dataBuffers.forEach(d -> atomicLong.addAndGet(d.asByteBuffer()
                         .array().length));
                     System.out.println("data length:" + atomicLong.get());
-                    return ok().body(fromObject(atomicLong.toString()))
+                    return ok().body(fromValue(atomicLong.toString()))
                         .block();
                 }))
             .and(RouterFunctions.resources("/files/**", new ClassPathResource("files/")))

diff --git a/...ive/src/main/java/com/baeldung/reactive/errorhandling/GlobalErrorWebExceptionHandler.java b/...ive/src/main/java/com/baeldung/reactive/errorhandling/GlobalErrorWebExceptionHandler.java
@@ -2,7 +2,8 @@
 package com.baeldung.reactive.errorhandling;
 
 import java.util.Map;
-import org.springframework.boot.autoconfigure.web.ResourceProperties;
+
+import org.springframework.boot.autoconfigure.web.WebProperties;
 import org.springframework.boot.autoconfigure.web.reactive.error.AbstractErrorWebExceptionHandler;
 import org.springframework.boot.web.error.ErrorAttributeOptions;
 import org.springframework.boot.web.reactive.error.ErrorAttributes;
@@ -18,6 +19,7 @@
 import org.springframework.web.reactive.function.server.RouterFunctions;
 import org.springframework.web.reactive.function.server.ServerRequest;
 import org.springframework.web.reactive.function.server.ServerResponse;
+
 import reactor.core.publisher.Mono;
 
 @Component
@@ -26,7 +28,7 @@ public class GlobalErrorWebExceptionHandler extends AbstractErrorWebExceptionHan
 
     public GlobalErrorWebExceptionHandler(GlobalErrorAttributes g, ApplicationContext applicationContext, 
             ServerCodecConfigurer serverCodecConfigurer) {
-        super(g, new ResourceProperties(), applicationContext);
+        super(g, new WebProperties.Resources(), applicationContext);
         super.setMessageWriters(serverCodecConfigurer.getWriters());
         super.setMessageReaders(serverCodecConfigurer.getReaders());
     }
@@ -41,8 +43,8 @@ private Mono<ServerResponse> renderErrorResponse(final ServerRequest request) {
         final Map<String, Object> errorPropertiesMap = getErrorAttributes(request, ErrorAttributeOptions.defaults());
 
         return ServerResponse.status(HttpStatus.BAD_REQUEST)
-            .contentType(MediaType.APPLICATION_JSON_UTF8)
-            .body(BodyInserters.fromObject(errorPropertiesMap));
+            .contentType(MediaType.APPLICATION_JSON)
+            .body(BodyInserters.fromValue(errorPropertiesMap));
     }
 
 }
diff --git a/spring-5-reactive/src/main/java/com/baeldung/reactive/errorhandling/handlers/Handler1.java b/spring-5-reactive/src/main/java/com/baeldung/reactive/errorhandling/handlers/Handler1.java
@@ -14,7 +14,7 @@ public Mono<ServerResponse> handleRequest1(ServerRequest request) {
         return sayHello(request).onErrorReturn("Hello, Stranger")
             .flatMap(s -> ServerResponse.ok()
                 .contentType(MediaType.TEXT_PLAIN)
-                .syncBody(s));
+                .bodyValue(s));
     }
 
     private Mono<String> sayHello(ServerRequest request) {

diff --git a/spring-5-reactive/src/main/java/com/baeldung/reactive/errorhandling/handlers/Handler2.java b/spring-5-reactive/src/main/java/com/baeldung/reactive/errorhandling/handlers/Handler2.java
@@ -15,11 +15,11 @@ public Mono<ServerResponse> handleRequest2(ServerRequest request) {
         sayHello(request)
             .flatMap(s -> ServerResponse.ok()
                 .contentType(MediaType.TEXT_PLAIN)
-                .syncBody(s))
+                .bodyValue(s))
             .onErrorResume(e -> sayHelloFallback()
                 .flatMap(s -> ServerResponse.ok()
                     .contentType(MediaType.TEXT_PLAIN)
-                    .syncBody(s)));
+                    .bodyValue(s)));
 }
 
     private Mono<String> sayHello(ServerRequest request) {

diff --git a/spring-5-reactive/src/main/java/com/baeldung/reactive/errorhandling/handlers/Handler3.java b/spring-5-reactive/src/main/java/com/baeldung/reactive/errorhandling/handlers/Handler3.java
@@ -15,11 +15,11 @@ public Mono<ServerResponse> handleRequest3(ServerRequest request) {
             sayHello(request)
               .flatMap(s -> ServerResponse.ok()
                         .contentType(MediaType.TEXT_PLAIN)
-                        .syncBody(s))
+                        .bodyValue(s))
               .onErrorResume(e -> (Mono.just("Hi, I looked around for your name but found: " + 
                     e.getMessage())).flatMap(s -> ServerResponse.ok()
                 .contentType(MediaType.TEXT_PLAIN)
-                .syncBody(s)));
+                .bodyValue(s)));
     }
 
     private Mono<String> sayHello(ServerRequest request) {

diff --git a/...ain/java/com/baeldung/reactive/urlmatch/ExploreSpring5URLPatternUsingRouterFunctions.java b/...ain/java/com/baeldung/reactive/urlmatch/ExploreSpring5URLPatternUsingRouterFunctions.java
@@ -1,6 +1,6 @@
 package com.baeldung.reactive.urlmatch;
 
-import static org.springframework.web.reactive.function.BodyInserters.fromObject;
+import static org.springframework.web.reactive.function.BodyInserters.fromValue;
 import static org.springframework.web.reactive.function.server.RequestPredicates.GET;
 import static org.springframework.web.reactive.function.server.RouterFunctions.route;
 import static org.springframework.web.reactive.function.server.RouterFunctions.toHttpHandler;
@@ -24,10 +24,10 @@ public class ExploreSpring5URLPatternUsingRouterFunctions {
 
     private RouterFunction<ServerResponse> routingFunction() {
 
-        return route(GET("/p?ths"), serverRequest -> ok().body(fromObject("/p?ths"))).andRoute(GET("/test/{*id}"), serverRequest -> ok().body(fromObject(serverRequest.pathVariable("id"))))
-            .andRoute(GET("/*card"), serverRequest -> ok().body(fromObject("/*card path was accessed")))
-            .andRoute(GET("/{var1}_{var2}"), serverRequest -> ok().body(fromObject(serverRequest.pathVariable("var1") + " , " + serverRequest.pathVariable("var2"))))
-            .andRoute(GET("/{baeldung:[a-z]+}"), serverRequest -> ok().body(fromObject("/{baeldung:[a-z]+} was accessed and baeldung=" + serverRequest.pathVariable("baeldung"))))
+        return route(GET("/p?ths"), serverRequest -> ok().body(fromValue("/p?ths"))).andRoute(GET("/test/{*id}"), serverRequest -> ok().body(fromValue(serverRequest.pathVariable("id"))))
+            .andRoute(GET("/*card"), serverRequest -> ok().body(fromValue("/*card path was accessed")))
+            .andRoute(GET("/{var1}_{var2}"), serverRequest -> ok().body(fromValue(serverRequest.pathVariable("var1") + " , " + serverRequest.pathVariable("var2"))))
+            .andRoute(GET("/{baeldung:[a-z]+}"), serverRequest -> ok().body(fromValue("/{baeldung:[a-z]+} was accessed and baeldung=" + serverRequest.pathVariable("baeldung"))))
             .and(RouterFunctions.resources("/files/{*filepaths}", new ClassPathResource("files/")));
     }
 

diff --git a/spring-5-reactive/src/main/java/com/baeldung/reactive/urlmatch/FormHandler.java b/spring-5-reactive/src/main/java/com/baeldung/reactive/urlmatch/FormHandler.java
@@ -11,7 +11,7 @@
 
 import static org.springframework.web.reactive.function.BodyExtractors.toDataBuffers;
 import static org.springframework.web.reactive.function.BodyExtractors.toFormData;
-import static org.springframework.web.reactive.function.BodyInserters.fromObject;
+import static org.springframework.web.reactive.function.BodyInserters.fromValue;
 import static org.springframework.web.reactive.function.server.ServerResponse.ok;
 
 public class FormHandler {
@@ -29,7 +29,7 @@ Mono<ServerResponse> handleLogin(ServerRequest request) {
     Mono<ServerResponse> handleUpload(ServerRequest request) {
         return request.body(toDataBuffers())
             .collectList()
-            .flatMap(dataBuffers -> ok().body(fromObject(extractData(dataBuffers).toString())));
+            .flatMap(dataBuffers -> ok().body(fromValue(extractData(dataBuffers).toString())));
     }
 
     private AtomicLong extractData(List<DataBuffer> dataBuffers) {

diff --git a/spring-5-reactive/src/main/java/com/baeldung/reactive/urlmatch/FunctionalWebApplication.java b/spring-5-reactive/src/main/java/com/baeldung/reactive/urlmatch/FunctionalWebApplication.java
@@ -1,6 +1,6 @@
 package com.baeldung.reactive.urlmatch;
 
-import static org.springframework.web.reactive.function.BodyInserters.fromObject;
+import static org.springframework.web.reactive.function.BodyInserters.fromValue;
 import static org.springframework.web.reactive.function.server.RequestPredicates.GET;
 import static org.springframework.web.reactive.function.server.RequestPredicates.POST;
 import static org.springframework.web.reactive.function.server.RequestPredicates.path;
@@ -40,7 +40,7 @@ private RouterFunction<ServerResponse> routingFunction() {
             .doOnNext(actors::add)
             .then(ok().build()));
 
-        return route(GET("/test"), serverRequest -> ok().body(fromObject("helloworld"))).andRoute(POST("/login"), formHandler::handleLogin)
+        return route(GET("/test"), serverRequest -> ok().body(fromValue("helloworld"))).andRoute(POST("/login"), formHandler::handleLogin)
             .andRoute(POST("/upload"), formHandler::handleUpload)
             .and(RouterFunctions.resources("/files/**", new ClassPathResource("files/")))
             .andNest(path("/actor"), restfulRouter)

diff --git a/...active/src/test/java/com/baeldung/functional/FunctionalWebApplicationIntegrationTest.java b/...active/src/test/java/com/baeldung/functional/FunctionalWebApplicationIntegrationTest.java
@@ -1,17 +1,15 @@
 package com.baeldung.functional;
 
-import static org.springframework.web.reactive.function.BodyInserters.fromObject;
+import static org.springframework.web.reactive.function.BodyInserters.fromValue;
 import static org.springframework.web.reactive.function.BodyInserters.fromResource;
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.boot.web.server.WebServer;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.http.MediaType;
-import org.springframework.security.test.context.support.WithMockUser;
 import org.springframework.test.web.reactive.server.WebTestClient;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
@@ -115,7 +113,7 @@ public void givenActors_whenAddActor_thenAdded() throws Exception {
 
         client.post()
             .uri("/actor")
-            .body(fromObject(new Actor("Clint", "Eastwood")))
+            .body(fromValue(new Actor("Clint", "Eastwood")))
             .exchange()
             .expectStatus()
             .isOk();

diff --git a/...ctive/src/test/java/com/baeldung/reactive/errorhandling/ErrorHandlingIntegrationTest.java b/...ctive/src/test/java/com/baeldung/reactive/errorhandling/ErrorHandlingIntegrationTest.java
@@ -133,7 +133,7 @@ public void givenResumeRethrow_whenNoUsername_thenOk() throws IOException {
             .expectStatus()
             .isBadRequest()
             .expectHeader()
-            .contentType(MediaType.APPLICATION_JSON_UTF8)
+            .contentType(MediaType.APPLICATION_JSON)
             .expectBody()
             .jsonPath("$.message")
             .isNotEmpty()
@@ -164,7 +164,7 @@ public void givenGlobalErrorHandling_whenNoUsername_thenOk() throws IOException
             .expectStatus()
             .isBadRequest()
             .expectHeader()
-            .contentType(MediaType.APPLICATION_JSON_UTF8)
+            .contentType(MediaType.APPLICATION_JSON)
             .expectBody()
             .jsonPath("$.message")
             .isNotEmpty()