Merge pull request #5836 from rozagerardo/geroza/BAEL-10843_subtask-part-1_BAEL-10354_migrateparent-boot-to-spring-boot-2.1_part-1

BAEL-10843 | Upgrade set of modules to use boot 2.1 - part 1

spring-5-reactive/src/main/java/com/baeldung/debugging/consumer/ConsumerDebuggingApplication.java

@@ -14,17 +14,17 @@ import reactor.core.publisher.Hooks;
 
 @SpringBootApplication(exclude = MongoReactiveAutoConfiguration.class)
 @EnableScheduling
-public class ConsumerSSEApplication {
+public class ConsumerDebuggingApplication {
 
     public static void main(String[] args) {
         Hooks.onOperatorDebug();
-        SpringApplication app = new SpringApplication(ConsumerSSEApplication.class);
+        SpringApplication app = new SpringApplication(ConsumerDebuggingApplication.class);
         app.setDefaultProperties(Collections.singletonMap("server.port", "8082"));
         app.run(args);
     }
 
     @Bean
-    public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) {
+    public SecurityWebFilterChain debuggingConsumerSpringSecurityFilterChain(ServerHttpSecurity http) {
         http.authorizeExchange()
             .anyExchange()
             .permitAll();

spring-5-reactive/src/main/java/com/baeldung/debugging/server/ServerDebuggingApplication.java

@@ -11,16 +11,16 @@ import org.springframework.web.reactive.config.EnableWebFlux;
 
 @EnableWebFlux
 @SpringBootApplication
-public class ServerSSEApplication {
+public class ServerDebuggingApplication {
     
     public static void main(String[] args) {
-        SpringApplication app = new SpringApplication(ServerSSEApplication.class);
+        SpringApplication app = new SpringApplication(ServerDebuggingApplication.class);
         app.setDefaultProperties(Collections.singletonMap("server.port", "8081"));
         app.run(args);
     }
     
     @Bean
-    public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) {
+    public SecurityWebFilterChain debuggingServerSpringSecurityFilterChain(ServerHttpSecurity http) {
         http.authorizeExchange()
             .anyExchange()
             .permitAll();

spring-5-reactive/src/main/java/com/baeldung/functional/FunctionalSpringBootApplication.java

@@ -17,8 +17,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.ServletRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Profile;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.http.server.reactive.HttpHandler;
 import org.springframework.web.reactive.function.server.RouterFunction;
@@ -40,11 +38,14 @@ public class FunctionalSpringBootApplication {
     private RouterFunction<ServerResponse> routingFunction() {
         FormHandler formHandler = new FormHandler();
 
-        RouterFunction<ServerResponse> restfulRouter = route(GET("/"), serverRequest -> ok().body(Flux.fromIterable(actors), Actor.class)).andRoute(POST("/"), serverRequest -> serverRequest.bodyToMono(Actor.class)
-            .doOnNext(actors::add)
-            .then(ok().build()));
+        RouterFunction<ServerResponse> restfulRouter = route(GET("/"),
+            serverRequest -> ok().body(Flux.fromIterable(actors), Actor.class)).andRoute(POST("/"),
+                serverRequest -> serverRequest.bodyToMono(Actor.class)
+                    .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(fromObject("helloworld")))
+            .andRoute(POST("/login"), formHandler::handleLogin)
             .andRoute(POST("/upload"), formHandler::handleUpload)
             .and(RouterFunctions.resources("/files/**", new ClassPathResource("files/")))
             .andNest(path("/actor"), restfulRouter)
@@ -68,5 +69,4 @@ public class FunctionalSpringBootApplication {
     public static void main(String[] args) {
         SpringApplication.run(FunctionalSpringBootApplication.class, args);
     }
-
 }

spring-5-reactive/src/main/java/com/baeldung/reactive/Spring5ReactiveApplication.java

@@ -1,9 +1,7 @@
 package com.baeldung.reactive;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Bean;
 
 @SpringBootApplication
 public class Spring5ReactiveApplication{

spring-5-reactive/src/main/java/com/baeldung/reactive/cors/annotated/CorsOnAnnotatedElementsApplication.java

@@ -4,6 +4,9 @@ import java.util.Collections;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.security.config.web.server.ServerHttpSecurity;
+import org.springframework.security.web.server.SecurityWebFilterChain;
 
 @SpringBootApplication
 public class CorsOnAnnotatedElementsApplication {
@@ -14,4 +17,9 @@ public class CorsOnAnnotatedElementsApplication {
         app.run(args);
     }
 
+    @Bean
+    public SecurityWebFilterChain corsAnnotatedSpringSecurityFilterChain(ServerHttpSecurity http) {
+        http.csrf().disable();
+        return http.build();
+    }
 }

spring-5-reactive/src/main/java/com/baeldung/reactive/cors/global/CorsGlobalConfigApplication.java

@@ -8,6 +8,9 @@ import org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfigurat
 import org.springframework.boot.autoconfigure.data.mongo.MongoReactiveDataAutoConfiguration;
 import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
 import org.springframework.boot.autoconfigure.mongo.MongoReactiveAutoConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.security.config.web.server.ServerHttpSecurity;
+import org.springframework.security.web.server.SecurityWebFilterChain;
 
 @SpringBootApplication(exclude = { MongoAutoConfiguration.class,
         MongoDataAutoConfiguration.class,
@@ -22,4 +25,9 @@ public class CorsGlobalConfigApplication {
         app.run(args);
     }
 
+    @Bean
+    public SecurityWebFilterChain corsGlobalSpringSecurityFilterChain(ServerHttpSecurity http) {
+        http.csrf().disable();
+        return http.build();
+    }
 }

spring-5-reactive/src/main/java/com/baeldung/reactive/cors/global/functional/handlers/CorsGlobalFunctionalHandler.java

@@ -7,7 +7,7 @@ import org.springframework.web.reactive.function.server.ServerResponse;
 import reactor.core.publisher.Mono;
 
 @Component
-public class FunctionalHandler {
+public class CorsGlobalFunctionalHandler {
 
     public Mono<ServerResponse> useHandler(final ServerRequest request) {
         final String responseMessage = "CORS GLOBAL CONFIG IS NOT EFFECTIVE ON FUNCTIONAL ENDPOINTS!!!";

spring-5-reactive/src/main/java/com/baeldung/reactive/cors/global/functional/routers/CorsRouterFunctions.java

@@ -8,13 +8,13 @@ import org.springframework.web.reactive.function.server.RouterFunction;
 import org.springframework.web.reactive.function.server.RouterFunctions;
 import org.springframework.web.reactive.function.server.ServerResponse;
 
-import com.baeldung.reactive.cors.global.functional.handlers.FunctionalHandler;
+import com.baeldung.reactive.cors.global.functional.handlers.CorsGlobalFunctionalHandler;
 
 @Configuration
 public class CorsRouterFunctions {
 
     @Bean
-    public RouterFunction<ServerResponse> responseHeaderRoute(@Autowired FunctionalHandler handler) {
+    public RouterFunction<ServerResponse> corsGlobalRouter(@Autowired CorsGlobalFunctionalHandler handler) {
         return RouterFunctions.route(RequestPredicates.PUT("/global-config-on-functional/cors-disabled-functional-endpoint"), handler::useHandler);
     }
 }

spring-5-reactive/src/main/java/com/baeldung/reactive/cors/webfilter/CorsWebFilterApplication.java

@@ -8,6 +8,9 @@ import org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfigurat
 import org.springframework.boot.autoconfigure.data.mongo.MongoReactiveDataAutoConfiguration;
 import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
 import org.springframework.boot.autoconfigure.mongo.MongoReactiveAutoConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.security.config.web.server.ServerHttpSecurity;
+import org.springframework.security.web.server.SecurityWebFilterChain;
 
 @SpringBootApplication(exclude = { MongoAutoConfiguration.class,
         MongoDataAutoConfiguration.class,
@@ -21,5 +24,11 @@ public class CorsWebFilterApplication {
         app.setDefaultProperties(Collections.singletonMap("server.port", "8083"));
         app.run(args);
     }
+    
+    @Bean
+    public SecurityWebFilterChain corsWebfilterSpringSecurityFilterChain(ServerHttpSecurity http) {
+        http.csrf().disable();
+        return http.build();
+    }
 
 }

spring-5-reactive/src/main/java/com/baeldung/reactive/cors/webfilter/functional/routers/CorsWithWebFilterRouterFunctions.java

@@ -14,7 +14,7 @@ import com.baeldung.reactive.cors.webfilter.functional.handlers.CorsWithWebFilte
 public class CorsWithWebFilterRouterFunctions {
 
     @Bean
-    public RouterFunction<ServerResponse> responseHeaderRoute(@Autowired CorsWithWebFilterHandler handler) {
+    public RouterFunction<ServerResponse> corsWebfilterRouter(@Autowired CorsWithWebFilterHandler handler) {
         return RouterFunctions.route(RequestPredicates.PUT("/web-filter-on-functional/functional-endpoint"), handler::useHandler);
     }
 }

spring-5-reactive/src/main/java/com/baeldung/reactive/serversentevents/consumer/ConsumerSSEApplication.java

@@ -4,9 +4,13 @@ import java.util.Collections;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.data.redis.RedisReactiveAutoConfiguration;
+import org.springframework.context.annotation.Bean;
 import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.security.config.web.server.ServerHttpSecurity;
+import org.springframework.security.web.server.SecurityWebFilterChain;
 
-@SpringBootApplication
+@SpringBootApplication(exclude = { RedisReactiveAutoConfiguration.class })
 @EnableAsync
 public class ConsumerSSEApplication {
 
@@ -15,5 +19,13 @@ public class ConsumerSSEApplication {
         app.setDefaultProperties(Collections.singletonMap("server.port", "8082"));
         app.run(args);
     }
+    
+    @Bean
+    public SecurityWebFilterChain sseConsumerSpringSecurityFilterChain(ServerHttpSecurity http) {
+        http.authorizeExchange()
+            .anyExchange()
+            .permitAll();
+        return http.build();
+    }
 
 }

spring-5-reactive/src/main/java/com/baeldung/reactive/serversentevents/server/ServerSSEApplication.java

@@ -4,14 +4,26 @@ import java.util.Collections;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.data.redis.RedisReactiveAutoConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.security.config.web.server.ServerHttpSecurity;
+import org.springframework.security.web.server.SecurityWebFilterChain;
 
-@SpringBootApplication
+@SpringBootApplication(exclude = { RedisReactiveAutoConfiguration.class })
 public class ServerSSEApplication {
-    
+
     public static void main(String[] args) {
         SpringApplication app = new SpringApplication(ServerSSEApplication.class);
         app.setDefaultProperties(Collections.singletonMap("server.port", "8081"));
         app.run(args);
     }
 
+    @Bean
+    public SecurityWebFilterChain sseServerSpringSecurityFilterChain(ServerHttpSecurity http) {
+        http.authorizeExchange()
+            .anyExchange()
+            .permitAll();
+        return http.build();
+    }
+
 }

spring-5-reactive/src/main/java/com/baeldung/validations/functional/FunctionalValidationsApplication.java

@@ -2,6 +2,9 @@ package com.baeldung.validations.functional;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.security.config.web.server.ServerHttpSecurity;
+import org.springframework.security.web.server.SecurityWebFilterChain;
 
 @SpringBootApplication
 public class FunctionalValidationsApplication {
@@ -9,4 +12,13 @@ public class FunctionalValidationsApplication {
     public static void main(String[] args) {
         SpringApplication.run(FunctionalValidationsApplication.class, args);
     }
+    
+    @Bean
+    public SecurityWebFilterChain functionalValidationsSpringSecurityFilterChain(ServerHttpSecurity http) {
+        http.authorizeExchange()
+            .anyExchange()
+            .permitAll();
+        http.csrf().disable();
+        return http.build();
+    }
 }

spring-5-reactive/src/main/java/com/baeldung/validations/functional/routers/ValidationsRouters.java

@@ -17,7 +17,7 @@ import com.baeldung.validations.functional.handlers.impl.OtherEntityValidationHa
 public class ValidationsRouters {
 
     @Bean
-    public RouterFunction<ServerResponse> responseHeaderRoute(@Autowired CustomRequestEntityValidationHandler dryHandler,
+    public RouterFunction<ServerResponse> validationsRouter(@Autowired CustomRequestEntityValidationHandler dryHandler,
         @Autowired FunctionalHandler complexHandler,
         @Autowired OtherEntityValidationHandler otherHandler,
         @Autowired AnnotatedRequestEntityValidationHandler annotatedEntityHandler) {

spring-5-reactive/src/main/java/com/baeldung/websession/configuration/WebFluxSecurityConfig.java

@@ -34,9 +34,8 @@ public class WebFluxSecurityConfig {
     }
 
     @Bean
-    public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) {
-        http
-                .authorizeExchange()
+    public SecurityWebFilterChain webSessionSpringSecurityFilterChain(ServerHttpSecurity http) {
+        http.authorizeExchange()
                 .anyExchange().authenticated()
                 .and()
                 .httpBasic()
@@ -44,8 +43,7 @@ public class WebFluxSecurityConfig {
                 .and()
                 .formLogin();
 
-        http
-                .csrf().disable();
+        http.csrf().disable();
 
         return http.build();