From 0b1786333b2fa6a339c99801831b9607eaf16a98 Mon Sep 17 00:00:00 2001 From: Haroon Khan Date: Thu, 30 Dec 2021 21:44:45 +0000 Subject: [PATCH 1/2] [JAVA-8364] Split spring-5-reactive-2 module --- pom.xml | 2 + spring-5-reactive-2/README.md | 5 +- spring-5-reactive-3/.gitignore | 12 +++ spring-5-reactive-3/README.md | 6 ++ spring-5-reactive-3/pom.xml | 79 +++++++++++++++++++ .../logging/WebFluxLoggingExample.java | 0 .../src/main/resources/application.properties | 1 + .../src/test/resources/logback-test.xml | 12 +++ 8 files changed, 114 insertions(+), 3 deletions(-) create mode 100644 spring-5-reactive-3/.gitignore create mode 100644 spring-5-reactive-3/README.md create mode 100644 spring-5-reactive-3/pom.xml rename {spring-5-reactive-2 => spring-5-reactive-3}/src/main/java/com/baeldung/webflux/logging/WebFluxLoggingExample.java (100%) create mode 100644 spring-5-reactive-3/src/main/resources/application.properties create mode 100644 spring-5-reactive-3/src/test/resources/logback-test.xml diff --git a/pom.xml b/pom.xml index e540cd32eb..476d358569 100644 --- a/pom.xml +++ b/pom.xml @@ -614,6 +614,7 @@ spring-5-data-reactive spring-5-reactive spring-5-reactive-2 + spring-5-reactive-3 spring-5-reactive-client spring-5-reactive-oauth spring-5-reactive-security @@ -1086,6 +1087,7 @@ spring-5-data-reactive spring-5-reactive spring-5-reactive-2 + spring-5-reactive-3 spring-5-reactive-client spring-5-reactive-oauth spring-5-reactive-security diff --git a/spring-5-reactive-2/README.md b/spring-5-reactive-2/README.md index 98a5f26433..33f9ee2b45 100644 --- a/spring-5-reactive-2/README.md +++ b/spring-5-reactive-2/README.md @@ -1,13 +1,12 @@ ## Spring 5 Reactive Project -This module contains articles about reactive Spring 5 +This module contains articles about reactive Spring 5. - [Spring WebClient vs. RestTemplate](https://www.baeldung.com/spring-webclient-resttemplate) - [Validation for Functional Endpoints in Spring 5](https://www.baeldung.com/spring-functional-endpoints-validation) -- [Logging a Reactive Sequence](https://www.baeldung.com/spring-reactive-sequence-logging) - [Testing Reactive Streams Using StepVerifier and TestPublisher](https://www.baeldung.com/reactive-streams-step-verifier-test-publisher) - [Debugging Reactive Streams in Java](https://www.baeldung.com/spring-debugging-reactive-streams) - [Static Content in Spring WebFlux](https://www.baeldung.com/spring-webflux-static-content) - [Server-Sent Events in Spring](https://www.baeldung.com/spring-server-sent-events) - [Backpressure Mechanism in Spring WebFlux](https://www.baeldung.com/spring-webflux-backpressure) -- More articles: [[<-- prev]](/spring-5-reactive) +- More articles: [[<-- prev]](../spring-5-reactive) [[next -->]](../spring-5-reactive-3) diff --git a/spring-5-reactive-3/.gitignore b/spring-5-reactive-3/.gitignore new file mode 100644 index 0000000000..dec013dfa4 --- /dev/null +++ b/spring-5-reactive-3/.gitignore @@ -0,0 +1,12 @@ +#folders# +.idea +/target +/neoDb* +/data +/src/main/webapp/WEB-INF/classes +*/META-INF/* + +# Packaged files # +*.jar +*.war +*.ear \ No newline at end of file diff --git a/spring-5-reactive-3/README.md b/spring-5-reactive-3/README.md new file mode 100644 index 0000000000..da44bf98fc --- /dev/null +++ b/spring-5-reactive-3/README.md @@ -0,0 +1,6 @@ +## Spring 5 Reactive Project + +This module contains articles about reactive Spring 5. + +- [Logging a Reactive Sequence](https://www.baeldung.com/spring-reactive-sequence-logging) +- More articles: [[<-- prev]](../spring-5-reactive-2) diff --git a/spring-5-reactive-3/pom.xml b/spring-5-reactive-3/pom.xml new file mode 100644 index 0000000000..1e9248f30c --- /dev/null +++ b/spring-5-reactive-3/pom.xml @@ -0,0 +1,79 @@ + + + 4.0.0 + spring-5-reactive-3 + 0.0.1-SNAPSHOT + spring-5-reactive-3 + jar + spring 5 sample project about new features + + + com.baeldung + parent-boot-2 + 0.0.1-SNAPSHOT + ../parent-boot-2 + + + + + org.springframework.boot + spring-boot-starter-webflux + + + org.projectreactor + reactor-spring + ${reactor-spring.version} + + + org.springframework.boot + spring-boot-starter-test + test + + + io.projectreactor + reactor-test + test + + + + + + integration-lite-first + + + + org.apache.maven.plugins + maven-surefire-plugin + + + ${project.basedir}/src/test/resources/logback-test.xml + + + + + + + + integration-lite-second + + + + org.apache.maven.plugins + maven-surefire-plugin + + + ${project.basedir}/src/test/resources/logback-test.xml + + + + + + + + + + 1.0.1.RELEASE + + \ No newline at end of file diff --git a/spring-5-reactive-2/src/main/java/com/baeldung/webflux/logging/WebFluxLoggingExample.java b/spring-5-reactive-3/src/main/java/com/baeldung/webflux/logging/WebFluxLoggingExample.java similarity index 100% rename from spring-5-reactive-2/src/main/java/com/baeldung/webflux/logging/WebFluxLoggingExample.java rename to spring-5-reactive-3/src/main/java/com/baeldung/webflux/logging/WebFluxLoggingExample.java diff --git a/spring-5-reactive-3/src/main/resources/application.properties b/spring-5-reactive-3/src/main/resources/application.properties new file mode 100644 index 0000000000..815cc2b76d --- /dev/null +++ b/spring-5-reactive-3/src/main/resources/application.properties @@ -0,0 +1 @@ +# application properties \ No newline at end of file diff --git a/spring-5-reactive-3/src/test/resources/logback-test.xml b/spring-5-reactive-3/src/test/resources/logback-test.xml new file mode 100644 index 0000000000..cedd46414d --- /dev/null +++ b/spring-5-reactive-3/src/test/resources/logback-test.xml @@ -0,0 +1,12 @@ + + + + + + + + + + \ No newline at end of file From 9e452c3436cca2493b0aa640090166c37c81b3b2 Mon Sep 17 00:00:00 2001 From: Haroon Khan Date: Mon, 3 Jan 2022 21:16:56 +0000 Subject: [PATCH 2/2] [JAVA-8364] Clean up POM file --- spring-5-reactive-3/pom.xml | 35 ------------------- .../src/test/resources/logback-test.xml | 8 ++--- 2 files changed, 2 insertions(+), 41 deletions(-) diff --git a/spring-5-reactive-3/pom.xml b/spring-5-reactive-3/pom.xml index 1e9248f30c..89af34732f 100644 --- a/spring-5-reactive-3/pom.xml +++ b/spring-5-reactive-3/pom.xml @@ -38,41 +38,6 @@ - - - integration-lite-first - - - - org.apache.maven.plugins - maven-surefire-plugin - - - ${project.basedir}/src/test/resources/logback-test.xml - - - - - - - - integration-lite-second - - - - org.apache.maven.plugins - maven-surefire-plugin - - - ${project.basedir}/src/test/resources/logback-test.xml - - - - - - - - 1.0.1.RELEASE diff --git a/spring-5-reactive-3/src/test/resources/logback-test.xml b/spring-5-reactive-3/src/test/resources/logback-test.xml index cedd46414d..25f2184c85 100644 --- a/spring-5-reactive-3/src/test/resources/logback-test.xml +++ b/spring-5-reactive-3/src/test/resources/logback-test.xml @@ -1,12 +1,8 @@ - - - + + - \ No newline at end of file