diff --git a/spring-5/pom.xml b/spring-5/pom.xml
index 542cd5023f..e37833ff94 100644
--- a/spring-5/pom.xml
+++ b/spring-5/pom.xml
@@ -33,19 +33,10 @@
org.springframework.boot
spring-boot-starter-web
-
- org.springframework.boot
- spring-boot-starter-webflux
-
org.springframework.boot
spring-boot-starter-hateoas
-
- org.projectreactor
- reactor-spring
- ${reactor-spring.version}
-
javax.json.bind
javax.json.bind-api
@@ -139,11 +130,6 @@
spring-restdocs-mockmvc
test
-
- org.springframework.restdocs
- spring-restdocs-webtestclient
- test
-
org.springframework.restdocs
spring-restdocs-restassured
diff --git a/spring-5/src/main/java/com/baeldung/Spring5Application.java b/spring-5/src/main/java/com/baeldung/Spring5Application.java
index f321871646..41b5c1eed1 100644
--- a/spring-5/src/main/java/com/baeldung/Spring5Application.java
+++ b/spring-5/src/main/java/com/baeldung/Spring5Application.java
@@ -2,10 +2,8 @@ package com.baeldung;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.ComponentScan;
@SpringBootApplication
-@ComponentScan(basePackages = { "com.baeldung.web" })
public class Spring5Application {
public static void main(String[] args) {
diff --git a/spring-5/src/main/java/com/baeldung/SpringSecurity5Application.java b/spring-5/src/main/java/com/baeldung/SpringSecurity5Application.java
deleted file mode 100644
index 02c91a1879..0000000000
--- a/spring-5/src/main/java/com/baeldung/SpringSecurity5Application.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.baeldung;
-
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.http.server.reactive.HttpHandler;
-import org.springframework.http.server.reactive.ReactorHttpHandlerAdapter;
-import org.springframework.web.reactive.config.EnableWebFlux;
-import org.springframework.web.server.adapter.WebHttpHandlerBuilder;
-import reactor.ipc.netty.NettyContext;
-import reactor.ipc.netty.http.server.HttpServer;
-
-@ComponentScan(basePackages = {"com.baeldung.security"})
-@EnableWebFlux
-public class SpringSecurity5Application {
-
- public static void main(String[] args) {
- try (AnnotationConfigApplicationContext context =
- new AnnotationConfigApplicationContext(SpringSecurity5Application.class)) {
- context.getBean(NettyContext.class).onClose().block();
- }
- }
-
- @Bean
- public NettyContext nettyContext(ApplicationContext context) {
- HttpHandler handler = WebHttpHandlerBuilder.applicationContext(context)
- .build();
- ReactorHttpHandlerAdapter adapter = new ReactorHttpHandlerAdapter(handler);
- HttpServer httpServer = HttpServer.create("localhost", 8080);
- return httpServer.newHandler(adapter).block();
- }
-
-}
diff --git a/spring-5/src/main/java/com/baeldung/config/PersistenceConfig.java b/spring-5/src/main/java/com/baeldung/config/PersistenceConfig.java
new file mode 100644
index 0000000000..547685970a
--- /dev/null
+++ b/spring-5/src/main/java/com/baeldung/config/PersistenceConfig.java
@@ -0,0 +1,12 @@
+package com.baeldung.config;
+
+import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+
+@Configuration
+@EnableJpaRepositories("com.baeldung.persistence")
+@EntityScan("com.baeldung.web")
+public class PersistenceConfig {
+
+}
diff --git a/spring-5/src/main/java/com/baeldung/execption/ActorController.java b/spring-5/src/main/java/com/baeldung/exception/ActorController.java
similarity index 97%
rename from spring-5/src/main/java/com/baeldung/execption/ActorController.java
rename to spring-5/src/main/java/com/baeldung/exception/ActorController.java
index 6c9c46253a..17a5b80b64 100644
--- a/spring-5/src/main/java/com/baeldung/execption/ActorController.java
+++ b/spring-5/src/main/java/com/baeldung/exception/ActorController.java
@@ -1,4 +1,4 @@
-package com.baeldung.execption;
+package com.baeldung.exception;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
diff --git a/spring-5/src/main/java/com/baeldung/execption/ActorNotFoundException.java b/spring-5/src/main/java/com/baeldung/exception/ActorNotFoundException.java
similarity index 92%
rename from spring-5/src/main/java/com/baeldung/execption/ActorNotFoundException.java
rename to spring-5/src/main/java/com/baeldung/exception/ActorNotFoundException.java
index 642c075b5d..7439be414d 100644
--- a/spring-5/src/main/java/com/baeldung/execption/ActorNotFoundException.java
+++ b/spring-5/src/main/java/com/baeldung/exception/ActorNotFoundException.java
@@ -1,4 +1,4 @@
-package com.baeldung.execption;
+package com.baeldung.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/spring-5/src/main/java/com/baeldung/execption/ActorService.java b/spring-5/src/main/java/com/baeldung/exception/ActorService.java
similarity index 97%
rename from spring-5/src/main/java/com/baeldung/execption/ActorService.java
rename to spring-5/src/main/java/com/baeldung/exception/ActorService.java
index 956fa92015..0f173d78d6 100644
--- a/spring-5/src/main/java/com/baeldung/execption/ActorService.java
+++ b/spring-5/src/main/java/com/baeldung/exception/ActorService.java
@@ -1,4 +1,4 @@
-package com.baeldung.execption;
+package com.baeldung.exception;
import java.util.Arrays;
import java.util.List;
diff --git a/spring-5/src/main/java/com/baeldung/execption/SpringExceptionApplication.java b/spring-5/src/main/java/com/baeldung/exception/SpringExceptionApplication.java
similarity index 92%
rename from spring-5/src/main/java/com/baeldung/execption/SpringExceptionApplication.java
rename to spring-5/src/main/java/com/baeldung/exception/SpringExceptionApplication.java
index 1670da54c3..ed163f7fa7 100644
--- a/spring-5/src/main/java/com/baeldung/execption/SpringExceptionApplication.java
+++ b/spring-5/src/main/java/com/baeldung/exception/SpringExceptionApplication.java
@@ -1,14 +1,14 @@
-package com.baeldung.execption;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
-import org.springframework.context.annotation.ComponentScan;
-
-@SpringBootApplication(exclude = SecurityAutoConfiguration.class)
-@ComponentScan(basePackages = { "com.baeldung.execption" })
-public class SpringExceptionApplication {
- public static void main(String[] args) {
- SpringApplication.run(SpringExceptionApplication.class, args);
- }
+package com.baeldung.exception;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
+import org.springframework.context.annotation.ComponentScan;
+
+@SpringBootApplication(exclude = SecurityAutoConfiguration.class)
+@ComponentScan(basePackages = { "com.baeldung.execption" })
+public class SpringExceptionApplication {
+ public static void main(String[] args) {
+ SpringApplication.run(SpringExceptionApplication.class, args);
+ }
}
\ No newline at end of file
diff --git a/spring-5/src/main/java/com/baeldung/functional/FormHandler.java b/spring-5/src/main/java/com/baeldung/functional/FormHandler.java
deleted file mode 100644
index 05069735bb..0000000000
--- a/spring-5/src/main/java/com/baeldung/functional/FormHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.baeldung.functional;
-
-import org.springframework.core.io.buffer.DataBuffer;
-import org.springframework.util.MultiValueMap;
-import org.springframework.web.reactive.function.server.ServerRequest;
-import org.springframework.web.reactive.function.server.ServerResponse;
-import reactor.core.publisher.Mono;
-
-import java.util.List;
-import java.util.concurrent.atomic.AtomicLong;
-
-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.server.ServerResponse.ok;
-
-public class FormHandler {
-
- Mono handleLogin(ServerRequest request) {
- return request.body(toFormData())
- .map(MultiValueMap::toSingleValueMap)
- .filter(formData -> "baeldung".equals(formData.get("user")))
- .filter(formData -> "you_know_what_to_do".equals(formData.get("token")))
- .flatMap(formData -> ok().body(Mono.just("welcome back!"), String.class))
- .switchIfEmpty(ServerResponse.badRequest()
- .build());
- }
-
- Mono handleUpload(ServerRequest request) {
- return request.body(toDataBuffers())
- .collectList()
- .flatMap(dataBuffers -> ok().body(fromObject(extractData(dataBuffers).toString())));
- }
-
- private AtomicLong extractData(List dataBuffers) {
- AtomicLong atomicLong = new AtomicLong(0);
- dataBuffers.forEach(d -> atomicLong.addAndGet(d.asByteBuffer()
- .array().length));
- return atomicLong;
- }
-}
diff --git a/spring-5/src/main/java/com/baeldung/functional/FunctionalSpringBootApplication.java b/spring-5/src/main/java/com/baeldung/functional/FunctionalSpringBootApplication.java
deleted file mode 100644
index 402b607b19..0000000000
--- a/spring-5/src/main/java/com/baeldung/functional/FunctionalSpringBootApplication.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.baeldung.functional;
-
-import static org.springframework.web.reactive.function.BodyInserters.fromObject;
-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;
-import static org.springframework.web.reactive.function.server.RouterFunctions.route;
-import static org.springframework.web.reactive.function.server.RouterFunctions.toHttpHandler;
-import static org.springframework.web.reactive.function.server.ServerResponse.ok;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import org.springframework.boot.SpringApplication;
-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.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-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 org.springframework.web.server.WebHandler;
-import org.springframework.web.server.adapter.WebHttpHandlerBuilder;
-
-import reactor.core.publisher.Flux;
-
-@SpringBootApplication
-@ComponentScan(basePackages = { "com.baeldung.functional" })
-public class FunctionalSpringBootApplication {
-
- private static final Actor BRAD_PITT = new Actor("Brad", "Pitt");
- private static final Actor TOM_HANKS = new Actor("Tom", "Hanks");
- private static final List actors = new CopyOnWriteArrayList<>(Arrays.asList(BRAD_PITT, TOM_HANKS));
-
- private RouterFunction routingFunction() {
- FormHandler formHandler = new FormHandler();
-
- RouterFunction 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)
- .andRoute(POST("/upload"), formHandler::handleUpload)
- .and(RouterFunctions.resources("/files/**", new ClassPathResource("files/")))
- .andNest(path("/actor"), restfulRouter)
- .filter((request, next) -> {
- System.out.println("Before handler invocation: " + request.path());
- return next.handle(request);
- });
- }
-
- @Bean
- public ServletRegistrationBean servletRegistrationBean() throws Exception {
- HttpHandler httpHandler = WebHttpHandlerBuilder.webHandler((WebHandler) toHttpHandler(routingFunction()))
- .filter(new IndexRewriteFilter())
- .build();
- ServletRegistrationBean registrationBean = new ServletRegistrationBean<>(new RootServlet(httpHandler), "/");
- registrationBean.setLoadOnStartup(1);
- registrationBean.setAsyncSupported(true);
- return registrationBean;
- }
-
- @Configuration
- @EnableWebSecurity
- @Profile("!https")
- static class SecurityConfig extends WebSecurityConfigurerAdapter {
- @Override
- protected void configure(final HttpSecurity http) throws Exception {
- http.authorizeRequests()
- .anyRequest()
- .permitAll();
- }
- }
-
- public static void main(String[] args) {
- SpringApplication.run(FunctionalSpringBootApplication.class, args);
- }
-
-}
diff --git a/spring-5/src/main/java/com/baeldung/functional/FunctionalWebApplication.java b/spring-5/src/main/java/com/baeldung/functional/FunctionalWebApplication.java
deleted file mode 100644
index 5a7d70d3db..0000000000
--- a/spring-5/src/main/java/com/baeldung/functional/FunctionalWebApplication.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.baeldung.functional;
-
-import static org.springframework.web.reactive.function.BodyInserters.fromObject;
-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;
-import static org.springframework.web.reactive.function.server.RouterFunctions.route;
-import static org.springframework.web.reactive.function.server.RouterFunctions.toHttpHandler;
-import static org.springframework.web.reactive.function.server.ServerResponse.ok;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import org.apache.catalina.Context;
-import org.apache.catalina.startup.Tomcat;
-import org.springframework.boot.web.embedded.tomcat.TomcatWebServer;
-import org.springframework.boot.web.server.WebServer;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.http.server.reactive.HttpHandler;
-import org.springframework.http.server.reactive.ServletHttpHandlerAdapter;
-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 org.springframework.web.server.WebHandler;
-import org.springframework.web.server.adapter.WebHttpHandlerBuilder;
-
-import reactor.core.publisher.Flux;
-
-public class FunctionalWebApplication {
-
- private static final Actor BRAD_PITT = new Actor("Brad", "Pitt");
- private static final Actor TOM_HANKS = new Actor("Tom", "Hanks");
- private static final List actors = new CopyOnWriteArrayList<>(Arrays.asList(BRAD_PITT, TOM_HANKS));
-
- private RouterFunction routingFunction() {
- FormHandler formHandler = new FormHandler();
-
- RouterFunction 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)
- .andRoute(POST("/upload"), formHandler::handleUpload)
- .and(RouterFunctions.resources("/files/**", new ClassPathResource("files/")))
- .andNest(path("/actor"), restfulRouter)
- .filter((request, next) -> {
- System.out.println("Before handler invocation: " + request.path());
- return next.handle(request);
- });
- }
-
- WebServer start() throws Exception {
- WebHandler webHandler = (WebHandler) toHttpHandler(routingFunction());
- HttpHandler httpHandler = WebHttpHandlerBuilder.webHandler(webHandler)
- .filter(new IndexRewriteFilter())
- .build();
-
- Tomcat tomcat = new Tomcat();
- tomcat.setHostname("localhost");
- tomcat.setPort(9090);
- Context rootContext = tomcat.addContext("", System.getProperty("java.io.tmpdir"));
- ServletHttpHandlerAdapter servlet = new ServletHttpHandlerAdapter(httpHandler);
- Tomcat.addServlet(rootContext, "httpHandlerServlet", servlet);
- rootContext.addServletMappingDecoded("/", "httpHandlerServlet");
-
- TomcatWebServer server = new TomcatWebServer(tomcat);
- server.start();
- return server;
-
- }
-
- public static void main(String[] args) {
- try {
- new FunctionalWebApplication().start();
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-}
diff --git a/spring-5/src/main/java/com/baeldung/functional/IndexRewriteFilter.java b/spring-5/src/main/java/com/baeldung/functional/IndexRewriteFilter.java
deleted file mode 100644
index 551ea6c84b..0000000000
--- a/spring-5/src/main/java/com/baeldung/functional/IndexRewriteFilter.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.baeldung.functional;
-
-import org.springframework.http.server.reactive.ServerHttpRequest;
-import org.springframework.web.server.ServerWebExchange;
-import org.springframework.web.server.WebFilter;
-import org.springframework.web.server.WebFilterChain;
-import reactor.core.publisher.Mono;
-
-class IndexRewriteFilter implements WebFilter {
-
- @Override
- public Mono filter(ServerWebExchange serverWebExchange, WebFilterChain webFilterChain) {
- ServerHttpRequest request = serverWebExchange.getRequest();
- if (request.getURI()
- .getPath()
- .equals("/")) {
- return webFilterChain.filter(serverWebExchange.mutate()
- .request(builder -> builder.method(request.getMethod())
- .path("/test"))
- .build());
- }
- return webFilterChain.filter(serverWebExchange);
- }
-
-}
diff --git a/spring-5/src/main/java/com/baeldung/functional/RootServlet.java b/spring-5/src/main/java/com/baeldung/functional/RootServlet.java
deleted file mode 100644
index 8fe24821de..0000000000
--- a/spring-5/src/main/java/com/baeldung/functional/RootServlet.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.baeldung.functional;
-
-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.server.RequestPredicates.GET;
-import static org.springframework.web.reactive.function.server.RequestPredicates.POST;
-import static org.springframework.web.reactive.function.server.RequestPredicates.path;
-import static org.springframework.web.reactive.function.server.RouterFunctions.route;
-import static org.springframework.web.reactive.function.server.RouterFunctions.toHttpHandler;
-import static org.springframework.web.reactive.function.server.ServerResponse.ok;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.atomic.AtomicLong;
-
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.http.server.reactive.HttpHandler;
-import org.springframework.http.server.reactive.ServletHttpHandlerAdapter;
-import org.springframework.util.MultiValueMap;
-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 org.springframework.web.server.WebHandler;
-import org.springframework.web.server.adapter.WebHttpHandlerBuilder;
-
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-public class RootServlet extends ServletHttpHandlerAdapter {
-
- public RootServlet() {
- this(WebHttpHandlerBuilder.webHandler((WebHandler) toHttpHandler(routingFunction()))
- .filter(new IndexRewriteFilter())
- .build());
- }
-
- RootServlet(HttpHandler httpHandler) {
- super(httpHandler);
- }
-
- private static final Actor BRAD_PITT = new Actor("Brad", "Pitt");
- private static final Actor TOM_HANKS = new Actor("Tom", "Hanks");
- private static final List actors = new CopyOnWriteArrayList<>(Arrays.asList(BRAD_PITT, TOM_HANKS));
-
- private static RouterFunction> routingFunction() {
-
- return route(GET("/test"), serverRequest -> ok().body(fromObject("helloworld"))).andRoute(POST("/login"), serverRequest -> serverRequest.body(toFormData())
- .map(MultiValueMap::toSingleValueMap)
- .map(formData -> {
- System.out.println("form data: " + formData.toString());
- if ("baeldung".equals(formData.get("user")) && "you_know_what_to_do".equals(formData.get("token"))) {
- return ok().body(Mono.just("welcome back!"), String.class)
- .block();
- }
- return ServerResponse.badRequest()
- .build()
- .block();
- }))
- .andRoute(POST("/upload"), serverRequest -> serverRequest.body(toDataBuffers())
- .collectList()
- .map(dataBuffers -> {
- AtomicLong atomicLong = new AtomicLong(0);
- dataBuffers.forEach(d -> atomicLong.addAndGet(d.asByteBuffer()
- .array().length));
- System.out.println("data length:" + atomicLong.get());
- return ok().body(fromObject(atomicLong.toString()))
- .block();
- }))
- .and(RouterFunctions.resources("/files/**", new ClassPathResource("files/")))
- .andNest(path("/actor"), route(GET("/"), serverRequest -> ok().body(Flux.fromIterable(actors), Actor.class)).andRoute(POST("/"), serverRequest -> serverRequest.bodyToMono(Actor.class)
- .doOnNext(actors::add)
- .then(ok().build())))
- .filter((request, next) -> {
- System.out.println("Before handler invocation: " + request.path());
- return next.handle(request);
- });
-
- }
-
-}
diff --git a/spring-5/src/main/java/com/baeldung/web/reactive/Task.java b/spring-5/src/main/java/com/baeldung/jupiter/Task.java
similarity index 93%
rename from spring-5/src/main/java/com/baeldung/web/reactive/Task.java
rename to spring-5/src/main/java/com/baeldung/jupiter/Task.java
index 725fd931e1..2ea977712c 100644
--- a/spring-5/src/main/java/com/baeldung/web/reactive/Task.java
+++ b/spring-5/src/main/java/com/baeldung/jupiter/Task.java
@@ -1,4 +1,4 @@
-package com.baeldung.web.reactive;
+package com.baeldung.jupiter;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/spring-5/src/main/java/com/baeldung/jupiter/TestConfig.java b/spring-5/src/main/java/com/baeldung/jupiter/TestConfig.java
index a29f77c5df..ee866007ea 100644
--- a/spring-5/src/main/java/com/baeldung/jupiter/TestConfig.java
+++ b/spring-5/src/main/java/com/baeldung/jupiter/TestConfig.java
@@ -1,6 +1,5 @@
package com.baeldung.jupiter;
-import com.baeldung.web.reactive.Task;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
diff --git a/spring-5/src/main/java/com/baeldung/security/GreetController.java b/spring-5/src/main/java/com/baeldung/security/GreetController.java
deleted file mode 100644
index 6b69e3bc9b..0000000000
--- a/spring-5/src/main/java/com/baeldung/security/GreetController.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.baeldung.security;
-
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-import reactor.core.publisher.Mono;
-
-import java.security.Principal;
-
-@RestController
-public class GreetController {
-
- private GreetService greetService;
-
- public GreetController(GreetService greetService) {
- this.greetService = greetService;
- }
-
- @GetMapping("/")
- public Mono greet(Mono principal) {
- return principal
- .map(Principal::getName)
- .map(name -> String.format("Hello, %s", name));
- }
-
- @GetMapping("/admin")
- public Mono greetAdmin(Mono principal) {
- return principal
- .map(Principal::getName)
- .map(name -> String.format("Admin access: %s", name));
- }
-
- @GetMapping("/greetService")
- public Mono greetService() {
- return greetService.greet();
- }
-
-}
diff --git a/spring-5/src/main/java/com/baeldung/security/GreetService.java b/spring-5/src/main/java/com/baeldung/security/GreetService.java
deleted file mode 100644
index 7622b360be..0000000000
--- a/spring-5/src/main/java/com/baeldung/security/GreetService.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.baeldung.security;
-
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.stereotype.Service;
-import reactor.core.publisher.Mono;
-
-@Service
-public class GreetService {
-
- @PreAuthorize("hasRole('ADMIN')")
- public Mono greet() {
- return Mono.just("Hello from service!");
- }
-
-}
diff --git a/spring-5/src/main/java/com/baeldung/security/SecurityConfig.java b/spring-5/src/main/java/com/baeldung/security/SecurityConfig.java
deleted file mode 100644
index a9e44a2eee..0000000000
--- a/spring-5/src/main/java/com/baeldung/security/SecurityConfig.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.baeldung.security;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.security.config.annotation.method.configuration.EnableReactiveMethodSecurity;
-import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity;
-import org.springframework.security.config.web.server.ServerHttpSecurity;
-import org.springframework.security.core.userdetails.MapReactiveUserDetailsService;
-import org.springframework.security.core.userdetails.User;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.web.server.SecurityWebFilterChain;
-
-@EnableWebFluxSecurity
-@EnableReactiveMethodSecurity
-public class SecurityConfig {
-
- @Bean
- public SecurityWebFilterChain securitygWebFilterChain(ServerHttpSecurity http) {
- return http.authorizeExchange()
- .pathMatchers("/admin").hasAuthority("ROLE_ADMIN")
- .anyExchange().authenticated()
- .and().formLogin()
- .and().build();
- }
-
- @Bean
- public MapReactiveUserDetailsService userDetailsService() {
- UserDetails user = User.withDefaultPasswordEncoder()
- .username("user")
- .password("password")
- .roles("USER")
- .build();
-
- UserDetails admin = User.withDefaultPasswordEncoder()
- .username("admin")
- .password("password")
- .roles("ADMIN")
- .build();
-
- return new MapReactiveUserDetailsService(user, admin);
- }
-
-}
diff --git a/spring-5/src/main/java/com/baeldung/web/reactive/client/WebClientController.java b/spring-5/src/main/java/com/baeldung/web/reactive/client/WebClientController.java
deleted file mode 100644
index a719259328..0000000000
--- a/spring-5/src/main/java/com/baeldung/web/reactive/client/WebClientController.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.baeldung.web.reactive.client;
-
-import org.reactivestreams.Publisher;
-import org.reactivestreams.Subscriber;
-import org.springframework.http.*;
-import org.springframework.util.LinkedMultiValueMap;
-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 java.nio.charset.Charset;
-import java.time.ZonedDateTime;
-import java.util.Collections;
-
-@RestController
-public class WebClientController {
-
- @ResponseStatus(HttpStatus.OK)
- @GetMapping("/resource")
- public void getResource() {
- }
-
- public void demonstrateWebClient() {
- // request
- WebClient.UriSpec request1 = createWebClientWithServerURLAndDefaultValues().method(HttpMethod.POST);
- WebClient.UriSpec request2 = createWebClientWithServerURLAndDefaultValues().post();
-
- // request body specifications
- WebClient.RequestBodySpec uri1 = createWebClientWithServerURLAndDefaultValues().method(HttpMethod.POST)
- .uri("/resource");
- WebClient.RequestBodySpec uri2 = createWebClientWithServerURLAndDefaultValues().post()
- .uri(URI.create("/resource"));
-
- // request header specification
- WebClient.RequestHeadersSpec> requestSpec1 = uri1.body(BodyInserters.fromPublisher(Mono.just("data"), String.class));
- WebClient.RequestHeadersSpec> requestSpec2 = uri2.body(BodyInserters.fromObject("data"));
-
- // inserters
- BodyInserter, ReactiveHttpOutputMessage> inserter1 = BodyInserters
- .fromPublisher(Subscriber::onComplete, String.class);
-
- LinkedMultiValueMap map = new LinkedMultiValueMap<>();
- map.add("key1", "value1");
- map.add("key2", "value2");
-
- // BodyInserter, ClientHttpRequest> inserter2 = BodyInserters.fromMultipartData(map);
- BodyInserter inserter3 = BodyInserters.fromObject("body");
-
- // responses
- WebClient.ResponseSpec response1 = uri1.body(inserter3)
- .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
- .accept(MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML)
- .acceptCharset(Charset.forName("UTF-8"))
- .ifNoneMatch("*")
- .ifModifiedSince(ZonedDateTime.now())
- .retrieve();
- WebClient.ResponseSpec response2 = requestSpec2.retrieve();
-
- }
-
- private WebClient createWebClient() {
- return WebClient.create();
- }
-
- private WebClient createWebClientWithServerURL() {
- return WebClient.create("http://localhost:8081");
- }
-
- private WebClient createWebClientWithServerURLAndDefaultValues() {
- return WebClient.builder()
- .baseUrl("http://localhost:8081")
- .defaultCookie("cookieKey", "cookieValue")
- .defaultHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
- .defaultUriVariables(Collections.singletonMap("url", "http://localhost:8080"))
- .build();
- }
-
-}
diff --git a/spring-5/src/test/java/com/baeldung/functional/FunctionalWebApplicationIntegrationTest.java b/spring-5/src/test/java/com/baeldung/functional/FunctionalWebApplicationIntegrationTest.java
deleted file mode 100644
index a7b951b930..0000000000
--- a/spring-5/src/test/java/com/baeldung/functional/FunctionalWebApplicationIntegrationTest.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.baeldung.functional;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-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.test.web.reactive.server.WebTestClient;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
-import org.springframework.web.reactive.function.BodyInserters;
-
-import static org.springframework.web.reactive.function.BodyInserters.fromObject;
-import static org.springframework.web.reactive.function.BodyInserters.fromResource;
-
-public class FunctionalWebApplicationIntegrationTest {
-
- private static WebTestClient client;
- private static WebServer server;
-
- @BeforeClass
- public static void setup() throws Exception {
- server = new FunctionalWebApplication().start();
- client = WebTestClient.bindToServer()
- .baseUrl("http://localhost:" + server.getPort())
- .build();
- }
-
- @AfterClass
- public static void destroy() {
- server.stop();
- }
-
- @Test
- public void givenRouter_whenGetTest_thenGotHelloWorld() throws Exception {
- client.get()
- .uri("/test")
- .exchange()
- .expectStatus()
- .isOk()
- .expectBody(String.class)
- .isEqualTo("helloworld");
- }
-
- @Test
- public void givenIndexFilter_whenRequestRoot_thenRewrittenToTest() throws Exception {
- client.get()
- .uri("/")
- .exchange()
- .expectStatus()
- .isOk()
- .expectBody(String.class)
- .isEqualTo("helloworld");
- }
-
- @Test
- public void givenLoginForm_whenPostValidToken_thenSuccess() throws Exception {
- MultiValueMap formData = new LinkedMultiValueMap<>(1);
- formData.add("user", "baeldung");
- formData.add("token", "you_know_what_to_do");
-
- client.post()
- .uri("/login")
- .contentType(MediaType.APPLICATION_FORM_URLENCODED)
- .body(BodyInserters.fromFormData(formData))
- .exchange()
- .expectStatus()
- .isOk()
- .expectBody(String.class)
- .isEqualTo("welcome back!");
- }
-
- @Test
- public void givenLoginForm_whenRequestWithInvalidToken_thenFail() throws Exception {
- MultiValueMap formData = new LinkedMultiValueMap<>(2);
- formData.add("user", "baeldung");
- formData.add("token", "try_again");
-
- client.post()
- .uri("/login")
- .contentType(MediaType.APPLICATION_FORM_URLENCODED)
- .body(BodyInserters.fromFormData(formData))
- .exchange()
- .expectStatus()
- .isBadRequest();
- }
-
- @Test
- public void givenUploadForm_whenRequestWithMultipartData_thenSuccess() throws Exception {
- Resource resource = new ClassPathResource("/baeldung-weekly.png");
- client.post()
- .uri("/upload")
- .contentType(MediaType.MULTIPART_FORM_DATA)
- .body(fromResource(resource))
- .exchange()
- .expectStatus()
- .isOk()
- .expectBody(String.class)
- .isEqualTo(String.valueOf(resource.contentLength()));
- }
-
- @Test
- public void givenActors_whenAddActor_thenAdded() throws Exception {
- client.get()
- .uri("/actor")
- .exchange()
- .expectStatus()
- .isOk()
- .expectBodyList(Actor.class)
- .hasSize(2);
-
- client.post()
- .uri("/actor")
- .body(fromObject(new Actor("Clint", "Eastwood")))
- .exchange()
- .expectStatus()
- .isOk();
-
- client.get()
- .uri("/actor")
- .exchange()
- .expectStatus()
- .isOk()
- .expectBodyList(Actor.class)
- .hasSize(3);
- }
-
- @Test
- public void givenResources_whenAccess_thenGot() throws Exception {
- client.get()
- .uri("/files/hello.txt")
- .exchange()
- .expectStatus()
- .isOk()
- .expectBody(String.class)
- .isEqualTo("hello");
- }
-
-}
diff --git a/spring-5/src/test/java/com/baeldung/jdbc/autogenkey/GetAutoGenKeyByJDBC.java b/spring-5/src/test/java/com/baeldung/jdbc/autogenkey/GetAutoGenKeyByJDBCIntTest.java
similarity index 95%
rename from spring-5/src/test/java/com/baeldung/jdbc/autogenkey/GetAutoGenKeyByJDBC.java
rename to spring-5/src/test/java/com/baeldung/jdbc/autogenkey/GetAutoGenKeyByJDBCIntTest.java
index 45012a95aa..14d2fb736b 100644
--- a/spring-5/src/test/java/com/baeldung/jdbc/autogenkey/GetAutoGenKeyByJDBC.java
+++ b/spring-5/src/test/java/com/baeldung/jdbc/autogenkey/GetAutoGenKeyByJDBCIntTest.java
@@ -1,55 +1,55 @@
-package com.baeldung.jdbc.autogenkey;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import com.baeldung.jdbc.autogenkey.repository.MessageRepositoryJDBCTemplate;
-import com.baeldung.jdbc.autogenkey.repository.MessageRepositorySimpleJDBCInsert;
-
-@RunWith(SpringRunner.class)
-@Ignore
-public class GetAutoGenKeyByJDBC {
-
- @Configuration
- @EnableAutoConfiguration
- @PropertySource("classpath:autogenkey-db.properties")
- @ComponentScan(basePackages = { "com.baeldung.jdbc.autogenkey.repository" })
- public static class SpringConfig {
-
- }
-
- @Autowired
- MessageRepositorySimpleJDBCInsert messageRepositorySimpleJDBCInsert;
-
- @Autowired
- MessageRepositoryJDBCTemplate messageRepositoryJDBCTemplate;
-
- final String MESSAGE_CONTENT = "Test";
-
- @Test
- public void insertJDBC_whenLoadMessageByKey_thenGetTheSameMessage() {
- long key = messageRepositoryJDBCTemplate.insert(MESSAGE_CONTENT);
- String loadedMessage = messageRepositoryJDBCTemplate.getMessageById(key);
-
- assertEquals(MESSAGE_CONTENT, loadedMessage);
-
- }
-
- @Test
- public void insertSimpleInsert_whenLoadMessageKey_thenGetTheSameMessage() {
- long key = messageRepositorySimpleJDBCInsert.insert(MESSAGE_CONTENT);
- String loadedMessage = messageRepositoryJDBCTemplate.getMessageById(key);
-
- assertEquals(MESSAGE_CONTENT, loadedMessage);
- }
-
-}
+package com.baeldung.jdbc.autogenkey;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.jdbc.autogenkey.repository.MessageRepositoryJDBCTemplate;
+import com.baeldung.jdbc.autogenkey.repository.MessageRepositorySimpleJDBCInsert;
+
+@RunWith(SpringRunner.class)
+@Ignore
+public class GetAutoGenKeyByJDBCIntTest {
+
+ @Configuration
+ @EnableAutoConfiguration
+ @PropertySource("classpath:autogenkey-db.properties")
+ @ComponentScan(basePackages = { "com.baeldung.jdbc.autogenkey.repository" })
+ public static class SpringConfig {
+
+ }
+
+ @Autowired
+ MessageRepositorySimpleJDBCInsert messageRepositorySimpleJDBCInsert;
+
+ @Autowired
+ MessageRepositoryJDBCTemplate messageRepositoryJDBCTemplate;
+
+ final String MESSAGE_CONTENT = "Test";
+
+ @Test
+ public void insertJDBC_whenLoadMessageByKey_thenGetTheSameMessage() {
+ long key = messageRepositoryJDBCTemplate.insert(MESSAGE_CONTENT);
+ String loadedMessage = messageRepositoryJDBCTemplate.getMessageById(key);
+
+ assertEquals(MESSAGE_CONTENT, loadedMessage);
+
+ }
+
+ @Test
+ public void insertSimpleInsert_whenLoadMessageKey_thenGetTheSameMessage() {
+ long key = messageRepositorySimpleJDBCInsert.insert(MESSAGE_CONTENT);
+ String loadedMessage = messageRepositoryJDBCTemplate.getMessageById(key);
+
+ assertEquals(MESSAGE_CONTENT, loadedMessage);
+ }
+
+}
diff --git a/spring-5/src/test/java/com/baeldung/jupiter/Spring5JUnit5ComposedAnnotationIntegrationTest.java b/spring-5/src/test/java/com/baeldung/jupiter/Spring5JUnit5ComposedAnnotationIntegrationTest.java
index 42d27b90f4..b9bb470cbd 100644
--- a/spring-5/src/test/java/com/baeldung/jupiter/Spring5JUnit5ComposedAnnotationIntegrationTest.java
+++ b/spring-5/src/test/java/com/baeldung/jupiter/Spring5JUnit5ComposedAnnotationIntegrationTest.java
@@ -1,6 +1,5 @@
package com.baeldung.jupiter;
-import com.baeldung.web.reactive.Task;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-5/src/test/java/com/baeldung/jupiter/Spring5JUnit5IntegrationTest.java b/spring-5/src/test/java/com/baeldung/jupiter/Spring5JUnit5IntegrationTest.java
index 0f00a85832..484b366132 100644
--- a/spring-5/src/test/java/com/baeldung/jupiter/Spring5JUnit5IntegrationTest.java
+++ b/spring-5/src/test/java/com/baeldung/jupiter/Spring5JUnit5IntegrationTest.java
@@ -1,6 +1,5 @@
package com.baeldung.jupiter;
-import com.baeldung.web.reactive.Task;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-5/src/test/java/com/baeldung/jupiter/Spring5ReactiveServerClientIntegrationTest.java b/spring-5/src/test/java/com/baeldung/jupiter/Spring5ReactiveServerClientIntegrationTest.java
deleted file mode 100644
index bbd852d625..0000000000
--- a/spring-5/src/test/java/com/baeldung/jupiter/Spring5ReactiveServerClientIntegrationTest.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.baeldung.jupiter;
-
-import com.baeldung.web.reactive.Task;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.springframework.http.server.reactive.HttpHandler;
-import org.springframework.http.server.reactive.ReactorHttpHandlerAdapter;
-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 reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-import reactor.ipc.netty.NettyContext;
-import reactor.ipc.netty.http.server.HttpServer;
-
-import java.time.Duration;
-
-import static org.springframework.web.reactive.function.server.RequestPredicates.GET;
-import static org.springframework.web.reactive.function.server.RequestPredicates.POST;
-
-public class Spring5ReactiveServerClientIntegrationTest {
-
- private static NettyContext nettyContext;
-
- @BeforeAll
- public static void setUp() throws Exception {
- HttpServer server = HttpServer.create("localhost", 8080);
- RouterFunction> route = RouterFunctions.route(POST("/task/process"), request -> ServerResponse.ok()
- .body(request.bodyToFlux(Task.class)
- .map(ll -> new Task("TaskName", 1)), Task.class))
- .and(RouterFunctions.route(GET("/task"), request -> ServerResponse.ok()
- .body(Mono.just("server is alive"), String.class)));
- HttpHandler httpHandler = RouterFunctions.toHttpHandler(route);
- ReactorHttpHandlerAdapter adapter = new ReactorHttpHandlerAdapter(httpHandler);
- nettyContext = server.newHandler(adapter)
- .block();
- }
-
- @AfterAll
- public static void shutDown() {
- nettyContext.dispose();
- }
-
- // @Test
- // public void givenCheckTask_whenServerHandle_thenServerResponseALiveString() throws Exception {
- // WebClient client = WebClient.create("http://localhost:8080");
- // Mono result = client
- // .get()
- // .uri("/task")
- // .exchange()
- // .then(response -> response.bodyToMono(String.class));
- //
- // assertThat(result.block()).isInstanceOf(String.class);
- // }
-
- // @Test
- // public void givenThreeTasks_whenServerHandleTheTasks_thenServerResponseATask() throws Exception {
- // URI uri = URI.create("http://localhost:8080/task/process");
- // ExchangeFunction exchange = ExchangeFunctions.create(new ReactorClientHttpConnector());
- // ClientRequest request = ClientRequest
- // .method(HttpMethod.POST, uri)
- // .body(BodyInserters.fromPublisher(getLatLngs(), Task.class))
- // .build();
- //
- // Flux taskResponse = exchange
- // .exchange(request)
- // .flatMap(response -> response.bodyToFlux(Task.class));
- //
- // assertThat(taskResponse.blockFirst()).isInstanceOf(Task.class);
- // }
-
- // @Test
- // public void givenCheckTask_whenServerHandle_thenOragicServerResponseALiveString() throws Exception {
- // URI uri = URI.create("http://localhost:8080/task");
- // ExchangeFunction exchange = ExchangeFunctions.create(new ReactorClientHttpConnector());
- // ClientRequest request = ClientRequest
- // .method(HttpMethod.GET, uri)
- // .body(BodyInserters.fromPublisher(getLatLngs(), Task.class))
- // .build();
- //
- // Flux taskResponse = exchange
- // .exchange(request)
- // .flatMap(response -> response.bodyToFlux(String.class));
- //
- // assertThat(taskResponse.blockFirst()).isInstanceOf(String.class);
- // }
-
- private static Flux getLatLngs() {
- return Flux.range(0, 3)
- .zipWith(Flux.interval(Duration.ofSeconds(1)))
- .map(x -> new Task("taskname", 1))
- .doOnNext(ll -> System.out.println("Produced: {}" + ll));
- }
-}
diff --git a/spring-5/src/test/java/com/baeldung/security/SecurityIntegrationTest.java b/spring-5/src/test/java/com/baeldung/security/SecurityIntegrationTest.java
deleted file mode 100644
index 1f8bb549c7..0000000000
--- a/spring-5/src/test/java/com/baeldung/security/SecurityIntegrationTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.baeldung.security;
-
-import com.baeldung.SpringSecurity5Application;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
-import org.springframework.security.test.context.support.WithMockUser;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.test.web.reactive.server.WebTestClient;
-
-@RunWith(SpringRunner.class)
-@ContextConfiguration(classes = SpringSecurity5Application.class)
-public class SecurityIntegrationTest {
-
- @Autowired
- ApplicationContext context;
-
- private WebTestClient rest;
-
- @Before
- public void setup() {
- this.rest = WebTestClient.bindToApplicationContext(this.context).configureClient().build();
- }
-
- @Test
- public void whenNoCredentials_thenRedirectToLogin() {
- this.rest.get().uri("/").exchange().expectStatus().is3xxRedirection();
- }
-
- @Test
- @Ignore
- @WithMockUser
- public void whenHasCredentials_thenSeesGreeting() {
- this.rest.get().uri("/").exchange().expectStatus().isOk().expectBody(String.class).isEqualTo("Hello, user");
- }
-}
diff --git a/spring-5/src/test/java/com/baeldung/web/client/WebTestClientIntegrationTest.java b/spring-5/src/test/java/com/baeldung/web/client/WebTestClientIntegrationTest.java
deleted file mode 100644
index f9472452ba..0000000000
--- a/spring-5/src/test/java/com/baeldung/web/client/WebTestClientIntegrationTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.baeldung.web.client;
-
-import com.baeldung.Spring5Application;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.web.server.LocalServerPort;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
-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;
-import org.springframework.web.reactive.function.server.RouterFunctions;
-import org.springframework.web.reactive.function.server.ServerResponse;
-import org.springframework.web.server.WebHandler;
-import reactor.core.publisher.Mono;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = Spring5Application.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@EnableJpaRepositories("com.baeldung.persistence")
-public class WebTestClientIntegrationTest {
-
- @LocalServerPort
- private int port;
-
- private final RouterFunction ROUTER_FUNCTION = RouterFunctions.route(RequestPredicates.GET("/resource"), request -> ServerResponse.ok()
- .build());
- private final WebHandler WEB_HANDLER = exchange -> Mono.empty();
-
- @Test
- public void testWebTestClientWithServerWebHandler() {
- WebTestClient.bindToWebHandler(WEB_HANDLER)
- .build();
- }
-
- @Test
- public void testWebTestClientWithRouterFunction() {
- WebTestClient.bindToRouterFunction(ROUTER_FUNCTION)
- .build()
- .get()
- .uri("/resource")
- .exchange()
- .expectStatus()
- .isOk()
- .expectBody()
- .isEmpty();
- }
-
- @Test
- public void testWebTestClientWithServerURL() {
- WebTestClient.bindToServer()
- .baseUrl("http://localhost:" + port)
- .build()
- .get()
- .uri("/resource")
- .exchange()
- .expectStatus()
- .is3xxRedirection()
- .expectBody();
- }
-
-}