Merge branch 'OperatorParallelMerge' of github.com:akarnokd/RxJava into merge-prs

Conflicts:
	rxjava-core/src/main/java/rx/Observable.java

Author: benjchristensen

rxjava-core/src/main/java/rx/Observable.java

@@ -49,7 +49,6 @@
 import rx.operators.OnSubscribeFromIterable;
 import rx.operators.OnSubscribeRange;
 import rx.operators.OperationDelay;
-import rx.operators.OperationParallelMerge;
 import rx.operators.OperationSequenceEqual;
 import rx.operators.OperationSkip;
 import rx.operators.OperationSkipUntil;
@@ -101,6 +100,7 @@
 import rx.operators.OperatorOnErrorReturn;
 import rx.operators.OperatorOnExceptionResumeNextViaObservable;
 import rx.operators.OperatorParallel;
+import rx.operators.OperatorParallelMerge;
 import rx.operators.OperatorPivot;
 import rx.operators.OperatorRepeat;
 import rx.operators.OperatorReplay;
@@ -2312,7 +2312,7 @@ public final static <T> Observable<T> never() {
      * @see <a href="https://github.com/Netflix/RxJava/wiki/Combining-Observables#wiki-parallelmerge">RxJava Wiki: parallelMerge()</a>
      */
     public final static <T> Observable<Observable<T>> parallelMerge(Observable<Observable<T>> source, int parallelObservables) {
-        return OperationParallelMerge.parallelMerge(source, parallelObservables);
+        return OperatorParallelMerge.parallelMerge(source, parallelObservables);
     }
 
     /**
@@ -2335,7 +2335,7 @@ public final static <T> Observable<Observable<T>> parallelMerge(Observable<Obser
      * @see <a href="https://github.com/Netflix/RxJava/wiki/Combining-Observables#wiki-parallelmerge">RxJava Wiki: parallelMerge()</a>
      */
     public final static <T> Observable<Observable<T>> parallelMerge(Observable<Observable<T>> source, int parallelObservables, Scheduler scheduler) {
-        return OperationParallelMerge.parallelMerge(source, parallelObservables, scheduler);
+        return OperatorParallelMerge.parallelMerge(source, parallelObservables, scheduler);
     }
 
     /**

rxjava-core/src/main/java/rx/operators/OperationParallelMerge.java renamed to rxjava-core/src/main/java/rx/operators/OperatorParallelMerge.java

@@ -23,7 +23,8 @@
 import rx.observables.GroupedObservable;
 import rx.schedulers.Schedulers;
 
-public class OperationParallelMerge {
+public final class OperatorParallelMerge {
+    private OperatorParallelMerge() { throw new IllegalStateException("No instances!"); }
 
     public static <T> Observable<Observable<T>> parallelMerge(final Observable<Observable<T>> source, final int parallelObservables) {
         return parallelMerge(source, parallelObservables, Schedulers.immediate());

rxjava-core/src/test/java/rx/operators/OperationParallelMergeTest.java renamed to rxjava-core/src/test/java/rx/operators/OperatorParallelMergeTest.java

@@ -30,7 +30,7 @@
 import rx.schedulers.Schedulers;
 import rx.subjects.PublishSubject;
 
-public class OperationParallelMergeTest {
+public class OperatorParallelMergeTest {
 
     @Test
     public void testParallelMerge() {
@@ -41,8 +41,8 @@ public void testParallelMerge() {
 
         Observable<Observable<String>> fourStreams = Observable.<Observable<String>> from(p1, p2, p3, p4);
 
-        Observable<Observable<String>> twoStreams = OperationParallelMerge.parallelMerge(fourStreams, 2);
-        Observable<Observable<String>> threeStreams = OperationParallelMerge.parallelMerge(fourStreams, 3);
+        Observable<Observable<String>> twoStreams = Observable.parallelMerge(fourStreams, 2);
+        Observable<Observable<String>> threeStreams = Observable.parallelMerge(fourStreams, 3);
 
         List<? super Observable<String>> fourList = fourStreams.toList().toBlockingObservable().last();
         List<? super Observable<String>> threeList = threeStreams.toList().toBlockingObservable().last();
@@ -62,7 +62,7 @@ public void testNumberOfThreads() {
         final ConcurrentHashMap<Long, Long> threads = new ConcurrentHashMap<Long, Long>();
         // parallelMerge into 3 streams and observeOn for each
         // we expect 3 threads in the output
-        OperationParallelMerge.parallelMerge(getStreams(), 3)
+        Observable.parallelMerge(getStreams(), 3)
                 .flatMap(new Func1<Observable<String>, Observable<String>>() {
 
                     @Override
@@ -89,7 +89,7 @@ public void testNumberOfThreadsOnScheduledMerge() {
 
         // now we parallelMerge into 3 streams and observeOn for each
         // we expect 3 threads in the output
-        Observable.merge(OperationParallelMerge.parallelMerge(getStreams(), 3, Schedulers.newThread()))
+        Observable.merge(Observable.parallelMerge(getStreams(), 3, Schedulers.newThread()))
                 .toBlockingObservable().forEach(new Action1<String>() {
 
                     @Override