Skip to content
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

2.x: Apply missing RxJavaPlugins.onAssembly on ops #4877

Merged
merged 1 commit into from
Nov 23, 2016
Merged

2.x: Apply missing RxJavaPlugins.onAssembly on ops #4877

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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/io/reactivex/Maybe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2606,7 +2606,7 @@ public final <U, R> Maybe<R> flatMap(Function<? super T, ? extends MaybeSource<?
@BackpressureSupport(BackpressureKind.FULL)
@SchedulerSupport(SchedulerSupport.NONE)
public final <U> Flowable<U> flattenAsFlowable(final Function<? super T, ? extends Iterable<? extends U>> mapper) {
return new MaybeFlatMapIterableFlowable<T, U>(this, mapper);
return RxJavaPlugins.onAssembly(new MaybeFlatMapIterableFlowable<T, U>(this, mapper));
}

/**
Expand All @@ -2628,7 +2628,7 @@ public final <U> Flowable<U> flattenAsFlowable(final Function<? super T, ? exten
*/
@SchedulerSupport(SchedulerSupport.NONE)
public final <U> Observable<U> flattenAsObservable(final Function<? super T, ? extends Iterable<? extends U>> mapper) {
return new MaybeFlatMapIterableObservable<T, U>(this, mapper);
return RxJavaPlugins.onAssembly(new MaybeFlatMapIterableObservable<T, U>(this, mapper));
}

/**
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/io/reactivex/Observable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6347,7 +6347,7 @@ public final <K> Observable<T> distinct(Function<? super T, K> keySelector) {
public final <K> Observable<T> distinct(Function<? super T, K> keySelector, Callable<? extends Collection<? super K>> collectionSupplier) {
ObjectHelper.requireNonNull(keySelector, "keySelector is null");
ObjectHelper.requireNonNull(collectionSupplier, "collectionSupplier is null");
return new ObservableDistinct<T, K>(this, keySelector, collectionSupplier);
return RxJavaPlugins.onAssembly(new ObservableDistinct<T, K>(this, keySelector, collectionSupplier));
}

/**
Expand Down Expand Up @@ -8387,7 +8387,7 @@ public final ConnectableObservable<T> publish() {
@SchedulerSupport(SchedulerSupport.NONE)
public final <R> Observable<R> publish(Function<? super Observable<T>, ? extends ObservableSource<R>> selector) {
ObjectHelper.requireNonNull(selector, "selector is null");
return new ObservablePublishSelector<T, R>(this, selector);
return RxJavaPlugins.onAssembly(new ObservablePublishSelector<T, R>(this, selector));
}

/**
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/io/reactivex/Single.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1958,7 +1958,7 @@ public final <R> Flowable<R> flatMapPublisher(Function<? super T, ? extends Publ
@BackpressureSupport(BackpressureKind.FULL)
@SchedulerSupport(SchedulerSupport.NONE)
public final <U> Flowable<U> flattenAsFlowable(final Function<? super T, ? extends Iterable<? extends U>> mapper) {
return new SingleFlatMapIterableFlowable<T, U>(this, mapper);
return RxJavaPlugins.onAssembly(new SingleFlatMapIterableFlowable<T, U>(this, mapper));
}

/**
Expand All @@ -1980,7 +1980,7 @@ public final <U> Flowable<U> flattenAsFlowable(final Function<? super T, ? exten
*/
@SchedulerSupport(SchedulerSupport.NONE)
public final <U> Observable<U> flattenAsObservable(final Function<? super T, ? extends Iterable<? extends U>> mapper) {
return new SingleFlatMapIterableObservable<T, U>(this, mapper);
return RxJavaPlugins.onAssembly(new SingleFlatMapIterableObservable<T, U>(this, mapper));
}

/**
Expand Down