diff --git a/spring-5-mongodb/.gitignore b/spring-5-mongodb/.gitignore
deleted file mode 100644
index dec013dfa4..0000000000
--- a/spring-5-mongodb/.gitignore
+++ /dev/null
@@ -1,12 +0,0 @@
-#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-mongodb/README.md b/spring-5-mongodb/README.md
deleted file mode 100644
index df96d933ba..0000000000
--- a/spring-5-mongodb/README.md
+++ /dev/null
@@ -1,20 +0,0 @@
-## Spring REST Example Project
-
-### The Course
-The "REST With Spring" Classes: http://bit.ly/restwithspring
-
-### Relevant Articles
-
-- [Concurrent Test Execution in Spring 5](http://www.baeldung.com/spring-5-concurrent-tests)
-- [Introduction to the Functional Web Framework in Spring 5](http://www.baeldung.com/spring-5-functional-web)
-- [Exploring the Spring 5 MVC URL Matching Improvements](http://www.baeldung.com/spring-5-mvc-url-matching)
-- [Spring 5 WebClient](http://www.baeldung.com/spring-5-webclient)
-- [Spring 5 Functional Bean Registration](http://www.baeldung.com/spring-5-functional-beans)
-- [The SpringJUnitConfig and SpringJUnitWebConfig Annotations in Spring 5](http://www.baeldung.com/spring-5-junit-config)
-- [Spring Security 5 for Reactive Applications](http://www.baeldung.com/spring-security-5-reactive)
-- [Spring 5 Testing with @EnabledIf Annotation](https://github.com/eugenp/tutorials/tree/master/spring-5)
-- [Reactive WebSockets with Spring 5](http://www.baeldung.com/spring-5-reactive-websockets)
-- [Spring Boot Actuator](http://www.baeldung.com/spring-boot-actuators)
-- [Spring Webflux Filters](http://www.baeldung.com/spring-webflux-filters)
-- [Reactive Flow with MongoDB, Kotlin, and Spring WebFlux](http://www.baeldung.com/kotlin-mongodb-spring-webflux)
-- [Spring Data Reactive Repositories with MongoDB](http://www.baeldung.com/spring-data-mongodb-reactive)
diff --git a/spring-5-mongodb/pom.xml b/spring-5-mongodb/pom.xml
deleted file mode 100644
index 2db41ba6c7..0000000000
--- a/spring-5-mongodb/pom.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-
-
- 4.0.0
-
- com.baeldung
- spring-5-mongodb
- 0.0.1-SNAPSHOT
- jar
- spring-5-mongodb
- spring 5 mongodb sample project
-
-
- com.baeldung
- parent-boot-2
- 0.0.1-SNAPSHOT
- ../parent-boot-2
-
-
-
-
- org.springframework.boot
- spring-boot-starter-validation
-
-
- org.springframework.boot
- spring-boot-starter-tomcat
-
-
- org.springframework.boot
- spring-boot-starter-webflux
-
-
- org.projectreactor
- reactor-spring
- ${reactor-spring.version}
-
-
-
- org.apache.commons
- commons-lang3
-
-
-
-
- org.springframework
- spring-test
-
-
- org.springframework.boot
- spring-boot-starter-test
- test
-
-
-
- org.apache.commons
- commons-collections4
- ${commons-collections4.version}
- test
-
-
- org.projectlombok
- lombok
- compile
-
-
-
- org.junit.jupiter
- junit-jupiter-api
-
-
- org.junit.jupiter
- junit-jupiter-engine
- test
-
-
- org.junit.platform
- junit-platform-surefire-provider
- ${junit.platform.version}
- test
-
-
- org.junit.platform
- junit-platform-runner
- ${junit.platform.version}
- test
-
-
- org.apache.commons
- commons-lang3
-
-
-
- org.springframework.boot
- spring-boot-starter-data-mongodb-reactive
-
-
- de.flapdoodle.embed
- de.flapdoodle.embed.mongo
- test
-
-
- io.reactivex.rxjava2
- rxjava
- ${rxjava-version}
-
-
- io.projectreactor
- reactor-test
- ${project-reactor-test}
- test
-
-
-
-
-
-
- org.springframework.boot
- spring-boot-maven-plugin
-
- com.baeldung.reactive.Spring5ReactiveApplication
- JAR
-
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
-
- 3
- true
- methods
- true
-
- **/*IntegrationTest.java
- **/*IntTest.java
- **/*LiveTest.java
-
-
-
-
-
-
-
- 1.0.0
- 5.0.2
- 2.20
- 1.0.1.RELEASE
- 2.1.12
- 4.1
- 3.1.6.RELEASE
- 1.1.3
- 1.0
- 1.0
-
-
-
diff --git a/spring-5-mongodb/src/main/resources/application.properties b/spring-5-mongodb/src/main/resources/application.properties
deleted file mode 100644
index 234834b894..0000000000
--- a/spring-5-mongodb/src/main/resources/application.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-logging.level.root=INFO
-
-management.endpoints.web.exposure.include.=*
-
-info.app.name=Spring Boot 2 actuator Application
diff --git a/spring-5-mongodb/src/main/webapp/WEB-INF/web.xml b/spring-5-mongodb/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index bfcf43dad2..0000000000
--- a/spring-5-mongodb/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
- Spring Functional Application
-
-
- functional
- com.baeldung.functional.RootServlet
- 1
- true
-
-
- functional
- /
-
-
-
-
\ No newline at end of file
diff --git a/spring-5-reactive/README.md b/spring-5-reactive/README.md
index df96d933ba..40d0c23231 100644
--- a/spring-5-reactive/README.md
+++ b/spring-5-reactive/README.md
@@ -5,16 +5,8 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
### Relevant Articles
-- [Concurrent Test Execution in Spring 5](http://www.baeldung.com/spring-5-concurrent-tests)
- [Introduction to the Functional Web Framework in Spring 5](http://www.baeldung.com/spring-5-functional-web)
-- [Exploring the Spring 5 MVC URL Matching Improvements](http://www.baeldung.com/spring-5-mvc-url-matching)
- [Spring 5 WebClient](http://www.baeldung.com/spring-5-webclient)
-- [Spring 5 Functional Bean Registration](http://www.baeldung.com/spring-5-functional-beans)
-- [The SpringJUnitConfig and SpringJUnitWebConfig Annotations in Spring 5](http://www.baeldung.com/spring-5-junit-config)
- [Spring Security 5 for Reactive Applications](http://www.baeldung.com/spring-security-5-reactive)
-- [Spring 5 Testing with @EnabledIf Annotation](https://github.com/eugenp/tutorials/tree/master/spring-5)
- [Reactive WebSockets with Spring 5](http://www.baeldung.com/spring-5-reactive-websockets)
-- [Spring Boot Actuator](http://www.baeldung.com/spring-boot-actuators)
-- [Spring Webflux Filters](http://www.baeldung.com/spring-webflux-filters)
-- [Reactive Flow with MongoDB, Kotlin, and Spring WebFlux](http://www.baeldung.com/kotlin-mongodb-spring-webflux)
-- [Spring Data Reactive Repositories with MongoDB](http://www.baeldung.com/spring-data-mongodb-reactive)
+- [Spring Webflux Filters](http://www.baeldung.com/spring-webflux-filters)
\ No newline at end of file
diff --git a/spring-data-5-reactive/README.md b/spring-data-5-reactive/README.md
new file mode 100644
index 0000000000..f8886ac18b
--- /dev/null
+++ b/spring-data-5-reactive/README.md
@@ -0,0 +1,8 @@
+## Spring Data Reactive Project
+
+### The Course
+The "REST With Spring" Classes: http://bit.ly/restwithspring
+
+### Relevant Articles
+- [Reactive Flow with MongoDB, Kotlin, and Spring WebFlux](http://www.baeldung.com/kotlin-mongodb-spring-webflux)
+- [Spring Data Reactive Repositories with MongoDB](http://www.baeldung.com/spring-data-mongodb-reactive)
diff --git a/spring-data-5-reactive/pom.xml b/spring-data-5-reactive/pom.xml
index bcf37f1da4..806eafa2d6 100644
--- a/spring-data-5-reactive/pom.xml
+++ b/spring-data-5-reactive/pom.xml
@@ -23,11 +23,6 @@
org.springframework.boot
spring-boot-starter-web
-
- javax.ws.rs
- javax.ws.rs-api
- ${javax.ws.rs-api.version}
-
com.fasterxml.jackson.module
jackson-module-kotlin
@@ -54,34 +49,51 @@
kotlin-stdlib-jdk8
${kotlin.version}
-
- org.jetbrains.kotlin
- kotlin-stdlib-jdk8
- ${kotlin.version}
-
org.jetbrains.kotlin
kotlin-test
${kotlin.version}
test
+
+ io.reactivex.rxjava2
+ rxjava
+
+
- org.jetbrains.kotlin
- kotlin-stdlib-jdk8
- ${kotlin.version}
+ org.springframework
+ spring-test
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
+
+
+ org.junit.jupiter
+ junit-jupiter-api
+
+
+ org.junit.jupiter
+ junit-jupiter-engine
+ test
+
+
+ org.junit.platform
+ junit-platform-surefire-provider
+ ${junit.platform.version}
+ test
+
+
+ org.junit.platform
+ junit-platform-runner
+ ${junit.platform.version}
+ test
-
-
- spring-libs-snapshot
- Spring Snapshot Repository
- http://repo.spring.io/libs-snapshot
-
-
-
- src/main/kotlin
org.springframework.boot
@@ -89,21 +101,30 @@
kotlin-maven-plugin
- ${kotlin.version}
-
+
compile
- compile
compile
+
+
+ ${project.basedir}/src/main/kotlin
+ ${project.basedir}/src/main/java
+
+
test-compile
- test-compile
test-compile
+
+
+ ${project.basedir}/src/test/kotlin
+ ${project.basedir}/src/test/java
+
+
org.jetbrains.kotlin
@@ -124,6 +145,57 @@
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+
+
+ ${java.version}
+
+
+
+
+ default-compile
+ none
+
+
+
+ default-testCompile
+ none
+
+
+ java-compile
+ compile
+
+ compile
+
+
+
+ java-test-compile
+ test-compile
+
+ testCompile
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+
+ 3
+ true
+ methods
+ true
+
+ **/*IntegrationTest.java
+ **/*IntTest.java
+ **/*LiveTest.java
+
+
+
@@ -132,6 +204,8 @@
UTF-8
1.8
1.2.40
+ 1.0.0
+ 5.0.2
diff --git a/spring-5-mongodb/src/main/java/com/baeldung/reactive/Spring5ReactiveApplication.java b/spring-data-5-reactive/src/main/java/com/baeldung/reactive/Spring5ReactiveApplication.java
similarity index 100%
rename from spring-5-mongodb/src/main/java/com/baeldung/reactive/Spring5ReactiveApplication.java
rename to spring-data-5-reactive/src/main/java/com/baeldung/reactive/Spring5ReactiveApplication.java
diff --git a/spring-5-mongodb/src/main/java/com/baeldung/reactive/model/Account.java b/spring-data-5-reactive/src/main/java/com/baeldung/reactive/model/Account.java
similarity index 100%
rename from spring-5-mongodb/src/main/java/com/baeldung/reactive/model/Account.java
rename to spring-data-5-reactive/src/main/java/com/baeldung/reactive/model/Account.java
diff --git a/spring-5-mongodb/src/main/java/com/baeldung/reactive/repository/AccountCrudRepository.java b/spring-data-5-reactive/src/main/java/com/baeldung/reactive/repository/AccountCrudRepository.java
similarity index 100%
rename from spring-5-mongodb/src/main/java/com/baeldung/reactive/repository/AccountCrudRepository.java
rename to spring-data-5-reactive/src/main/java/com/baeldung/reactive/repository/AccountCrudRepository.java
diff --git a/spring-5-mongodb/src/main/java/com/baeldung/reactive/repository/AccountMongoRepository.java b/spring-data-5-reactive/src/main/java/com/baeldung/reactive/repository/AccountMongoRepository.java
similarity index 100%
rename from spring-5-mongodb/src/main/java/com/baeldung/reactive/repository/AccountMongoRepository.java
rename to spring-data-5-reactive/src/main/java/com/baeldung/reactive/repository/AccountMongoRepository.java
diff --git a/spring-5-mongodb/src/main/java/com/baeldung/reactive/repository/AccountRxJavaRepository.java b/spring-data-5-reactive/src/main/java/com/baeldung/reactive/repository/AccountRxJavaRepository.java
similarity index 100%
rename from spring-5-mongodb/src/main/java/com/baeldung/reactive/repository/AccountRxJavaRepository.java
rename to spring-data-5-reactive/src/main/java/com/baeldung/reactive/repository/AccountRxJavaRepository.java
diff --git a/spring-5-mongodb/src/main/java/com/baeldung/reactive/template/AccountTemplateOperations.java b/spring-data-5-reactive/src/main/java/com/baeldung/reactive/template/AccountTemplateOperations.java
similarity index 100%
rename from spring-5-mongodb/src/main/java/com/baeldung/reactive/template/AccountTemplateOperations.java
rename to spring-data-5-reactive/src/main/java/com/baeldung/reactive/template/AccountTemplateOperations.java
diff --git a/spring-data-5-reactive/src/main/kotlin/com/baeldung/EventRepository.kt b/spring-data-5-reactive/src/main/kotlin/com/baeldung/EventRepository.kt
index a73ef8c807..e66af71ea6 100644
--- a/spring-data-5-reactive/src/main/kotlin/com/baeldung/EventRepository.kt
+++ b/spring-data-5-reactive/src/main/kotlin/com/baeldung/EventRepository.kt
@@ -4,6 +4,3 @@ import org.springframework.data.mongodb.core.mapping.Document
import org.springframework.data.mongodb.repository.ReactiveMongoRepository
interface EventRepository : ReactiveMongoRepository
-
-@Document
-data class Event(val id: String, val name: String)
diff --git a/spring-5-mongodb/src/test/java/com/baeldung/reactive/repository/AccountCrudRepositoryIntegrationTest.java b/spring-data-5-reactive/src/test/java/com/baeldung/reactive/repository/AccountCrudRepositoryIntegrationTest.java
similarity index 100%
rename from spring-5-mongodb/src/test/java/com/baeldung/reactive/repository/AccountCrudRepositoryIntegrationTest.java
rename to spring-data-5-reactive/src/test/java/com/baeldung/reactive/repository/AccountCrudRepositoryIntegrationTest.java
diff --git a/spring-5-mongodb/src/test/java/com/baeldung/reactive/repository/AccountMongoRepositoryIntegrationTest.java b/spring-data-5-reactive/src/test/java/com/baeldung/reactive/repository/AccountMongoRepositoryIntegrationTest.java
similarity index 100%
rename from spring-5-mongodb/src/test/java/com/baeldung/reactive/repository/AccountMongoRepositoryIntegrationTest.java
rename to spring-data-5-reactive/src/test/java/com/baeldung/reactive/repository/AccountMongoRepositoryIntegrationTest.java
diff --git a/spring-5-mongodb/src/test/java/com/baeldung/reactive/repository/AccountRxJavaRepositoryIntegrationTest.java b/spring-data-5-reactive/src/test/java/com/baeldung/reactive/repository/AccountRxJavaRepositoryIntegrationTest.java
similarity index 100%
rename from spring-5-mongodb/src/test/java/com/baeldung/reactive/repository/AccountRxJavaRepositoryIntegrationTest.java
rename to spring-data-5-reactive/src/test/java/com/baeldung/reactive/repository/AccountRxJavaRepositoryIntegrationTest.java
diff --git a/spring-5-mongodb/src/test/java/com/baeldung/reactive/template/AccountTemplateOperationsIntegrationTest.java b/spring-data-5-reactive/src/test/java/com/baeldung/reactive/template/AccountTemplateOperationsIntegrationTest.java
similarity index 100%
rename from spring-5-mongodb/src/test/java/com/baeldung/reactive/template/AccountTemplateOperationsIntegrationTest.java
rename to spring-data-5-reactive/src/test/java/com/baeldung/reactive/template/AccountTemplateOperationsIntegrationTest.java