Skip to content

Commit 1e2a725

Browse files
Private toObservable renamed to asObservable
- Making room for the public toObservable method.
1 parent e4000b3 commit 1e2a725

File tree

1 file changed

+28
-28
lines changed

1 file changed

+28
-28
lines changed

src/main/java/rx/Single.java

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ public static interface Transformer<T, R> extends Func1<Single<T>, Single<R>> {
244244
*
245245
* @warn more complete description needed
246246
*/
247-
private static <T> Observable<T> toObservable(Single<T> t) {
247+
private static <T> Observable<T> asObservable(Single<T> t) {
248248
// is this sufficient, or do I need to keep the outer Single and subscribe to it?
249249
return Observable.create(t.onSubscribe);
250250
}
@@ -265,7 +265,7 @@ private static <T> Observable<T> toObservable(Single<T> t) {
265265
* @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
266266
*/
267267
private final Single<Observable<T>> nest() {
268-
return Single.just(toObservable(this));
268+
return Single.just(asObservable(this));
269269
}
270270

271271
/* *********************************************************************************************************
@@ -290,7 +290,7 @@ private final Single<Observable<T>> nest() {
290290
* @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
291291
*/
292292
public final static <T> Observable<T> concat(Single<? extends T> t1, Single<? extends T> t2) {
293-
return Observable.concat(toObservable(t1), toObservable(t2));
293+
return Observable.concat(asObservable(t1), asObservable(t2));
294294
}
295295

296296
/**
@@ -312,7 +312,7 @@ public final static <T> Observable<T> concat(Single<? extends T> t1, Single<? ex
312312
* @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
313313
*/
314314
public final static <T> Observable<T> concat(Single<? extends T> t1, Single<? extends T> t2, Single<? extends T> t3) {
315-
return Observable.concat(toObservable(t1), toObservable(t2), toObservable(t3));
315+
return Observable.concat(asObservable(t1), asObservable(t2), asObservable(t3));
316316
}
317317

318318
/**
@@ -336,7 +336,7 @@ public final static <T> Observable<T> concat(Single<? extends T> t1, Single<? ex
336336
* @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
337337
*/
338338
public final static <T> Observable<T> concat(Single<? extends T> t1, Single<? extends T> t2, Single<? extends T> t3, Single<? extends T> t4) {
339-
return Observable.concat(toObservable(t1), toObservable(t2), toObservable(t3), toObservable(t4));
339+
return Observable.concat(asObservable(t1), asObservable(t2), asObservable(t3), asObservable(t4));
340340
}
341341

342342
/**
@@ -362,7 +362,7 @@ public final static <T> Observable<T> concat(Single<? extends T> t1, Single<? ex
362362
* @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
363363
*/
364364
public final static <T> Observable<T> concat(Single<? extends T> t1, Single<? extends T> t2, Single<? extends T> t3, Single<? extends T> t4, Single<? extends T> t5) {
365-
return Observable.concat(toObservable(t1), toObservable(t2), toObservable(t3), toObservable(t4), toObservable(t5));
365+
return Observable.concat(asObservable(t1), asObservable(t2), asObservable(t3), asObservable(t4), asObservable(t5));
366366
}
367367

368368
/**
@@ -390,7 +390,7 @@ public final static <T> Observable<T> concat(Single<? extends T> t1, Single<? ex
390390
* @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
391391
*/
392392
public final static <T> Observable<T> concat(Single<? extends T> t1, Single<? extends T> t2, Single<? extends T> t3, Single<? extends T> t4, Single<? extends T> t5, Single<? extends T> t6) {
393-
return Observable.concat(toObservable(t1), toObservable(t2), toObservable(t3), toObservable(t4), toObservable(t5), toObservable(t6));
393+
return Observable.concat(asObservable(t1), asObservable(t2), asObservable(t3), asObservable(t4), asObservable(t5), asObservable(t6));
394394
}
395395

396396
/**
@@ -420,7 +420,7 @@ public final static <T> Observable<T> concat(Single<? extends T> t1, Single<? ex
420420
* @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
421421
*/
422422
public final static <T> Observable<T> concat(Single<? extends T> t1, Single<? extends T> t2, Single<? extends T> t3, Single<? extends T> t4, Single<? extends T> t5, Single<? extends T> t6, Single<? extends T> t7) {
423-
return Observable.concat(toObservable(t1), toObservable(t2), toObservable(t3), toObservable(t4), toObservable(t5), toObservable(t6), toObservable(t7));
423+
return Observable.concat(asObservable(t1), asObservable(t2), asObservable(t3), asObservable(t4), asObservable(t5), asObservable(t6), asObservable(t7));
424424
}
425425

426426
/**
@@ -452,7 +452,7 @@ public final static <T> Observable<T> concat(Single<? extends T> t1, Single<? ex
452452
* @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
453453
*/
454454
public final static <T> Observable<T> concat(Single<? extends T> t1, Single<? extends T> t2, Single<? extends T> t3, Single<? extends T> t4, Single<? extends T> t5, Single<? extends T> t6, Single<? extends T> t7, Single<? extends T> t8) {
455-
return Observable.concat(toObservable(t1), toObservable(t2), toObservable(t3), toObservable(t4), toObservable(t5), toObservable(t6), toObservable(t7), toObservable(t8));
455+
return Observable.concat(asObservable(t1), asObservable(t2), asObservable(t3), asObservable(t4), asObservable(t5), asObservable(t6), asObservable(t7), asObservable(t8));
456456
}
457457

458458
/**
@@ -486,7 +486,7 @@ public final static <T> Observable<T> concat(Single<? extends T> t1, Single<? ex
486486
* @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
487487
*/
488488
public final static <T> Observable<T> concat(Single<? extends T> t1, Single<? extends T> t2, Single<? extends T> t3, Single<? extends T> t4, Single<? extends T> t5, Single<? extends T> t6, Single<? extends T> t7, Single<? extends T> t8, Single<? extends T> t9) {
489-
return Observable.concat(toObservable(t1), toObservable(t2), toObservable(t3), toObservable(t4), toObservable(t5), toObservable(t6), toObservable(t7), toObservable(t8), toObservable(t9));
489+
return Observable.concat(asObservable(t1), asObservable(t2), asObservable(t3), asObservable(t4), asObservable(t5), asObservable(t6), asObservable(t7), asObservable(t8), asObservable(t9));
490490
}
491491

492492
/**
@@ -694,7 +694,7 @@ public void onError(Throwable error) {
694694
* @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
695695
*/
696696
public final static <T> Observable<T> merge(Single<? extends T> t1, Single<? extends T> t2) {
697-
return Observable.merge(toObservable(t1), toObservable(t2));
697+
return Observable.merge(asObservable(t1), asObservable(t2));
698698
}
699699

700700
/**
@@ -719,7 +719,7 @@ public final static <T> Observable<T> merge(Single<? extends T> t1, Single<? ext
719719
* @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
720720
*/
721721
public final static <T> Observable<T> merge(Single<? extends T> t1, Single<? extends T> t2, Single<? extends T> t3) {
722-
return Observable.merge(toObservable(t1), toObservable(t2), toObservable(t3));
722+
return Observable.merge(asObservable(t1), asObservable(t2), asObservable(t3));
723723
}
724724

725725
/**
@@ -746,7 +746,7 @@ public final static <T> Observable<T> merge(Single<? extends T> t1, Single<? ext
746746
* @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
747747
*/
748748
public final static <T> Observable<T> merge(Single<? extends T> t1, Single<? extends T> t2, Single<? extends T> t3, Single<? extends T> t4) {
749-
return Observable.merge(toObservable(t1), toObservable(t2), toObservable(t3), toObservable(t4));
749+
return Observable.merge(asObservable(t1), asObservable(t2), asObservable(t3), asObservable(t4));
750750
}
751751

752752
/**
@@ -775,7 +775,7 @@ public final static <T> Observable<T> merge(Single<? extends T> t1, Single<? ext
775775
* @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
776776
*/
777777
public final static <T> Observable<T> merge(Single<? extends T> t1, Single<? extends T> t2, Single<? extends T> t3, Single<? extends T> t4, Single<? extends T> t5) {
778-
return Observable.merge(toObservable(t1), toObservable(t2), toObservable(t3), toObservable(t4), toObservable(t5));
778+
return Observable.merge(asObservable(t1), asObservable(t2), asObservable(t3), asObservable(t4), asObservable(t5));
779779
}
780780

781781
/**
@@ -806,7 +806,7 @@ public final static <T> Observable<T> merge(Single<? extends T> t1, Single<? ext
806806
* @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
807807
*/
808808
public final static <T> Observable<T> merge(Single<? extends T> t1, Single<? extends T> t2, Single<? extends T> t3, Single<? extends T> t4, Single<? extends T> t5, Single<? extends T> t6) {
809-
return Observable.merge(toObservable(t1), toObservable(t2), toObservable(t3), toObservable(t4), toObservable(t5), toObservable(t6));
809+
return Observable.merge(asObservable(t1), asObservable(t2), asObservable(t3), asObservable(t4), asObservable(t5), asObservable(t6));
810810
}
811811

812812
/**
@@ -839,7 +839,7 @@ public final static <T> Observable<T> merge(Single<? extends T> t1, Single<? ext
839839
* @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
840840
*/
841841
public final static <T> Observable<T> merge(Single<? extends T> t1, Single<? extends T> t2, Single<? extends T> t3, Single<? extends T> t4, Single<? extends T> t5, Single<? extends T> t6, Single<? extends T> t7) {
842-
return Observable.merge(toObservable(t1), toObservable(t2), toObservable(t3), toObservable(t4), toObservable(t5), toObservable(t6), toObservable(t7));
842+
return Observable.merge(asObservable(t1), asObservable(t2), asObservable(t3), asObservable(t4), asObservable(t5), asObservable(t6), asObservable(t7));
843843
}
844844

845845
/**
@@ -874,7 +874,7 @@ public final static <T> Observable<T> merge(Single<? extends T> t1, Single<? ext
874874
* @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
875875
*/
876876
public final static <T> Observable<T> merge(Single<? extends T> t1, Single<? extends T> t2, Single<? extends T> t3, Single<? extends T> t4, Single<? extends T> t5, Single<? extends T> t6, Single<? extends T> t7, Single<? extends T> t8) {
877-
return Observable.merge(toObservable(t1), toObservable(t2), toObservable(t3), toObservable(t4), toObservable(t5), toObservable(t6), toObservable(t7), toObservable(t8));
877+
return Observable.merge(asObservable(t1), asObservable(t2), asObservable(t3), asObservable(t4), asObservable(t5), asObservable(t6), asObservable(t7), asObservable(t8));
878878
}
879879

880880
/**
@@ -911,7 +911,7 @@ public final static <T> Observable<T> merge(Single<? extends T> t1, Single<? ext
911911
* @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
912912
*/
913913
public final static <T> Observable<T> merge(Single<? extends T> t1, Single<? extends T> t2, Single<? extends T> t3, Single<? extends T> t4, Single<? extends T> t5, Single<? extends T> t6, Single<? extends T> t7, Single<? extends T> t8, Single<? extends T> t9) {
914-
return Observable.merge(toObservable(t1), toObservable(t2), toObservable(t3), toObservable(t4), toObservable(t5), toObservable(t6), toObservable(t7), toObservable(t8), toObservable(t9));
914+
return Observable.merge(asObservable(t1), asObservable(t2), asObservable(t3), asObservable(t4), asObservable(t5), asObservable(t6), asObservable(t7), asObservable(t8), asObservable(t9));
915915
}
916916

917917
/**
@@ -935,7 +935,7 @@ public final static <T> Observable<T> merge(Single<? extends T> t1, Single<? ext
935935
* @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
936936
*/
937937
public final static <T1, T2, R> Single<R> zip(Single<? extends T1> o1, Single<? extends T2> o2, final Func2<? super T1, ? super T2, ? extends R> zipFunction) {
938-
return just(new Observable<?>[] { toObservable(o1), toObservable(o2) }).lift(new OperatorZip<R>(zipFunction));
938+
return just(new Observable<?>[] { asObservable(o1), asObservable(o2) }).lift(new OperatorZip<R>(zipFunction));
939939
}
940940

941941
/**
@@ -961,7 +961,7 @@ public final static <T1, T2, R> Single<R> zip(Single<? extends T1> o1, Single<?
961961
* @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
962962
*/
963963
public final static <T1, T2, T3, R> Single<R> zip(Single<? extends T1> o1, Single<? extends T2> o2, Single<? extends T3> o3, Func3<? super T1, ? super T2, ? super T3, ? extends R> zipFunction) {
964-
return just(new Observable<?>[] { toObservable(o1), toObservable(o2), toObservable(o3) }).lift(new OperatorZip<R>(zipFunction));
964+
return just(new Observable<?>[] { asObservable(o1), asObservable(o2), asObservable(o3) }).lift(new OperatorZip<R>(zipFunction));
965965
}
966966

967967
/**
@@ -989,7 +989,7 @@ public final static <T1, T2, T3, R> Single<R> zip(Single<? extends T1> o1, Singl
989989
* @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
990990
*/
991991
public final static <T1, T2, T3, T4, R> Single<R> zip(Single<? extends T1> o1, Single<? extends T2> o2, Single<? extends T3> o3, Single<? extends T4> o4, Func4<? super T1, ? super T2, ? super T3, ? super T4, ? extends R> zipFunction) {
992-
return just(new Observable<?>[] { toObservable(o1), toObservable(o2), toObservable(o3), toObservable(o4) }).lift(new OperatorZip<R>(zipFunction));
992+
return just(new Observable<?>[] { asObservable(o1), asObservable(o2), asObservable(o3), asObservable(o4) }).lift(new OperatorZip<R>(zipFunction));
993993
}
994994

995995
/**
@@ -1019,7 +1019,7 @@ public final static <T1, T2, T3, T4, R> Single<R> zip(Single<? extends T1> o1, S
10191019
* @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
10201020
*/
10211021
public final static <T1, T2, T3, T4, T5, R> Single<R> zip(Single<? extends T1> o1, Single<? extends T2> o2, Single<? extends T3> o3, Single<? extends T4> o4, Single<? extends T5> o5, Func5<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? extends R> zipFunction) {
1022-
return just(new Observable<?>[] { toObservable(o1), toObservable(o2), toObservable(o3), toObservable(o4), toObservable(o5) }).lift(new OperatorZip<R>(zipFunction));
1022+
return just(new Observable<?>[] { asObservable(o1), asObservable(o2), asObservable(o3), asObservable(o4), asObservable(o5) }).lift(new OperatorZip<R>(zipFunction));
10231023
}
10241024

10251025
/**
@@ -1052,7 +1052,7 @@ public final static <T1, T2, T3, T4, T5, R> Single<R> zip(Single<? extends T1> o
10521052
*/
10531053
public final static <T1, T2, T3, T4, T5, T6, R> Single<R> zip(Single<? extends T1> o1, Single<? extends T2> o2, Single<? extends T3> o3, Single<? extends T4> o4, Single<? extends T5> o5, Single<? extends T6> o6,
10541054
Func6<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? extends R> zipFunction) {
1055-
return just(new Observable<?>[] { toObservable(o1), toObservable(o2), toObservable(o3), toObservable(o4), toObservable(o5), toObservable(o6) }).lift(new OperatorZip<R>(zipFunction));
1055+
return just(new Observable<?>[] { asObservable(o1), asObservable(o2), asObservable(o3), asObservable(o4), asObservable(o5), asObservable(o6) }).lift(new OperatorZip<R>(zipFunction));
10561056
}
10571057

10581058
/**
@@ -1087,7 +1087,7 @@ public final static <T1, T2, T3, T4, T5, T6, R> Single<R> zip(Single<? extends T
10871087
*/
10881088
public final static <T1, T2, T3, T4, T5, T6, T7, R> Single<R> zip(Single<? extends T1> o1, Single<? extends T2> o2, Single<? extends T3> o3, Single<? extends T4> o4, Single<? extends T5> o5, Single<? extends T6> o6, Single<? extends T7> o7,
10891089
Func7<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? extends R> zipFunction) {
1090-
return just(new Observable<?>[] { toObservable(o1), toObservable(o2), toObservable(o3), toObservable(o4), toObservable(o5), toObservable(o6), toObservable(o7) }).lift(new OperatorZip<R>(zipFunction));
1090+
return just(new Observable<?>[] { asObservable(o1), asObservable(o2), asObservable(o3), asObservable(o4), asObservable(o5), asObservable(o6), asObservable(o7) }).lift(new OperatorZip<R>(zipFunction));
10911091
}
10921092

10931093
/**
@@ -1124,7 +1124,7 @@ public final static <T1, T2, T3, T4, T5, T6, T7, R> Single<R> zip(Single<? exten
11241124
*/
11251125
public final static <T1, T2, T3, T4, T5, T6, T7, T8, R> Single<R> zip(Single<? extends T1> o1, Single<? extends T2> o2, Single<? extends T3> o3, Single<? extends T4> o4, Single<? extends T5> o5, Single<? extends T6> o6, Single<? extends T7> o7, Single<? extends T8> o8,
11261126
Func8<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? extends R> zipFunction) {
1127-
return just(new Observable<?>[] { toObservable(o1), toObservable(o2), toObservable(o3), toObservable(o4), toObservable(o5), toObservable(o6), toObservable(o7), toObservable(o8) }).lift(new OperatorZip<R>(zipFunction));
1127+
return just(new Observable<?>[] { asObservable(o1), asObservable(o2), asObservable(o3), asObservable(o4), asObservable(o5), asObservable(o6), asObservable(o7), asObservable(o8) }).lift(new OperatorZip<R>(zipFunction));
11281128
}
11291129

11301130
/**
@@ -1163,7 +1163,7 @@ public final static <T1, T2, T3, T4, T5, T6, T7, T8, R> Single<R> zip(Single<? e
11631163
*/
11641164
public final static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Single<R> zip(Single<? extends T1> o1, Single<? extends T2> o2, Single<? extends T3> o3, Single<? extends T4> o4, Single<? extends T5> o5, Single<? extends T6> o6, Single<? extends T7> o7, Single<? extends T8> o8,
11651165
Single<? extends T9> o9, Func9<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? super T9, ? extends R> zipFunction) {
1166-
return just(new Observable<?>[] { toObservable(o1), toObservable(o2), toObservable(o3), toObservable(o4), toObservable(o5), toObservable(o6), toObservable(o7), toObservable(o8), toObservable(o9) }).lift(new OperatorZip<R>(zipFunction));
1166+
return just(new Observable<?>[] { asObservable(o1), asObservable(o2), asObservable(o3), asObservable(o4), asObservable(o5), asObservable(o6), asObservable(o7), asObservable(o8), asObservable(o9) }).lift(new OperatorZip<R>(zipFunction));
11671167
}
11681168

11691169
/**
@@ -1222,7 +1222,7 @@ public final <R> Single<R> flatMap(final Func1<? super T, ? extends Single<? ext
12221222
* @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
12231223
*/
12241224
public final <R> Observable<R> flatMapObservable(Func1<? super T, ? extends Observable<? extends R>> func) {
1225-
return Observable.merge(toObservable(map(func)));
1225+
return Observable.merge(asObservable(map(func)));
12261226
}
12271227

12281228
/**
@@ -1748,7 +1748,7 @@ public final Single<T> timeout(long timeout, TimeUnit timeUnit, Single<? extends
17481748
if (other == null) {
17491749
other = Single.<T> error(new TimeoutException());
17501750
}
1751-
return lift(new OperatorTimeout<T>(timeout, timeUnit, toObservable(other), scheduler));
1751+
return lift(new OperatorTimeout<T>(timeout, timeUnit, asObservable(other), scheduler));
17521752
}
17531753

17541754
/**

0 commit comments

Comments
 (0)