-
Notifications
You must be signed in to change notification settings - Fork 7.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
2.x: Dedicated {Single|Maybe}.flatMap{Publisher|Observable} & andThen…
…(Observable|Publisher) implementations (#6024) * 2.x: Dedicated {0..1}.flatMap{Publisher|Obs} & andThen implementations * Fix local variable name.
- Loading branch information
Showing
15 changed files
with
1,086 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
101 changes: 101 additions & 0 deletions
101
src/main/java/io/reactivex/internal/operators/mixed/CompletableAndThenObservable.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| /** | ||
| * Copyright (c) 2016-present, RxJava Contributors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in | ||
| * compliance with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software distributed under the License is | ||
| * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See | ||
| * the License for the specific language governing permissions and limitations under the License. | ||
| */ | ||
|
|
||
| package io.reactivex.internal.operators.mixed; | ||
|
|
||
| import java.util.concurrent.atomic.AtomicReference; | ||
|
|
||
| import io.reactivex.*; | ||
| import io.reactivex.disposables.Disposable; | ||
| import io.reactivex.internal.disposables.DisposableHelper; | ||
|
|
||
| /** | ||
| * After Completable completes, it relays the signals | ||
| * of the ObservableSource to the downstream observer. | ||
| * | ||
| * @param <R> the result type of the ObservableSource and this operator | ||
| * @since 2.1.15 | ||
| */ | ||
| public final class CompletableAndThenObservable<R> extends Observable<R> { | ||
|
|
||
| final CompletableSource source; | ||
|
|
||
| final ObservableSource<? extends R> other; | ||
|
|
||
| public CompletableAndThenObservable(CompletableSource source, | ||
| ObservableSource<? extends R> other) { | ||
| this.source = source; | ||
| this.other = other; | ||
| } | ||
|
|
||
| @Override | ||
| protected void subscribeActual(Observer<? super R> s) { | ||
| AndThenObservableObserver<R> parent = new AndThenObservableObserver<R>(s, other); | ||
| s.onSubscribe(parent); | ||
| source.subscribe(parent); | ||
| } | ||
|
|
||
| static final class AndThenObservableObserver<R> | ||
| extends AtomicReference<Disposable> | ||
| implements Observer<R>, CompletableObserver, Disposable { | ||
|
|
||
| private static final long serialVersionUID = -8948264376121066672L; | ||
|
|
||
| final Observer<? super R> downstream; | ||
|
|
||
| ObservableSource<? extends R> other; | ||
|
|
||
| AndThenObservableObserver(Observer<? super R> downstream, ObservableSource<? extends R> other) { | ||
| this.other = other; | ||
| this.downstream = downstream; | ||
| } | ||
|
|
||
| @Override | ||
| public void onNext(R t) { | ||
| downstream.onNext(t); | ||
| } | ||
|
|
||
| @Override | ||
| public void onError(Throwable t) { | ||
| downstream.onError(t); | ||
| } | ||
|
|
||
| @Override | ||
| public void onComplete() { | ||
| ObservableSource<? extends R> o = other; | ||
| if (o == null) { | ||
| downstream.onComplete(); | ||
| } else { | ||
| other = null; | ||
| o.subscribe(this); | ||
| } | ||
| } | ||
|
|
||
|
|
||
| @Override | ||
| public void dispose() { | ||
| DisposableHelper.dispose(this); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isDisposed() { | ||
| return DisposableHelper.isDisposed(get()); | ||
| } | ||
|
|
||
| @Override | ||
| public void onSubscribe(Disposable d) { | ||
| DisposableHelper.replace(this, d); | ||
| } | ||
|
|
||
| } | ||
| } |
114 changes: 114 additions & 0 deletions
114
src/main/java/io/reactivex/internal/operators/mixed/CompletableAndThenPublisher.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,114 @@ | ||
| /** | ||
| * Copyright (c) 2016-present, RxJava Contributors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in | ||
| * compliance with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software distributed under the License is | ||
| * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See | ||
| * the License for the specific language governing permissions and limitations under the License. | ||
| */ | ||
|
|
||
| package io.reactivex.internal.operators.mixed; | ||
|
|
||
| import java.util.concurrent.atomic.*; | ||
|
|
||
| import org.reactivestreams.*; | ||
|
|
||
| import io.reactivex.*; | ||
| import io.reactivex.disposables.Disposable; | ||
| import io.reactivex.internal.disposables.DisposableHelper; | ||
| import io.reactivex.internal.subscriptions.SubscriptionHelper; | ||
|
|
||
| /** | ||
| * After Completable completes, it relays the signals | ||
| * of the Publisher to the downstream subscriber. | ||
| * | ||
| * @param <R> the result type of the Publisher and this operator | ||
| * @since 2.1.15 | ||
| */ | ||
| public final class CompletableAndThenPublisher<R> extends Flowable<R> { | ||
|
|
||
| final CompletableSource source; | ||
|
|
||
| final Publisher<? extends R> other; | ||
|
|
||
| public CompletableAndThenPublisher(CompletableSource source, | ||
| Publisher<? extends R> other) { | ||
| this.source = source; | ||
| this.other = other; | ||
| } | ||
|
|
||
| @Override | ||
| protected void subscribeActual(Subscriber<? super R> s) { | ||
| source.subscribe(new AndThenPublisherSubscriber<R>(s, other)); | ||
| } | ||
|
|
||
| static final class AndThenPublisherSubscriber<R> | ||
| extends AtomicReference<Subscription> | ||
| implements FlowableSubscriber<R>, CompletableObserver, Subscription { | ||
|
|
||
| private static final long serialVersionUID = -8948264376121066672L; | ||
|
|
||
| final Subscriber<? super R> downstream; | ||
|
|
||
| Publisher<? extends R> other; | ||
|
|
||
| Disposable upstream; | ||
|
|
||
| final AtomicLong requested; | ||
|
|
||
| AndThenPublisherSubscriber(Subscriber<? super R> downstream, Publisher<? extends R> other) { | ||
| this.downstream = downstream; | ||
| this.other = other; | ||
| this.requested = new AtomicLong(); | ||
| } | ||
|
|
||
| @Override | ||
| public void onNext(R t) { | ||
| downstream.onNext(t); | ||
| } | ||
|
|
||
| @Override | ||
| public void onError(Throwable t) { | ||
| downstream.onError(t); | ||
| } | ||
|
|
||
| @Override | ||
| public void onComplete() { | ||
| Publisher<? extends R> p = other; | ||
| if (p == null) { | ||
| downstream.onComplete(); | ||
| } else { | ||
| other = null; | ||
| p.subscribe(this); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void request(long n) { | ||
| SubscriptionHelper.deferredRequest(this, requested, n); | ||
| } | ||
|
|
||
| @Override | ||
| public void cancel() { | ||
| upstream.dispose(); | ||
| SubscriptionHelper.cancel(this); | ||
| } | ||
|
|
||
| @Override | ||
| public void onSubscribe(Disposable d) { | ||
| if (DisposableHelper.validate(upstream, d)) { | ||
| this.upstream = d; | ||
| downstream.onSubscribe(this); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void onSubscribe(Subscription s) { | ||
| SubscriptionHelper.deferredSetOnce(this, requested, s); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.