Merge pull request #5015 from amit2103/BAEL-8417

[BAEL-8417] - Seperated rxjava and rxjava2 code into two different mo…
This commit is contained in:
Loredana Crusoveanu 2018-08-21 20:00:49 +03:00 committed by GitHub
commit 77f5ff2954
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 68 additions and 17 deletions

View File

@ -436,6 +436,7 @@
<module>testing-modules/rest-testing</module> <module>testing-modules/rest-testing</module>
<module>resteasy</module> <module>resteasy</module>
<module>rxjava</module> <module>rxjava</module>
<module>rxjava-2</module>
<module>spring-swagger-codegen</module> <module>spring-swagger-codegen</module>
<module>testing-modules/selenium-junit-testng</module> <module>testing-modules/selenium-junit-testng</module>
<module>persistence-modules/solr</module> <module>persistence-modules/solr</module>
@ -694,6 +695,7 @@
<module>testing-modules/rest-testing</module> <module>testing-modules/rest-testing</module>
<module>resteasy</module> <module>resteasy</module>
<module>rxjava</module> <module>rxjava</module>
<module>rxjava-2</module>
<module>spring-swagger-codegen</module> <module>spring-swagger-codegen</module>
<module>testing-modules/selenium-junit-testng</module> <module>testing-modules/selenium-junit-testng</module>
<module>persistence-modules/solr</module> <module>persistence-modules/solr</module>
@ -977,6 +979,7 @@
<module>testing-modules/rest-testing</module> <module>testing-modules/rest-testing</module>
<module>resteasy</module> <module>resteasy</module>
<module>rxjava</module> <module>rxjava</module>
<module>rxjava-2</module>
<module>spring-swagger-codegen</module> <module>spring-swagger-codegen</module>
<module>testing-modules/selenium-junit-testng</module> <module>testing-modules/selenium-junit-testng</module>
<module>persistence-modules/solr</module> <module>persistence-modules/solr</module>

6
rxjava-2/README.md Normal file
View File

@ -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)

46
rxjava-2/pom.xml Normal file
View File

@ -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>

View File

@ -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>

View File

@ -4,15 +4,11 @@
- [How to Test RxJava?](http://www.baeldung.com/rxjava-testing) - [How to Test RxJava?](http://www.baeldung.com/rxjava-testing)
- [Implementing Custom Operators in RxJava](http://www.baeldung.com/rxjava-custom-operators) - [Implementing Custom Operators in RxJava](http://www.baeldung.com/rxjava-custom-operators)
- [Introduction to RxJava](http://www.baeldung.com/rx-java) - [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) - [Observable Utility Operators in RxJava](http://www.baeldung.com/rxjava-observable-operators)
- [Introduction to rxjava-jdbc](http://www.baeldung.com/rxjava-jdbc) - [Introduction to rxjava-jdbc](http://www.baeldung.com/rxjava-jdbc)
- [Schedulers in RxJava](http://www.baeldung.com/rxjava-schedulers) - [Schedulers in RxJava](http://www.baeldung.com/rxjava-schedulers)
- [Mathematical and Aggregate Operators in RxJava](http://www.baeldung.com/rxjava-math) - [Mathematical and Aggregate Operators in RxJava](http://www.baeldung.com/rxjava-math)
- [Combining Observables in RxJava](http://www.baeldung.com/rxjava-combine-observables) - [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 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) - [Filtering Observables in RxJava](http://www.baeldung.com/rxjava-filtering)
- [RxJava One Observable, Multiple Subscribers](http://www.baeldung.com/rxjava-multiple-subscribers-observable) - [RxJava One Observable, Multiple Subscribers](http://www.baeldung.com/rxjava-multiple-subscribers-observable)

View File

@ -20,12 +20,6 @@
<version>${rx.java.version}</version> <version>${rx.java.version}</version>
</dependency> </dependency>
<dependency>
<groupId>io.reactivex.rxjava2</groupId>
<artifactId>rxjava</artifactId>
<version>${rx.java2.version}</version>
</dependency>
<dependency> <dependency>
<groupId>io.reactivex</groupId> <groupId>io.reactivex</groupId>
<artifactId>rxjava-math</artifactId> <artifactId>rxjava-math</artifactId>
@ -59,22 +53,15 @@
<artifactId>assertj-core</artifactId> <artifactId>assertj-core</artifactId>
<version>${assertj.version}</version> <version>${assertj.version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.jakewharton.rxrelay2</groupId>
<artifactId>rxrelay</artifactId>
<version>${rxrelay.version}</version>
</dependency>
</dependencies> </dependencies>
<properties> <properties>
<assertj.version>3.8.0</assertj.version> <assertj.version>3.8.0</assertj.version>
<rx.java.version>1.2.5</rx.java.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.jdbc.version>0.7.11</rx.java.jdbc.version>
<rx.java.math.version>1.0.0</rx.java.math.version> <rx.java.math.version>1.0.0</rx.java.math.version>
<rx.java.string.version>1.1.1</rx.java.string.version> <rx.java.string.version>1.1.1</rx.java.string.version>
<awaitility.version>1.7.0</awaitility.version> <awaitility.version>1.7.0</awaitility.version>
<rxrelay.version>2.0.0</rxrelay.version>
<h2.version>1.4.196</h2.version> <h2.version>1.4.196</h2.version>
</properties> </properties>