Skip to content

Commit 1326eea

Browse files
Merge pull request #1716 from benjchristensen/remove-parallel
Remove Observable.Parallel
2 parents e4101d6 + 31e7bb6 commit 1326eea

File tree

3 files changed

+0
-415
lines changed

3 files changed

+0
-415
lines changed

Diff for: src/main/java/rx/Observable.java

-46
Original file line numberDiff line numberDiff line change
@@ -5425,52 +5425,6 @@ public final Observable<T> onExceptionResumeNext(final Observable<? extends T> r
54255425
return lift(new OperatorOnExceptionResumeNextViaObservable<T>(resumeSequence));
54265426
}
54275427

5428-
/**
5429-
* Performs work on the source Observable in parallel by sharding it on a {@link Schedulers#computation()}
5430-
* {@link Scheduler}, and returns the resulting Observable.
5431-
* <p>
5432-
* <img width="640" height="475" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/parallel.png" alt="">
5433-
* <dl>
5434-
* <dt><b>Scheduler:</b></dt>
5435-
* <dd>{@code parallel} operates by default on the {@code computation} {@link Scheduler}.</dd>
5436-
* </dl>
5437-
*
5438-
* @param f
5439-
* a {@link Func1} that applies Observable Operators to {@code Observable<T>} in parallel and
5440-
* returns an {@code Observable<R>}
5441-
* @return an Observable that emits the results of applying {@code f} to the items emitted by the source
5442-
* Observable
5443-
* @see <a href="https://github.com/ReactiveX/RxJava/wiki/Observable-Utility-Operators#parallel">RxJava wiki: parallel</a>
5444-
* @see <a href="http://www.grahamlea.com/2014/07/rxjava-threading-examples/">RxJava Threading Examples</a>
5445-
*/
5446-
public final <R> Observable<R> parallel(Func1<Observable<T>, Observable<R>> f) {
5447-
return parallel(f, Schedulers.computation());
5448-
}
5449-
5450-
/**
5451-
* Performs work on the source Observable<T> in parallel by sharding it on a {@link Scheduler}, and returns
5452-
* the resulting Observable.
5453-
* <p>
5454-
* <img width="640" height="475" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/parallel.png" alt="">
5455-
* <dl>
5456-
* <dt><b>Scheduler:</b></dt>
5457-
* <dd>you specify which {@link Scheduler} this operator will use</dd>
5458-
* </dl>
5459-
*
5460-
* @param f
5461-
* a {@link Func1} that applies Observable Operators to {@code Observable<T>} in parallel and
5462-
* returns an {@code Observable<R>}
5463-
* @param s
5464-
* a {@link Scheduler} to perform the work on
5465-
* @return an Observable that emits the results of applying {@code f} to the items emitted by the source
5466-
* Observable
5467-
* @see <a href="https://github.com/ReactiveX/RxJava/wiki/Observable-Utility-Operators#parallel">RxJava wiki: parallel</a>
5468-
* @see <a href="http://www.grahamlea.com/2014/07/rxjava-threading-examples/">RxJava Threading Examples</a>
5469-
*/
5470-
public final <R> Observable<R> parallel(final Func1<Observable<T>, Observable<R>> f, final Scheduler s) {
5471-
return lift(new OperatorParallel<T, R>(f, s));
5472-
}
5473-
54745428
/**
54755429
* Returns a {@link ConnectableObservable}, which waits until its
54765430
* {@link ConnectableObservable#connect connect} method is called before it begins emitting items to those

Diff for: src/main/java/rx/internal/operators/OperatorParallel.java

-141
This file was deleted.

0 commit comments

Comments
 (0)