Skip to content

2.x: rename and refactor classes to match the design document #3783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 23, 2016
Merged

2.x: rename and refactor classes to match the design document #3783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ dependencies {
testCompile 'junit:junit:4.12'
testCompile 'org.mockito:mockito-core:1.10.19'

perfCompile 'org.openjdk.jmh:jmh-core:1.10.5'
perfCompile 'org.openjdk.jmh:jmh-generator-annprocess:1.10.5'
perfCompile 'org.openjdk.jmh:jmh-core:1.11.3'
perfCompile 'org.openjdk.jmh:jmh-generator-annprocess:1.11.3'
// perfCompile 'org.reactivex:rxjava:1.0.14'
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-bin.zip
46 changes: 23 additions & 23 deletions src/main/java/io/reactivex/Completable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import org.reactivestreams.*;

import io.reactivex.NbpObservable.*;
import io.reactivex.Observable.*;
import io.reactivex.Single.*;
import io.reactivex.annotations.*;
import io.reactivex.disposables.*;
Expand Down Expand Up @@ -353,7 +353,7 @@ public static Completable concat(Iterable<? extends Completable> sources) {
* @throws NullPointerException if sources is null
*/
@SchedulerSupport(SchedulerKind.NONE)
public static Completable concat(Observable<? extends Completable> sources) {
public static Completable concat(Flowable<? extends Completable> sources) {
return concat(sources, 2);
}

Expand All @@ -365,7 +365,7 @@ public static Completable concat(Observable<? extends Completable> sources) {
* @throws NullPointerException if sources is null
*/
@SchedulerSupport(SchedulerKind.NONE)
public static Completable concat(Observable<? extends Completable> sources, int prefetch) {
public static Completable concat(Flowable<? extends Completable> sources, int prefetch) {
Objects.requireNonNull(sources, "sources is null");
if (prefetch < 1) {
throw new IllegalArgumentException("prefetch > 0 required but it was " + prefetch);
Expand Down Expand Up @@ -517,7 +517,7 @@ public void accept(CompletableSubscriber s) {
* @throws NullPointerException if flowable is null
*/
@SchedulerSupport(SchedulerKind.NONE)
public static <T> Completable fromFlowable(final Observable<T> flowable) {
public static <T> Completable fromFlowable(final Flowable<T> flowable) {
Objects.requireNonNull(flowable, "flowable is null");
return create(new CompletableOnSubscribe() {
@Override
Expand Down Expand Up @@ -559,12 +559,12 @@ public void onSubscribe(Subscription s) {
* @throws NullPointerException if flowable is null
*/
@SchedulerSupport(SchedulerKind.NONE)
public static <T> Completable fromNbpObservable(final NbpObservable<T> observable) {
public static <T> Completable fromNbpObservable(final Observable<T> observable) {
Objects.requireNonNull(observable, "observable is null");
return create(new CompletableOnSubscribe() {
@Override
public void accept(final CompletableSubscriber s) {
observable.subscribe(new NbpSubscriber<T>() {
observable.subscribe(new Observer<T>() {

@Override
public void onComplete() {
Expand Down Expand Up @@ -695,7 +695,7 @@ public static Completable merge(Iterable<? extends Completable> sources) {
* @return the new Completable instance
* @throws NullPointerException if sources is null
*/
public static Completable merge(Observable<? extends Completable> sources) {
public static Completable merge(Flowable<? extends Completable> sources) {
return merge0(sources, Integer.MAX_VALUE, false);
}

Expand All @@ -708,7 +708,7 @@ public static Completable merge(Observable<? extends Completable> sources) {
* @throws NullPointerException if sources is null
* @throws IllegalArgumentException if maxConcurrency is less than 1
*/
public static Completable merge(Observable<? extends Completable> sources, int maxConcurrency) {
public static Completable merge(Flowable<? extends Completable> sources, int maxConcurrency) {
return merge0(sources, maxConcurrency, false);

}
Expand All @@ -724,7 +724,7 @@ public static Completable merge(Observable<? extends Completable> sources, int m
* @throws NullPointerException if sources is null
* @throws IllegalArgumentException if maxConcurrency is less than 1
*/
protected static Completable merge0(Observable<? extends Completable> sources, int maxConcurrency, boolean delayErrors) {
protected static Completable merge0(Flowable<? extends Completable> sources, int maxConcurrency, boolean delayErrors) {
Objects.requireNonNull(sources, "sources is null");
if (maxConcurrency < 1) {
throw new IllegalArgumentException("maxConcurrency > 0 required but it was " + maxConcurrency);
Expand Down Expand Up @@ -767,7 +767,7 @@ public static Completable mergeDelayError(Iterable<? extends Completable> source
* @return the new Completable instance
* @throws NullPointerException if sources is null
*/
public static Completable mergeDelayError(Observable<? extends Completable> sources) {
public static Completable mergeDelayError(Flowable<? extends Completable> sources) {
return merge0(sources, Integer.MAX_VALUE, true);
}

Expand All @@ -781,7 +781,7 @@ public static Completable mergeDelayError(Observable<? extends Completable> sour
* @return the new Completable instance
* @throws NullPointerException if sources is null
*/
public static Completable mergeDelayError(Observable<? extends Completable> sources, int maxConcurrency) {
public static Completable mergeDelayError(Flowable<? extends Completable> sources, int maxConcurrency) {
return merge0(sources, maxConcurrency, true);
}

Expand Down Expand Up @@ -1390,7 +1390,7 @@ public final Completable endWith(Completable other) {
* @throws NullPointerException if next is null
*/
@SchedulerSupport(SchedulerKind.CUSTOM)
public final <T> NbpObservable<T> endWith(NbpObservable<T> next) {
public final <T> Observable<T> endWith(Observable<T> next) {
return next.startWith(this.<T>toNbpObservable());
}

Expand All @@ -1403,7 +1403,7 @@ public final <T> NbpObservable<T> endWith(NbpObservable<T> next) {
* @throws NullPointerException if next is null
*/
@SchedulerSupport(SchedulerKind.CUSTOM)
public final <T> Observable<T> endWith(Observable<T> next) {
public final <T> Flowable<T> endWith(Flowable<T> next) {
return next.startWith(this.<T>toFlowable());
}

Expand Down Expand Up @@ -1787,7 +1787,7 @@ public final Completable repeatUntil(BooleanSupplier stop) {
* FIXME the Observable<Void> type doesn't make sense here because nulls are not allowed
* FIXME add unit test once the type has been fixed
*/
public final Completable repeatWhen(Function<? super Observable<Object>, ? extends Publisher<Object>> handler) {
public final Completable repeatWhen(Function<? super Flowable<Object>, ? extends Publisher<Object>> handler) {
return fromFlowable(toFlowable().repeatWhen(handler));
}

Expand Down Expand Up @@ -1847,7 +1847,7 @@ public final Completable retry(Predicate<? super Throwable> predicate) {
* @throws NullPointerException if handler is null
*/
@SchedulerSupport(SchedulerKind.NONE)
public final Completable retryWhen(Function<? super Observable<? extends Throwable>, ? extends Publisher<Object>> handler) {
public final Completable retryWhen(Function<? super Flowable<? extends Throwable>, ? extends Publisher<Object>> handler) {
return fromFlowable(toFlowable().retryWhen(handler));
}

Expand All @@ -1873,7 +1873,7 @@ public final Completable startWith(Completable other) {
* @throws NullPointerException if other is null
*/
@SchedulerSupport(SchedulerKind.NONE)
public final <T> NbpObservable<T> startWith(NbpObservable<T> other) {
public final <T> Observable<T> startWith(Observable<T> other) {
Objects.requireNonNull(other, "other is null");
return other.endWith(this.<T>toNbpObservable());
}
Expand All @@ -1886,7 +1886,7 @@ public final <T> NbpObservable<T> startWith(NbpObservable<T> other) {
* @throws NullPointerException if other is null
*/
@SchedulerSupport(SchedulerKind.NONE)
public final <T> Observable<T> startWith(Observable<T> other) {
public final <T> Flowable<T> startWith(Flowable<T> other) {
Objects.requireNonNull(other, "other is null");
return other.endWith(this.<T>toFlowable());
}
Expand Down Expand Up @@ -1988,7 +1988,7 @@ public void onSubscribe(Disposable d) {
* @throws NullPointerException if s is null
*/
@SchedulerSupport(SchedulerKind.NONE)
public final void subscribe(final NbpSubscriber<?> s) {
public final void subscribe(final Observer<?> s) {
Objects.requireNonNull(s, "s is null");
try {
// TODO plugin wrapping the subscriber
Expand Down Expand Up @@ -2221,8 +2221,8 @@ public final <U> U to(Function<? super Completable, U> converter) {
* @return the new Observable created
*/
@SchedulerSupport(SchedulerKind.NONE)
public final <T> Observable<T> toFlowable() {
return Observable.create(new Publisher<T>() {
public final <T> Flowable<T> toFlowable() {
return Flowable.create(new Publisher<T>() {
@Override
public void subscribe(Subscriber<? super T> s) {
Completable.this.subscribe(s);
Expand All @@ -2237,10 +2237,10 @@ public void subscribe(Subscriber<? super T> s) {
* @return the new NbpObservable created
*/
@SchedulerSupport(SchedulerKind.NONE)
public final <T> NbpObservable<T> toNbpObservable() {
return NbpObservable.create(new NbpOnSubscribe<T>() {
public final <T> Observable<T> toNbpObservable() {
return Observable.create(new NbpOnSubscribe<T>() {
@Override
public void accept(NbpSubscriber<? super T> s) {
public void accept(Observer<? super T> s) {
subscribe(s);
}
});
Expand Down
Loading