From b2b4d22fc1616fd70d5a39bbf6bd214e83179b39 Mon Sep 17 00:00:00 2001
From: amit2103 <amit.pandey2103@gmail.com>
Date: Tue, 21 Aug 2018 00:40:20 +0530
Subject: [PATCH] [BAEL-8417] - Seperated rxjava and rxjava2 code into two
 different modules

---
 pom.xml                                       |  3 ++
 rxjava-2/README.md                            |  6 +++
 rxjava-2/pom.xml                              | 46 +++++++++++++++++++
 .../java/com/baeldung/rxjava/RandomRelay.java |  0
 rxjava-2/src/main/resources/logback.xml       | 13 ++++++
 .../rxjava/FlowableIntegrationTest.java       |  0
 .../com/baeldung/rxjava/MaybeUnitTest.java    |  0
 .../rxjava/RxRelayIntegrationTest.java        |  0
 .../ExceptionHandlingIntegrationTest.java     |  0
 .../onerror/OnErrorRetryIntegrationTest.java  |  0
 .../RxFlatmapAndSwitchmapUnitTest.java        |  0
 rxjava/README.md                              |  4 --
 rxjava/pom.xml                                | 13 ------
 13 files changed, 68 insertions(+), 17 deletions(-)
 create mode 100644 rxjava-2/README.md
 create mode 100644 rxjava-2/pom.xml
 rename {rxjava => rxjava-2}/src/main/java/com/baeldung/rxjava/RandomRelay.java (100%)
 create mode 100644 rxjava-2/src/main/resources/logback.xml
 rename {rxjava => rxjava-2}/src/test/java/com/baeldung/rxjava/FlowableIntegrationTest.java (100%)
 rename {rxjava => rxjava-2}/src/test/java/com/baeldung/rxjava/MaybeUnitTest.java (100%)
 rename {rxjava => rxjava-2}/src/test/java/com/baeldung/rxjava/RxRelayIntegrationTest.java (100%)
 rename {rxjava => rxjava-2}/src/test/java/com/baeldung/rxjava/onerror/ExceptionHandlingIntegrationTest.java (100%)
 rename {rxjava => rxjava-2}/src/test/java/com/baeldung/rxjava/onerror/OnErrorRetryIntegrationTest.java (100%)
 rename {rxjava => rxjava-2}/src/test/java/com/baeldung/rxjava/operators/RxFlatmapAndSwitchmapUnitTest.java (100%)

diff --git a/pom.xml b/pom.xml
index 98b8f68a50..080c288987 100644
--- a/pom.xml
+++ b/pom.xml
@@ -436,6 +436,7 @@
 				<module>testing-modules/rest-testing</module>
 				<module>resteasy</module>
 				<module>rxjava</module>
+				<module>rxjava-2</module>
 				<module>spring-swagger-codegen</module>
 				<module>testing-modules/selenium-junit-testng</module>
 				<module>persistence-modules/solr</module>
@@ -694,6 +695,7 @@
 				<module>testing-modules/rest-testing</module>
 				<module>resteasy</module>
 				<module>rxjava</module>
+				<module>rxjava-2</module>
 				<module>spring-swagger-codegen</module>
 				<module>testing-modules/selenium-junit-testng</module>
 				<module>persistence-modules/solr</module>
@@ -977,6 +979,7 @@
 				<module>testing-modules/rest-testing</module>
 				<module>resteasy</module>
 				<module>rxjava</module>
+				<module>rxjava-2</module>
 				<module>spring-swagger-codegen</module>
 				<module>testing-modules/selenium-junit-testng</module>
 				<module>persistence-modules/solr</module>
diff --git a/rxjava-2/README.md b/rxjava-2/README.md
new file mode 100644
index 0000000000..ccf575757f
--- /dev/null
+++ b/rxjava-2/README.md
@@ -0,0 +1,6 @@
+## Relevant articles:
+
+- [RxJava and Error Handling](http://www.baeldung.com/rxjava-error-handling)
+- [RxJava 2 – Flowable](http://www.baeldung.com/rxjava-2-flowable)
+- [RxJava Maybe](http://www.baeldung.com/rxjava-maybe)
+- [Introduction to RxRelay for RxJava](http://www.baeldung.com/rx-relay)
\ No newline at end of file
diff --git a/rxjava-2/pom.xml b/rxjava-2/pom.xml
new file mode 100644
index 0000000000..4c5ea014d7
--- /dev/null
+++ b/rxjava-2/pom.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>rxjava-2</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-java</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-java</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.reactivex.rxjava2</groupId>
+            <artifactId>rxjava</artifactId>
+            <version>${rx.java2.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.jayway.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <version>${awaitility.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.jakewharton.rxrelay2</groupId>
+            <artifactId>rxrelay</artifactId>
+            <version>${rxrelay.version}</version>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <assertj.version>3.8.0</assertj.version>
+        <rx.java2.version>2.1.3</rx.java2.version>
+        <awaitility.version>1.7.0</awaitility.version>
+        <rxrelay.version>2.0.0</rxrelay.version>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/rxjava/src/main/java/com/baeldung/rxjava/RandomRelay.java b/rxjava-2/src/main/java/com/baeldung/rxjava/RandomRelay.java
similarity index 100%
rename from rxjava/src/main/java/com/baeldung/rxjava/RandomRelay.java
rename to rxjava-2/src/main/java/com/baeldung/rxjava/RandomRelay.java
diff --git a/rxjava-2/src/main/resources/logback.xml b/rxjava-2/src/main/resources/logback.xml
new file mode 100644
index 0000000000..7d900d8ea8
--- /dev/null
+++ b/rxjava-2/src/main/resources/logback.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/rxjava/src/test/java/com/baeldung/rxjava/FlowableIntegrationTest.java b/rxjava-2/src/test/java/com/baeldung/rxjava/FlowableIntegrationTest.java
similarity index 100%
rename from rxjava/src/test/java/com/baeldung/rxjava/FlowableIntegrationTest.java
rename to rxjava-2/src/test/java/com/baeldung/rxjava/FlowableIntegrationTest.java
diff --git a/rxjava/src/test/java/com/baeldung/rxjava/MaybeUnitTest.java b/rxjava-2/src/test/java/com/baeldung/rxjava/MaybeUnitTest.java
similarity index 100%
rename from rxjava/src/test/java/com/baeldung/rxjava/MaybeUnitTest.java
rename to rxjava-2/src/test/java/com/baeldung/rxjava/MaybeUnitTest.java
diff --git a/rxjava/src/test/java/com/baeldung/rxjava/RxRelayIntegrationTest.java b/rxjava-2/src/test/java/com/baeldung/rxjava/RxRelayIntegrationTest.java
similarity index 100%
rename from rxjava/src/test/java/com/baeldung/rxjava/RxRelayIntegrationTest.java
rename to rxjava-2/src/test/java/com/baeldung/rxjava/RxRelayIntegrationTest.java
diff --git a/rxjava/src/test/java/com/baeldung/rxjava/onerror/ExceptionHandlingIntegrationTest.java b/rxjava-2/src/test/java/com/baeldung/rxjava/onerror/ExceptionHandlingIntegrationTest.java
similarity index 100%
rename from rxjava/src/test/java/com/baeldung/rxjava/onerror/ExceptionHandlingIntegrationTest.java
rename to rxjava-2/src/test/java/com/baeldung/rxjava/onerror/ExceptionHandlingIntegrationTest.java
diff --git a/rxjava/src/test/java/com/baeldung/rxjava/onerror/OnErrorRetryIntegrationTest.java b/rxjava-2/src/test/java/com/baeldung/rxjava/onerror/OnErrorRetryIntegrationTest.java
similarity index 100%
rename from rxjava/src/test/java/com/baeldung/rxjava/onerror/OnErrorRetryIntegrationTest.java
rename to rxjava-2/src/test/java/com/baeldung/rxjava/onerror/OnErrorRetryIntegrationTest.java
diff --git a/rxjava/src/test/java/com/baeldung/rxjava/operators/RxFlatmapAndSwitchmapUnitTest.java b/rxjava-2/src/test/java/com/baeldung/rxjava/operators/RxFlatmapAndSwitchmapUnitTest.java
similarity index 100%
rename from rxjava/src/test/java/com/baeldung/rxjava/operators/RxFlatmapAndSwitchmapUnitTest.java
rename to rxjava-2/src/test/java/com/baeldung/rxjava/operators/RxFlatmapAndSwitchmapUnitTest.java
diff --git a/rxjava/README.md b/rxjava/README.md
index 5c60e3bbce..76135797a6 100644
--- a/rxjava/README.md
+++ b/rxjava/README.md
@@ -4,15 +4,11 @@
 - [How to Test RxJava?](http://www.baeldung.com/rxjava-testing)
 - [Implementing Custom Operators in RxJava](http://www.baeldung.com/rxjava-custom-operators)
 - [Introduction to RxJava](http://www.baeldung.com/rx-java)
-- [RxJava and Error Handling](http://www.baeldung.com/rxjava-error-handling)
 - [Observable Utility Operators in RxJava](http://www.baeldung.com/rxjava-observable-operators)
 - [Introduction to rxjava-jdbc](http://www.baeldung.com/rxjava-jdbc)
 - [Schedulers in RxJava](http://www.baeldung.com/rxjava-schedulers)
 - [Mathematical and Aggregate Operators in RxJava](http://www.baeldung.com/rxjava-math)
 - [Combining Observables in RxJava](http://www.baeldung.com/rxjava-combine-observables)
-- [RxJava 2 – Flowable](http://www.baeldung.com/rxjava-2-flowable)
 - [RxJava StringObservable](http://www.baeldung.com/rxjava-string)
-- [RxJava Maybe](http://www.baeldung.com/rxjava-maybe)
-- [Introduction to RxRelay for RxJava](http://www.baeldung.com/rx-relay)
 - [Filtering Observables in RxJava](http://www.baeldung.com/rxjava-filtering)
 - [RxJava One Observable, Multiple Subscribers](http://www.baeldung.com/rxjava-multiple-subscribers-observable)
diff --git a/rxjava/pom.xml b/rxjava/pom.xml
index 49732c1ef4..b316001d87 100644
--- a/rxjava/pom.xml
+++ b/rxjava/pom.xml
@@ -20,12 +20,6 @@
             <version>${rx.java.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>io.reactivex.rxjava2</groupId>
-            <artifactId>rxjava</artifactId>
-            <version>${rx.java2.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>io.reactivex</groupId>
             <artifactId>rxjava-math</artifactId>
@@ -59,22 +53,15 @@
             <artifactId>assertj-core</artifactId>
             <version>${assertj.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.jakewharton.rxrelay2</groupId>
-            <artifactId>rxrelay</artifactId>
-            <version>${rxrelay.version}</version>
-        </dependency>
     </dependencies>
 
     <properties>
         <assertj.version>3.8.0</assertj.version>
         <rx.java.version>1.2.5</rx.java.version>
-        <rx.java2.version>2.1.3</rx.java2.version>
         <rx.java.jdbc.version>0.7.11</rx.java.jdbc.version>
         <rx.java.math.version>1.0.0</rx.java.math.version>
         <rx.java.string.version>1.1.1</rx.java.string.version>
         <awaitility.version>1.7.0</awaitility.version>
-        <rxrelay.version>2.0.0</rxrelay.version>
         <h2.version>1.4.196</h2.version>
     </properties>