Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,14 @@ public abstract class RxReactiveStreams {

public static <T> Observable<T> toObservable(Publisher<T> publisher) { … }

public static <T> Publisher<T> toPublisher(Single<T> observable) { … }

public static <T> Single<T> toSingle(Publisher<T> publisher) { … }

public static <T> Publisher<T> toPublisher(Completable observable) { … }

public static Completable toObservable(Publisher<?> publisher) { … }

}
```

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#2016-04-14T15:43:00+0100
#Thu Jun 30 22:23:34 CEST 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip
52 changes: 26 additions & 26 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

180 changes: 90 additions & 90 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion rxjava-reactive-streams/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description = "Adapter between RxJava and ReactiveStreams"
apply plugin: 'java'

dependencies {
compile 'io.reactivex:rxjava:1.1.3'
compile 'io.reactivex:rxjava:1.1.6'
compile 'org.reactivestreams:reactive-streams:1.0.0'
testCompile 'org.reactivestreams:reactive-streams-tck:1.0.0'
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ private RxReactiveStreams() {
* <p/>
* Use this method when you have an RxJava observable, that you want to be consumed by another library.
*
* @param <T> the value type
* @param observable the {@link Observable} to convert
* @return the converted {@link Publisher}
*/
Expand All @@ -48,6 +49,7 @@ public static <T> Publisher<T> toPublisher(Observable<T> observable) {
* <p/>
* Use this method when you have a stream from another library, that you want to be consume as an RxJava observable.
*
* @param <T> the value type
* @param publisher the {@link Publisher} to convert.
* @return the converted {@link Observable}
*/
Expand All @@ -63,6 +65,7 @@ public void call(final rx.Subscriber<? super T> rxSubscriber) {
/**
* Convert an RxJava {@link rx.Subscriber} into a Reactive Streams {@link org.reactivestreams.Subscriber}.
*
* @param <T> the value type
* @param rxSubscriber an RxJava subscriber
* @return a Reactive Streams subscriber
*/
Expand Down Expand Up @@ -104,6 +107,7 @@ public static Completable toCompletable(Publisher<?> publisher) {
* Converts a Single into a Publisher which emits an onNext+onComplete if
* the source Single signals a non-null onSuccess; or onError if the source signals
* onError(NullPointerException) or a null value.
* @param <T> the value type
* @param single the Single instance to convert
* @return the Publisher instance
* @since 1.1
Expand All @@ -121,6 +125,7 @@ public static <T> Publisher<T> toPublisher(Single<T> single) {
* Publisher signals an onNext+onComplete; or onError if the publisher signals an
* onError, the source Publisher is empty (NoSuchElementException) or the
* source Publisher signals more than one onNext (IndexOutOfBoundsException).
* @param <T> the value type
* @param publisher the Publisher instance to convert
* @return the Single instance
* @since 1.1
Expand Down