Merge branch 'OperatorMergeMap' 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

@@ -50,7 +50,6 @@
 import rx.operators.OnSubscribeRange;
 import rx.operators.OperationDebounce;
 import rx.operators.OperationDelay;
-import rx.operators.OperationFlatMap;
 import rx.operators.OperationGroupByUntil;
 import rx.operators.OperationGroupJoin;
 import rx.operators.OperationInterval;
@@ -105,6 +104,8 @@
 import rx.operators.OperatorMap;
 import rx.operators.OperatorMaterialize;
 import rx.operators.OperatorMerge;
+import rx.operators.OperatorMergeMapPair;
+import rx.operators.OperatorMergeMapTransform;
 import rx.operators.OperatorObserveOn;
 import rx.operators.OperatorOnErrorFlatMap;
 import rx.operators.OperatorOnErrorResumeNextViaFunction;
@@ -4341,7 +4342,7 @@ public final <R> Observable<R> mergeMap(
             Func1<? super T, ? extends Observable<? extends R>> onNext,
             Func1<? super Throwable, ? extends Observable<? extends R>> onError,
             Func0<? extends Observable<? extends R>> onCompleted) {
-        return create(OperationFlatMap.flatMap(this, onNext, onError, onCompleted));
+        return lift(new OperatorMergeMapTransform<T, R>(onNext, onError, onCompleted));
     }
 
     /**
@@ -4364,7 +4365,7 @@ public final <R> Observable<R> mergeMap(
      */
     public final <U, R> Observable<R> mergeMap(Func1<? super T, ? extends Observable<? extends U>> collectionSelector,
             Func2<? super T, ? super U, ? extends R> resultSelector) {
-        return create(OperationFlatMap.flatMap(this, collectionSelector, resultSelector));
+        return lift(new OperatorMergeMapPair<T, U, R>(collectionSelector, resultSelector));
     }
 
     /**
@@ -4382,7 +4383,7 @@ public final <U, R> Observable<R> mergeMap(Func1<? super T, ? extends Observable
      *         the values in the Iterables corresponding to those items, as generated by {@code collectionSelector}
      */
     public final <R> Observable<R> mergeMapIterable(Func1<? super T, ? extends Iterable<? extends R>> collectionSelector) {
-        return merge(map(OperationFlatMap.flatMapIterableFunc(collectionSelector)));
+        return merge(map(OperatorMergeMapPair.convertSelector(collectionSelector)));
     }
 
     /**
@@ -4406,7 +4407,7 @@ public final <R> Observable<R> mergeMapIterable(Func1<? super T, ? extends Itera
      */
     public final <U, R> Observable<R> mergeMapIterable(Func1<? super T, ? extends Iterable<? extends U>> collectionSelector,
             Func2<? super T, ? super U, ? extends R> resultSelector) {
-        return mergeMap(OperationFlatMap.flatMapIterableFunc(collectionSelector), resultSelector);
+        return mergeMap(OperatorMergeMapPair.convertSelector(collectionSelector), resultSelector);
     }
 
     /**