From 17ba25e79565f090c83edc1e86fe52300225eb71 Mon Sep 17 00:00:00 2001 From: Keerthi Date: Sun, 19 Jun 2022 01:51:25 +1000 Subject: [PATCH] JAVA-11499 move rxjava* modules to new rxjava-modules (#12342) * JAVA-11499 move rxjava* modules to new rxjava-modules * JAVA-11499 addressed PR comments --- pom.xml | 12 +----- rxjava-core/pom.xml | 41 ------------------- {rxjava-operators => rxjava-modules}/pom.xml | 28 ++++++++----- .../rxjava-core}/README.md | 0 rxjava-modules/rxjava-core/pom.xml | 15 +++++++ .../com/baeldung/rxjava/ComputeFunction.java | 0 .../rxjava/ConnectableObservableImpl.java | 0 .../com/baeldung/rxjava/ObservableImpl.java | 0 .../baeldung/rxjava/ResourceManagement.java | 0 .../java/com/baeldung/rxjava/SingleImpl.java | 0 .../java/com/baeldung/rxjava/SubjectImpl.java | 0 .../src/main/resources/logback.xml | 0 .../baeldung/rxjava/CompletableUnitTest.java | 0 .../ConnectableObservableIntegrationTest.java | 0 .../com/baeldung/rxjava/MaybeUnitTest.java | 0 .../baeldung/rxjava/ObservableUnitTest.java | 0 .../rxjava/ResourceManagementUnitTest.java | 0 ...RxJavaBackpressureLongRunningUnitTest.java | 0 .../rxjava/RxJavaHooksManualTest.java | 0 .../baeldung/rxjava/RxJavaHooksUnitTest.java | 0 .../com/baeldung/rxjava/RxJavaUnitTest.java | 0 .../baeldung/rxjava/SchedulersLiveTest.java | 0 .../com/baeldung/rxjava/SingleUnitTest.java | 0 .../com/baeldung/rxjava/SubjectUnitTest.java | 0 .../ExceptionHandlingIntegrationTest.java | 0 .../onerror/OnErrorRetryIntegrationTest.java | 0 .../rxjava-libraries}/README.md | 0 .../rxjava-libraries}/pom.xml | 17 +------- .../java/com/baeldung/rxjava/RandomRelay.java | 0 .../com/baeldung/rxjava/jdbc/Connector.java | 0 .../com/baeldung/rxjava/jdbc/Employee.java | 0 .../com/baeldung/rxjava/jdbc/Manager.java | 0 .../java/com/baeldung/rxjava/jdbc/Utils.java | 0 .../rxjava/FlowableIntegrationTest.java | 0 .../rxjava/RxRelayIntegrationTest.java | 0 .../jdbc/AutomapClassIntegrationTest.java | 0 .../jdbc/AutomapInterfaceIntegrationTest.java | 0 .../jdbc/BasicQueryTypesIntegrationTest.java | 0 .../jdbc/InsertBlobIntegrationTest.java | 0 .../jdbc/InsertClobIntegrationTest.java | 0 .../jdbc/ReturnKeysIntegrationTest.java | 0 .../jdbc/TransactionIntegrationTest.java | 0 .../src/test/resources/actual_clob | 0 .../src/test/resources/expected_clob | 0 .../rxjava-observables}/README.md | 0 rxjava-modules/rxjava-observables/pom.xml | 14 +++++++ .../rxjava/MultipleSubscribersColdObs.java | 0 .../rxjava/MultipleSubscribersHotObs.java | 0 .../combine/ObservableCombineUnitTest.java | 0 .../RxJavaFilterOperatorsIntegrationTest.java | 0 .../RxJavaSkipOperatorsIntegrationTest.java | 0 ...TimeFilteringOperatorsIntegrationTest.java | 0 .../operators/RxStringOperatorsUnitTest.java | 0 .../rxjava-operators}/README.md | 0 rxjava-modules/rxjava-operators/pom.xml | 28 +++++++++++++ .../rxjava/operator/ToCleanString.java | 0 .../baeldung/rxjava/operator/ToLength.java | 0 ...yncAndSyncToObservableIntegrationTest.java | 0 .../rxjava/RxJavaCustomOperatorUnitTest.java | 0 .../UtilityOperatorsIntegrationTest.java | 0 .../RxAggregateOperatorsUnitTest.java | 0 .../RxFlatmapAndSwitchmapUnitTest.java | 0 .../RxMathematicalOperatorsUnitTest.java | 0 rxjava-observables/pom.xml | 35 ---------------- 64 files changed, 79 insertions(+), 111 deletions(-) delete mode 100644 rxjava-core/pom.xml rename {rxjava-operators => rxjava-modules}/pom.xml (72%) rename {rxjava-core => rxjava-modules/rxjava-core}/README.md (100%) create mode 100644 rxjava-modules/rxjava-core/pom.xml rename {rxjava-core => rxjava-modules/rxjava-core}/src/main/java/com/baeldung/rxjava/ComputeFunction.java (100%) rename {rxjava-core => rxjava-modules/rxjava-core}/src/main/java/com/baeldung/rxjava/ConnectableObservableImpl.java (100%) rename {rxjava-core => rxjava-modules/rxjava-core}/src/main/java/com/baeldung/rxjava/ObservableImpl.java (100%) rename {rxjava-core => rxjava-modules/rxjava-core}/src/main/java/com/baeldung/rxjava/ResourceManagement.java (100%) rename {rxjava-core => rxjava-modules/rxjava-core}/src/main/java/com/baeldung/rxjava/SingleImpl.java (100%) rename {rxjava-core => rxjava-modules/rxjava-core}/src/main/java/com/baeldung/rxjava/SubjectImpl.java (100%) rename {rxjava-core => rxjava-modules/rxjava-core}/src/main/resources/logback.xml (100%) rename {rxjava-core => rxjava-modules/rxjava-core}/src/test/java/com/baeldung/rxjava/CompletableUnitTest.java (100%) rename {rxjava-core => rxjava-modules/rxjava-core}/src/test/java/com/baeldung/rxjava/ConnectableObservableIntegrationTest.java (100%) rename {rxjava-core => rxjava-modules/rxjava-core}/src/test/java/com/baeldung/rxjava/MaybeUnitTest.java (100%) rename {rxjava-core => rxjava-modules/rxjava-core}/src/test/java/com/baeldung/rxjava/ObservableUnitTest.java (100%) rename {rxjava-core => rxjava-modules/rxjava-core}/src/test/java/com/baeldung/rxjava/ResourceManagementUnitTest.java (100%) rename {rxjava-core => rxjava-modules/rxjava-core}/src/test/java/com/baeldung/rxjava/RxJavaBackpressureLongRunningUnitTest.java (100%) rename {rxjava-core => rxjava-modules/rxjava-core}/src/test/java/com/baeldung/rxjava/RxJavaHooksManualTest.java (100%) rename {rxjava-core => rxjava-modules/rxjava-core}/src/test/java/com/baeldung/rxjava/RxJavaHooksUnitTest.java (100%) rename {rxjava-core => rxjava-modules/rxjava-core}/src/test/java/com/baeldung/rxjava/RxJavaUnitTest.java (100%) rename {rxjava-core => rxjava-modules/rxjava-core}/src/test/java/com/baeldung/rxjava/SchedulersLiveTest.java (100%) rename {rxjava-core => rxjava-modules/rxjava-core}/src/test/java/com/baeldung/rxjava/SingleUnitTest.java (100%) rename {rxjava-core => rxjava-modules/rxjava-core}/src/test/java/com/baeldung/rxjava/SubjectUnitTest.java (100%) rename {rxjava-core => rxjava-modules/rxjava-core}/src/test/java/com/baeldung/rxjava/onerror/ExceptionHandlingIntegrationTest.java (100%) rename {rxjava-core => rxjava-modules/rxjava-core}/src/test/java/com/baeldung/rxjava/onerror/OnErrorRetryIntegrationTest.java (100%) rename {rxjava-libraries => rxjava-modules/rxjava-libraries}/README.md (100%) rename {rxjava-libraries => rxjava-modules/rxjava-libraries}/pom.xml (67%) rename {rxjava-libraries => rxjava-modules/rxjava-libraries}/src/main/java/com/baeldung/rxjava/RandomRelay.java (100%) rename {rxjava-libraries => rxjava-modules/rxjava-libraries}/src/main/java/com/baeldung/rxjava/jdbc/Connector.java (100%) rename {rxjava-libraries => rxjava-modules/rxjava-libraries}/src/main/java/com/baeldung/rxjava/jdbc/Employee.java (100%) rename {rxjava-libraries => rxjava-modules/rxjava-libraries}/src/main/java/com/baeldung/rxjava/jdbc/Manager.java (100%) rename {rxjava-libraries => rxjava-modules/rxjava-libraries}/src/main/java/com/baeldung/rxjava/jdbc/Utils.java (100%) rename {rxjava-libraries => rxjava-modules/rxjava-libraries}/src/test/java/com/baeldung/rxjava/FlowableIntegrationTest.java (100%) rename {rxjava-libraries => rxjava-modules/rxjava-libraries}/src/test/java/com/baeldung/rxjava/RxRelayIntegrationTest.java (100%) rename {rxjava-libraries => rxjava-modules/rxjava-libraries}/src/test/java/com/baeldung/rxjava/jdbc/AutomapClassIntegrationTest.java (100%) rename {rxjava-libraries => rxjava-modules/rxjava-libraries}/src/test/java/com/baeldung/rxjava/jdbc/AutomapInterfaceIntegrationTest.java (100%) rename {rxjava-libraries => rxjava-modules/rxjava-libraries}/src/test/java/com/baeldung/rxjava/jdbc/BasicQueryTypesIntegrationTest.java (100%) rename {rxjava-libraries => rxjava-modules/rxjava-libraries}/src/test/java/com/baeldung/rxjava/jdbc/InsertBlobIntegrationTest.java (100%) rename {rxjava-libraries => rxjava-modules/rxjava-libraries}/src/test/java/com/baeldung/rxjava/jdbc/InsertClobIntegrationTest.java (100%) rename {rxjava-libraries => rxjava-modules/rxjava-libraries}/src/test/java/com/baeldung/rxjava/jdbc/ReturnKeysIntegrationTest.java (100%) rename {rxjava-libraries => rxjava-modules/rxjava-libraries}/src/test/java/com/baeldung/rxjava/jdbc/TransactionIntegrationTest.java (100%) rename {rxjava-libraries => rxjava-modules/rxjava-libraries}/src/test/resources/actual_clob (100%) rename {rxjava-libraries => rxjava-modules/rxjava-libraries}/src/test/resources/expected_clob (100%) rename {rxjava-observables => rxjava-modules/rxjava-observables}/README.md (100%) create mode 100644 rxjava-modules/rxjava-observables/pom.xml rename {rxjava-observables => rxjava-modules/rxjava-observables}/src/main/java/com/baeldung/rxjava/MultipleSubscribersColdObs.java (100%) rename {rxjava-observables => rxjava-modules/rxjava-observables}/src/main/java/com/baeldung/rxjava/MultipleSubscribersHotObs.java (100%) rename {rxjava-observables => rxjava-modules/rxjava-observables}/src/test/java/com/baeldung/rxjava/combine/ObservableCombineUnitTest.java (100%) rename {rxjava-observables => rxjava-modules/rxjava-observables}/src/test/java/com/baeldung/rxjava/filters/RxJavaFilterOperatorsIntegrationTest.java (100%) rename {rxjava-observables => rxjava-modules/rxjava-observables}/src/test/java/com/baeldung/rxjava/filters/RxJavaSkipOperatorsIntegrationTest.java (100%) rename {rxjava-observables => rxjava-modules/rxjava-observables}/src/test/java/com/baeldung/rxjava/filters/RxJavaTimeFilteringOperatorsIntegrationTest.java (100%) rename {rxjava-observables => rxjava-modules/rxjava-observables}/src/test/java/com/baeldung/rxjava/operators/RxStringOperatorsUnitTest.java (100%) rename {rxjava-operators => rxjava-modules/rxjava-operators}/README.md (100%) create mode 100644 rxjava-modules/rxjava-operators/pom.xml rename {rxjava-operators => rxjava-modules/rxjava-operators}/src/main/java/com/baeldung/rxjava/operator/ToCleanString.java (100%) rename {rxjava-operators => rxjava-modules/rxjava-operators}/src/main/java/com/baeldung/rxjava/operator/ToLength.java (100%) rename {rxjava-operators => rxjava-modules/rxjava-operators}/src/test/java/com/baeldung/rxjava/AsyncAndSyncToObservableIntegrationTest.java (100%) rename {rxjava-operators => rxjava-modules/rxjava-operators}/src/test/java/com/baeldung/rxjava/RxJavaCustomOperatorUnitTest.java (100%) rename {rxjava-operators => rxjava-modules/rxjava-operators}/src/test/java/com/baeldung/rxjava/UtilityOperatorsIntegrationTest.java (100%) rename {rxjava-operators => rxjava-modules/rxjava-operators}/src/test/java/com/baeldung/rxjava/operators/RxAggregateOperatorsUnitTest.java (100%) rename {rxjava-operators => rxjava-modules/rxjava-operators}/src/test/java/com/baeldung/rxjava/operators/RxFlatmapAndSwitchmapUnitTest.java (100%) rename {rxjava-operators => rxjava-modules/rxjava-operators}/src/test/java/com/baeldung/rxjava/operators/RxMathematicalOperatorsUnitTest.java (100%) delete mode 100644 rxjava-observables/pom.xml diff --git a/pom.xml b/pom.xml index de42d6947e..ca3b113a46 100644 --- a/pom.xml +++ b/pom.xml @@ -521,11 +521,7 @@ restx rsocket rule-engines - rxjava-core - rxjava-libraries - rxjava-observables - rxjava-operators - + rxjava-modules atomikos reactive-systems slack @@ -976,11 +972,7 @@ restx rsocket rule-engines - rxjava-core - rxjava-libraries - rxjava-observables - rxjava-operators - + rxjava-modules atomikos reactive-systems slack diff --git a/rxjava-core/pom.xml b/rxjava-core/pom.xml deleted file mode 100644 index 89ea1bf7a2..0000000000 --- a/rxjava-core/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - 4.0.0 - rxjava-core - 1.0-SNAPSHOT - rxjava-core - - - com.baeldung - parent-java - 0.0.1-SNAPSHOT - ../parent-java - - - - - io.reactivex - rxjava - ${rx.java.version} - - - io.reactivex.rxjava2 - rxjava - ${rx.java2.version} - - - com.jayway.awaitility - awaitility - ${awaitility.version} - - - - - 1.2.5 - 1.7.0 - 2.2.2 - - - \ No newline at end of file diff --git a/rxjava-operators/pom.xml b/rxjava-modules/pom.xml similarity index 72% rename from rxjava-operators/pom.xml rename to rxjava-modules/pom.xml index d833fb5d14..3031598aab 100644 --- a/rxjava-operators/pom.xml +++ b/rxjava-modules/pom.xml @@ -3,9 +3,11 @@ 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"> 4.0.0 - rxjava-operators - 1.0-SNAPSHOT - rxjava-operators + com.baeldung.rxjava-modules + rxjava-modules + 0.0.1-SNAPSHOT + rxjava-modules + pom com.baeldung @@ -14,6 +16,13 @@ ../parent-java + + rxjava-core + rxjava-libraries + rxjava-observables + rxjava-operators + + io.reactivex @@ -25,11 +34,10 @@ rxjava ${rx.java2.version} - - com.github.akarnokd - rxjava2-extensions - ${rxjava2.ext.version} + io.reactivex + rxjava-string + ${rx.java.string.version} io.reactivex @@ -44,11 +52,11 @@ - 0.20.4 - 2.2.2 1.2.5 - 1.0.0 1.7.0 + 1.1.1 + 1.0.0 + 2.2.2 \ No newline at end of file diff --git a/rxjava-core/README.md b/rxjava-modules/rxjava-core/README.md similarity index 100% rename from rxjava-core/README.md rename to rxjava-modules/rxjava-core/README.md diff --git a/rxjava-modules/rxjava-core/pom.xml b/rxjava-modules/rxjava-core/pom.xml new file mode 100644 index 0000000000..1ca940e501 --- /dev/null +++ b/rxjava-modules/rxjava-core/pom.xml @@ -0,0 +1,15 @@ + + + 4.0.0 + rxjava-core + 1.0-SNAPSHOT + rxjava-core + + com.baeldung.rxjava-modules + rxjava-modules + 0.0.1-SNAPSHOT + + + \ No newline at end of file diff --git a/rxjava-core/src/main/java/com/baeldung/rxjava/ComputeFunction.java b/rxjava-modules/rxjava-core/src/main/java/com/baeldung/rxjava/ComputeFunction.java similarity index 100% rename from rxjava-core/src/main/java/com/baeldung/rxjava/ComputeFunction.java rename to rxjava-modules/rxjava-core/src/main/java/com/baeldung/rxjava/ComputeFunction.java diff --git a/rxjava-core/src/main/java/com/baeldung/rxjava/ConnectableObservableImpl.java b/rxjava-modules/rxjava-core/src/main/java/com/baeldung/rxjava/ConnectableObservableImpl.java similarity index 100% rename from rxjava-core/src/main/java/com/baeldung/rxjava/ConnectableObservableImpl.java rename to rxjava-modules/rxjava-core/src/main/java/com/baeldung/rxjava/ConnectableObservableImpl.java diff --git a/rxjava-core/src/main/java/com/baeldung/rxjava/ObservableImpl.java b/rxjava-modules/rxjava-core/src/main/java/com/baeldung/rxjava/ObservableImpl.java similarity index 100% rename from rxjava-core/src/main/java/com/baeldung/rxjava/ObservableImpl.java rename to rxjava-modules/rxjava-core/src/main/java/com/baeldung/rxjava/ObservableImpl.java diff --git a/rxjava-core/src/main/java/com/baeldung/rxjava/ResourceManagement.java b/rxjava-modules/rxjava-core/src/main/java/com/baeldung/rxjava/ResourceManagement.java similarity index 100% rename from rxjava-core/src/main/java/com/baeldung/rxjava/ResourceManagement.java rename to rxjava-modules/rxjava-core/src/main/java/com/baeldung/rxjava/ResourceManagement.java diff --git a/rxjava-core/src/main/java/com/baeldung/rxjava/SingleImpl.java b/rxjava-modules/rxjava-core/src/main/java/com/baeldung/rxjava/SingleImpl.java similarity index 100% rename from rxjava-core/src/main/java/com/baeldung/rxjava/SingleImpl.java rename to rxjava-modules/rxjava-core/src/main/java/com/baeldung/rxjava/SingleImpl.java diff --git a/rxjava-core/src/main/java/com/baeldung/rxjava/SubjectImpl.java b/rxjava-modules/rxjava-core/src/main/java/com/baeldung/rxjava/SubjectImpl.java similarity index 100% rename from rxjava-core/src/main/java/com/baeldung/rxjava/SubjectImpl.java rename to rxjava-modules/rxjava-core/src/main/java/com/baeldung/rxjava/SubjectImpl.java diff --git a/rxjava-core/src/main/resources/logback.xml b/rxjava-modules/rxjava-core/src/main/resources/logback.xml similarity index 100% rename from rxjava-core/src/main/resources/logback.xml rename to rxjava-modules/rxjava-core/src/main/resources/logback.xml diff --git a/rxjava-core/src/test/java/com/baeldung/rxjava/CompletableUnitTest.java b/rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/CompletableUnitTest.java similarity index 100% rename from rxjava-core/src/test/java/com/baeldung/rxjava/CompletableUnitTest.java rename to rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/CompletableUnitTest.java diff --git a/rxjava-core/src/test/java/com/baeldung/rxjava/ConnectableObservableIntegrationTest.java b/rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/ConnectableObservableIntegrationTest.java similarity index 100% rename from rxjava-core/src/test/java/com/baeldung/rxjava/ConnectableObservableIntegrationTest.java rename to rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/ConnectableObservableIntegrationTest.java diff --git a/rxjava-core/src/test/java/com/baeldung/rxjava/MaybeUnitTest.java b/rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/MaybeUnitTest.java similarity index 100% rename from rxjava-core/src/test/java/com/baeldung/rxjava/MaybeUnitTest.java rename to rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/MaybeUnitTest.java diff --git a/rxjava-core/src/test/java/com/baeldung/rxjava/ObservableUnitTest.java b/rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/ObservableUnitTest.java similarity index 100% rename from rxjava-core/src/test/java/com/baeldung/rxjava/ObservableUnitTest.java rename to rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/ObservableUnitTest.java diff --git a/rxjava-core/src/test/java/com/baeldung/rxjava/ResourceManagementUnitTest.java b/rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/ResourceManagementUnitTest.java similarity index 100% rename from rxjava-core/src/test/java/com/baeldung/rxjava/ResourceManagementUnitTest.java rename to rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/ResourceManagementUnitTest.java diff --git a/rxjava-core/src/test/java/com/baeldung/rxjava/RxJavaBackpressureLongRunningUnitTest.java b/rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/RxJavaBackpressureLongRunningUnitTest.java similarity index 100% rename from rxjava-core/src/test/java/com/baeldung/rxjava/RxJavaBackpressureLongRunningUnitTest.java rename to rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/RxJavaBackpressureLongRunningUnitTest.java diff --git a/rxjava-core/src/test/java/com/baeldung/rxjava/RxJavaHooksManualTest.java b/rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/RxJavaHooksManualTest.java similarity index 100% rename from rxjava-core/src/test/java/com/baeldung/rxjava/RxJavaHooksManualTest.java rename to rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/RxJavaHooksManualTest.java diff --git a/rxjava-core/src/test/java/com/baeldung/rxjava/RxJavaHooksUnitTest.java b/rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/RxJavaHooksUnitTest.java similarity index 100% rename from rxjava-core/src/test/java/com/baeldung/rxjava/RxJavaHooksUnitTest.java rename to rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/RxJavaHooksUnitTest.java diff --git a/rxjava-core/src/test/java/com/baeldung/rxjava/RxJavaUnitTest.java b/rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/RxJavaUnitTest.java similarity index 100% rename from rxjava-core/src/test/java/com/baeldung/rxjava/RxJavaUnitTest.java rename to rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/RxJavaUnitTest.java diff --git a/rxjava-core/src/test/java/com/baeldung/rxjava/SchedulersLiveTest.java b/rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/SchedulersLiveTest.java similarity index 100% rename from rxjava-core/src/test/java/com/baeldung/rxjava/SchedulersLiveTest.java rename to rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/SchedulersLiveTest.java diff --git a/rxjava-core/src/test/java/com/baeldung/rxjava/SingleUnitTest.java b/rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/SingleUnitTest.java similarity index 100% rename from rxjava-core/src/test/java/com/baeldung/rxjava/SingleUnitTest.java rename to rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/SingleUnitTest.java diff --git a/rxjava-core/src/test/java/com/baeldung/rxjava/SubjectUnitTest.java b/rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/SubjectUnitTest.java similarity index 100% rename from rxjava-core/src/test/java/com/baeldung/rxjava/SubjectUnitTest.java rename to rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/SubjectUnitTest.java diff --git a/rxjava-core/src/test/java/com/baeldung/rxjava/onerror/ExceptionHandlingIntegrationTest.java b/rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/onerror/ExceptionHandlingIntegrationTest.java similarity index 100% rename from rxjava-core/src/test/java/com/baeldung/rxjava/onerror/ExceptionHandlingIntegrationTest.java rename to rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/onerror/ExceptionHandlingIntegrationTest.java diff --git a/rxjava-core/src/test/java/com/baeldung/rxjava/onerror/OnErrorRetryIntegrationTest.java b/rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/onerror/OnErrorRetryIntegrationTest.java similarity index 100% rename from rxjava-core/src/test/java/com/baeldung/rxjava/onerror/OnErrorRetryIntegrationTest.java rename to rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/onerror/OnErrorRetryIntegrationTest.java diff --git a/rxjava-libraries/README.md b/rxjava-modules/rxjava-libraries/README.md similarity index 100% rename from rxjava-libraries/README.md rename to rxjava-modules/rxjava-libraries/README.md diff --git a/rxjava-libraries/pom.xml b/rxjava-modules/rxjava-libraries/pom.xml similarity index 67% rename from rxjava-libraries/pom.xml rename to rxjava-modules/rxjava-libraries/pom.xml index f8df78d741..f5ccbd2d3c 100644 --- a/rxjava-libraries/pom.xml +++ b/rxjava-modules/rxjava-libraries/pom.xml @@ -8,23 +8,12 @@ rxjava-libraries - com.baeldung - parent-java + com.baeldung.rxjava-modules + rxjava-modules 0.0.1-SNAPSHOT - ../parent-java - - io.reactivex - rxjava - ${rx.java.version} - - - io.reactivex.rxjava2 - rxjava - ${rx.java2.version} - com.jakewharton.rxrelay2 rxrelay @@ -45,9 +34,7 @@ 0.7.11 - 1.2.5 2.0.0 - 2.2.2 \ No newline at end of file diff --git a/rxjava-libraries/src/main/java/com/baeldung/rxjava/RandomRelay.java b/rxjava-modules/rxjava-libraries/src/main/java/com/baeldung/rxjava/RandomRelay.java similarity index 100% rename from rxjava-libraries/src/main/java/com/baeldung/rxjava/RandomRelay.java rename to rxjava-modules/rxjava-libraries/src/main/java/com/baeldung/rxjava/RandomRelay.java diff --git a/rxjava-libraries/src/main/java/com/baeldung/rxjava/jdbc/Connector.java b/rxjava-modules/rxjava-libraries/src/main/java/com/baeldung/rxjava/jdbc/Connector.java similarity index 100% rename from rxjava-libraries/src/main/java/com/baeldung/rxjava/jdbc/Connector.java rename to rxjava-modules/rxjava-libraries/src/main/java/com/baeldung/rxjava/jdbc/Connector.java diff --git a/rxjava-libraries/src/main/java/com/baeldung/rxjava/jdbc/Employee.java b/rxjava-modules/rxjava-libraries/src/main/java/com/baeldung/rxjava/jdbc/Employee.java similarity index 100% rename from rxjava-libraries/src/main/java/com/baeldung/rxjava/jdbc/Employee.java rename to rxjava-modules/rxjava-libraries/src/main/java/com/baeldung/rxjava/jdbc/Employee.java diff --git a/rxjava-libraries/src/main/java/com/baeldung/rxjava/jdbc/Manager.java b/rxjava-modules/rxjava-libraries/src/main/java/com/baeldung/rxjava/jdbc/Manager.java similarity index 100% rename from rxjava-libraries/src/main/java/com/baeldung/rxjava/jdbc/Manager.java rename to rxjava-modules/rxjava-libraries/src/main/java/com/baeldung/rxjava/jdbc/Manager.java diff --git a/rxjava-libraries/src/main/java/com/baeldung/rxjava/jdbc/Utils.java b/rxjava-modules/rxjava-libraries/src/main/java/com/baeldung/rxjava/jdbc/Utils.java similarity index 100% rename from rxjava-libraries/src/main/java/com/baeldung/rxjava/jdbc/Utils.java rename to rxjava-modules/rxjava-libraries/src/main/java/com/baeldung/rxjava/jdbc/Utils.java diff --git a/rxjava-libraries/src/test/java/com/baeldung/rxjava/FlowableIntegrationTest.java b/rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/FlowableIntegrationTest.java similarity index 100% rename from rxjava-libraries/src/test/java/com/baeldung/rxjava/FlowableIntegrationTest.java rename to rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/FlowableIntegrationTest.java diff --git a/rxjava-libraries/src/test/java/com/baeldung/rxjava/RxRelayIntegrationTest.java b/rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/RxRelayIntegrationTest.java similarity index 100% rename from rxjava-libraries/src/test/java/com/baeldung/rxjava/RxRelayIntegrationTest.java rename to rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/RxRelayIntegrationTest.java diff --git a/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/AutomapClassIntegrationTest.java b/rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/AutomapClassIntegrationTest.java similarity index 100% rename from rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/AutomapClassIntegrationTest.java rename to rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/AutomapClassIntegrationTest.java diff --git a/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/AutomapInterfaceIntegrationTest.java b/rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/AutomapInterfaceIntegrationTest.java similarity index 100% rename from rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/AutomapInterfaceIntegrationTest.java rename to rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/AutomapInterfaceIntegrationTest.java diff --git a/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/BasicQueryTypesIntegrationTest.java b/rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/BasicQueryTypesIntegrationTest.java similarity index 100% rename from rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/BasicQueryTypesIntegrationTest.java rename to rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/BasicQueryTypesIntegrationTest.java diff --git a/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/InsertBlobIntegrationTest.java b/rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/InsertBlobIntegrationTest.java similarity index 100% rename from rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/InsertBlobIntegrationTest.java rename to rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/InsertBlobIntegrationTest.java diff --git a/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/InsertClobIntegrationTest.java b/rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/InsertClobIntegrationTest.java similarity index 100% rename from rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/InsertClobIntegrationTest.java rename to rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/InsertClobIntegrationTest.java diff --git a/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/ReturnKeysIntegrationTest.java b/rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/ReturnKeysIntegrationTest.java similarity index 100% rename from rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/ReturnKeysIntegrationTest.java rename to rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/ReturnKeysIntegrationTest.java diff --git a/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/TransactionIntegrationTest.java b/rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/TransactionIntegrationTest.java similarity index 100% rename from rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/TransactionIntegrationTest.java rename to rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/TransactionIntegrationTest.java diff --git a/rxjava-libraries/src/test/resources/actual_clob b/rxjava-modules/rxjava-libraries/src/test/resources/actual_clob similarity index 100% rename from rxjava-libraries/src/test/resources/actual_clob rename to rxjava-modules/rxjava-libraries/src/test/resources/actual_clob diff --git a/rxjava-libraries/src/test/resources/expected_clob b/rxjava-modules/rxjava-libraries/src/test/resources/expected_clob similarity index 100% rename from rxjava-libraries/src/test/resources/expected_clob rename to rxjava-modules/rxjava-libraries/src/test/resources/expected_clob diff --git a/rxjava-observables/README.md b/rxjava-modules/rxjava-observables/README.md similarity index 100% rename from rxjava-observables/README.md rename to rxjava-modules/rxjava-observables/README.md diff --git a/rxjava-modules/rxjava-observables/pom.xml b/rxjava-modules/rxjava-observables/pom.xml new file mode 100644 index 0000000000..c54df19fa8 --- /dev/null +++ b/rxjava-modules/rxjava-observables/pom.xml @@ -0,0 +1,14 @@ + + + 4.0.0 + rxjava-observables + 1.0-SNAPSHOT + rxjava-observables + + com.baeldung.rxjava-modules + rxjava-modules + 0.0.1-SNAPSHOT + + \ No newline at end of file diff --git a/rxjava-observables/src/main/java/com/baeldung/rxjava/MultipleSubscribersColdObs.java b/rxjava-modules/rxjava-observables/src/main/java/com/baeldung/rxjava/MultipleSubscribersColdObs.java similarity index 100% rename from rxjava-observables/src/main/java/com/baeldung/rxjava/MultipleSubscribersColdObs.java rename to rxjava-modules/rxjava-observables/src/main/java/com/baeldung/rxjava/MultipleSubscribersColdObs.java diff --git a/rxjava-observables/src/main/java/com/baeldung/rxjava/MultipleSubscribersHotObs.java b/rxjava-modules/rxjava-observables/src/main/java/com/baeldung/rxjava/MultipleSubscribersHotObs.java similarity index 100% rename from rxjava-observables/src/main/java/com/baeldung/rxjava/MultipleSubscribersHotObs.java rename to rxjava-modules/rxjava-observables/src/main/java/com/baeldung/rxjava/MultipleSubscribersHotObs.java diff --git a/rxjava-observables/src/test/java/com/baeldung/rxjava/combine/ObservableCombineUnitTest.java b/rxjava-modules/rxjava-observables/src/test/java/com/baeldung/rxjava/combine/ObservableCombineUnitTest.java similarity index 100% rename from rxjava-observables/src/test/java/com/baeldung/rxjava/combine/ObservableCombineUnitTest.java rename to rxjava-modules/rxjava-observables/src/test/java/com/baeldung/rxjava/combine/ObservableCombineUnitTest.java diff --git a/rxjava-observables/src/test/java/com/baeldung/rxjava/filters/RxJavaFilterOperatorsIntegrationTest.java b/rxjava-modules/rxjava-observables/src/test/java/com/baeldung/rxjava/filters/RxJavaFilterOperatorsIntegrationTest.java similarity index 100% rename from rxjava-observables/src/test/java/com/baeldung/rxjava/filters/RxJavaFilterOperatorsIntegrationTest.java rename to rxjava-modules/rxjava-observables/src/test/java/com/baeldung/rxjava/filters/RxJavaFilterOperatorsIntegrationTest.java diff --git a/rxjava-observables/src/test/java/com/baeldung/rxjava/filters/RxJavaSkipOperatorsIntegrationTest.java b/rxjava-modules/rxjava-observables/src/test/java/com/baeldung/rxjava/filters/RxJavaSkipOperatorsIntegrationTest.java similarity index 100% rename from rxjava-observables/src/test/java/com/baeldung/rxjava/filters/RxJavaSkipOperatorsIntegrationTest.java rename to rxjava-modules/rxjava-observables/src/test/java/com/baeldung/rxjava/filters/RxJavaSkipOperatorsIntegrationTest.java diff --git a/rxjava-observables/src/test/java/com/baeldung/rxjava/filters/RxJavaTimeFilteringOperatorsIntegrationTest.java b/rxjava-modules/rxjava-observables/src/test/java/com/baeldung/rxjava/filters/RxJavaTimeFilteringOperatorsIntegrationTest.java similarity index 100% rename from rxjava-observables/src/test/java/com/baeldung/rxjava/filters/RxJavaTimeFilteringOperatorsIntegrationTest.java rename to rxjava-modules/rxjava-observables/src/test/java/com/baeldung/rxjava/filters/RxJavaTimeFilteringOperatorsIntegrationTest.java diff --git a/rxjava-observables/src/test/java/com/baeldung/rxjava/operators/RxStringOperatorsUnitTest.java b/rxjava-modules/rxjava-observables/src/test/java/com/baeldung/rxjava/operators/RxStringOperatorsUnitTest.java similarity index 100% rename from rxjava-observables/src/test/java/com/baeldung/rxjava/operators/RxStringOperatorsUnitTest.java rename to rxjava-modules/rxjava-observables/src/test/java/com/baeldung/rxjava/operators/RxStringOperatorsUnitTest.java diff --git a/rxjava-operators/README.md b/rxjava-modules/rxjava-operators/README.md similarity index 100% rename from rxjava-operators/README.md rename to rxjava-modules/rxjava-operators/README.md diff --git a/rxjava-modules/rxjava-operators/pom.xml b/rxjava-modules/rxjava-operators/pom.xml new file mode 100644 index 0000000000..1859edc23b --- /dev/null +++ b/rxjava-modules/rxjava-operators/pom.xml @@ -0,0 +1,28 @@ + + + 4.0.0 + rxjava-operators + 1.0-SNAPSHOT + rxjava-operators + + + com.baeldung.rxjava-modules + rxjava-modules + 0.0.1-SNAPSHOT + + + + + + com.github.akarnokd + rxjava2-extensions + ${rxjava2.ext.version} + + + + + 0.20.4 + + \ No newline at end of file diff --git a/rxjava-operators/src/main/java/com/baeldung/rxjava/operator/ToCleanString.java b/rxjava-modules/rxjava-operators/src/main/java/com/baeldung/rxjava/operator/ToCleanString.java similarity index 100% rename from rxjava-operators/src/main/java/com/baeldung/rxjava/operator/ToCleanString.java rename to rxjava-modules/rxjava-operators/src/main/java/com/baeldung/rxjava/operator/ToCleanString.java diff --git a/rxjava-operators/src/main/java/com/baeldung/rxjava/operator/ToLength.java b/rxjava-modules/rxjava-operators/src/main/java/com/baeldung/rxjava/operator/ToLength.java similarity index 100% rename from rxjava-operators/src/main/java/com/baeldung/rxjava/operator/ToLength.java rename to rxjava-modules/rxjava-operators/src/main/java/com/baeldung/rxjava/operator/ToLength.java diff --git a/rxjava-operators/src/test/java/com/baeldung/rxjava/AsyncAndSyncToObservableIntegrationTest.java b/rxjava-modules/rxjava-operators/src/test/java/com/baeldung/rxjava/AsyncAndSyncToObservableIntegrationTest.java similarity index 100% rename from rxjava-operators/src/test/java/com/baeldung/rxjava/AsyncAndSyncToObservableIntegrationTest.java rename to rxjava-modules/rxjava-operators/src/test/java/com/baeldung/rxjava/AsyncAndSyncToObservableIntegrationTest.java diff --git a/rxjava-operators/src/test/java/com/baeldung/rxjava/RxJavaCustomOperatorUnitTest.java b/rxjava-modules/rxjava-operators/src/test/java/com/baeldung/rxjava/RxJavaCustomOperatorUnitTest.java similarity index 100% rename from rxjava-operators/src/test/java/com/baeldung/rxjava/RxJavaCustomOperatorUnitTest.java rename to rxjava-modules/rxjava-operators/src/test/java/com/baeldung/rxjava/RxJavaCustomOperatorUnitTest.java diff --git a/rxjava-operators/src/test/java/com/baeldung/rxjava/UtilityOperatorsIntegrationTest.java b/rxjava-modules/rxjava-operators/src/test/java/com/baeldung/rxjava/UtilityOperatorsIntegrationTest.java similarity index 100% rename from rxjava-operators/src/test/java/com/baeldung/rxjava/UtilityOperatorsIntegrationTest.java rename to rxjava-modules/rxjava-operators/src/test/java/com/baeldung/rxjava/UtilityOperatorsIntegrationTest.java diff --git a/rxjava-operators/src/test/java/com/baeldung/rxjava/operators/RxAggregateOperatorsUnitTest.java b/rxjava-modules/rxjava-operators/src/test/java/com/baeldung/rxjava/operators/RxAggregateOperatorsUnitTest.java similarity index 100% rename from rxjava-operators/src/test/java/com/baeldung/rxjava/operators/RxAggregateOperatorsUnitTest.java rename to rxjava-modules/rxjava-operators/src/test/java/com/baeldung/rxjava/operators/RxAggregateOperatorsUnitTest.java diff --git a/rxjava-operators/src/test/java/com/baeldung/rxjava/operators/RxFlatmapAndSwitchmapUnitTest.java b/rxjava-modules/rxjava-operators/src/test/java/com/baeldung/rxjava/operators/RxFlatmapAndSwitchmapUnitTest.java similarity index 100% rename from rxjava-operators/src/test/java/com/baeldung/rxjava/operators/RxFlatmapAndSwitchmapUnitTest.java rename to rxjava-modules/rxjava-operators/src/test/java/com/baeldung/rxjava/operators/RxFlatmapAndSwitchmapUnitTest.java diff --git a/rxjava-operators/src/test/java/com/baeldung/rxjava/operators/RxMathematicalOperatorsUnitTest.java b/rxjava-modules/rxjava-operators/src/test/java/com/baeldung/rxjava/operators/RxMathematicalOperatorsUnitTest.java similarity index 100% rename from rxjava-operators/src/test/java/com/baeldung/rxjava/operators/RxMathematicalOperatorsUnitTest.java rename to rxjava-modules/rxjava-operators/src/test/java/com/baeldung/rxjava/operators/RxMathematicalOperatorsUnitTest.java diff --git a/rxjava-observables/pom.xml b/rxjava-observables/pom.xml deleted file mode 100644 index bcc3c4bbce..0000000000 --- a/rxjava-observables/pom.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - 4.0.0 - rxjava-observables - 1.0-SNAPSHOT - rxjava-observables - - - com.baeldung - parent-java - 0.0.1-SNAPSHOT - ../parent-java - - - - - io.reactivex - rxjava - ${rx.java.version} - - - io.reactivex - rxjava-string - ${rx.java.string.version} - - - - - 1.1.1 - 1.2.5 - - - \ No newline at end of file