@@ -244,7 +244,7 @@ public static interface Transformer<T, R> extends Func1<Single<T>, Single<R>> {
244
244
*
245
245
* @warn more complete description needed
246
246
*/
247
- private static <T > Observable <T > toObservable (Single <T > t ) {
247
+ private static <T > Observable <T > asObservable (Single <T > t ) {
248
248
// is this sufficient, or do I need to keep the outer Single and subscribe to it?
249
249
return Observable .create (t .onSubscribe );
250
250
}
@@ -265,7 +265,7 @@ private static <T> Observable<T> toObservable(Single<T> t) {
265
265
* @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
266
266
*/
267
267
private final Single <Observable <T >> nest () {
268
- return Single .just (toObservable (this ));
268
+ return Single .just (asObservable (this ));
269
269
}
270
270
271
271
/* *********************************************************************************************************
@@ -290,7 +290,7 @@ private final Single<Observable<T>> nest() {
290
290
* @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
291
291
*/
292
292
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 ));
294
294
}
295
295
296
296
/**
@@ -312,7 +312,7 @@ public final static <T> Observable<T> concat(Single<? extends T> t1, Single<? ex
312
312
* @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
313
313
*/
314
314
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 ));
316
316
}
317
317
318
318
/**
@@ -336,7 +336,7 @@ public final static <T> Observable<T> concat(Single<? extends T> t1, Single<? ex
336
336
* @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
337
337
*/
338
338
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 ));
340
340
}
341
341
342
342
/**
@@ -362,7 +362,7 @@ public final static <T> Observable<T> concat(Single<? extends T> t1, Single<? ex
362
362
* @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
363
363
*/
364
364
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 ));
366
366
}
367
367
368
368
/**
@@ -390,7 +390,7 @@ public final static <T> Observable<T> concat(Single<? extends T> t1, Single<? ex
390
390
* @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
391
391
*/
392
392
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 ));
394
394
}
395
395
396
396
/**
@@ -420,7 +420,7 @@ public final static <T> Observable<T> concat(Single<? extends T> t1, Single<? ex
420
420
* @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
421
421
*/
422
422
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 ));
424
424
}
425
425
426
426
/**
@@ -452,7 +452,7 @@ public final static <T> Observable<T> concat(Single<? extends T> t1, Single<? ex
452
452
* @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
453
453
*/
454
454
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 ));
456
456
}
457
457
458
458
/**
@@ -486,7 +486,7 @@ public final static <T> Observable<T> concat(Single<? extends T> t1, Single<? ex
486
486
* @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
487
487
*/
488
488
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 ));
490
490
}
491
491
492
492
/**
@@ -694,7 +694,7 @@ public void onError(Throwable error) {
694
694
* @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
695
695
*/
696
696
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 ));
698
698
}
699
699
700
700
/**
@@ -719,7 +719,7 @@ public final static <T> Observable<T> merge(Single<? extends T> t1, Single<? ext
719
719
* @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
720
720
*/
721
721
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 ));
723
723
}
724
724
725
725
/**
@@ -746,7 +746,7 @@ public final static <T> Observable<T> merge(Single<? extends T> t1, Single<? ext
746
746
* @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
747
747
*/
748
748
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 ));
750
750
}
751
751
752
752
/**
@@ -775,7 +775,7 @@ public final static <T> Observable<T> merge(Single<? extends T> t1, Single<? ext
775
775
* @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
776
776
*/
777
777
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 ));
779
779
}
780
780
781
781
/**
@@ -806,7 +806,7 @@ public final static <T> Observable<T> merge(Single<? extends T> t1, Single<? ext
806
806
* @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
807
807
*/
808
808
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 ));
810
810
}
811
811
812
812
/**
@@ -839,7 +839,7 @@ public final static <T> Observable<T> merge(Single<? extends T> t1, Single<? ext
839
839
* @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
840
840
*/
841
841
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 ));
843
843
}
844
844
845
845
/**
@@ -874,7 +874,7 @@ public final static <T> Observable<T> merge(Single<? extends T> t1, Single<? ext
874
874
* @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
875
875
*/
876
876
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 ));
878
878
}
879
879
880
880
/**
@@ -911,7 +911,7 @@ public final static <T> Observable<T> merge(Single<? extends T> t1, Single<? ext
911
911
* @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
912
912
*/
913
913
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 ));
915
915
}
916
916
917
917
/**
@@ -935,7 +935,7 @@ public final static <T> Observable<T> merge(Single<? extends T> t1, Single<? ext
935
935
* @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
936
936
*/
937
937
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 ));
939
939
}
940
940
941
941
/**
@@ -961,7 +961,7 @@ public final static <T1, T2, R> Single<R> zip(Single<? extends T1> o1, Single<?
961
961
* @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
962
962
*/
963
963
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 ));
965
965
}
966
966
967
967
/**
@@ -989,7 +989,7 @@ public final static <T1, T2, T3, R> Single<R> zip(Single<? extends T1> o1, Singl
989
989
* @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
990
990
*/
991
991
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 ));
993
993
}
994
994
995
995
/**
@@ -1019,7 +1019,7 @@ public final static <T1, T2, T3, T4, R> Single<R> zip(Single<? extends T1> o1, S
1019
1019
* @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
1020
1020
*/
1021
1021
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 ));
1023
1023
}
1024
1024
1025
1025
/**
@@ -1052,7 +1052,7 @@ public final static <T1, T2, T3, T4, T5, R> Single<R> zip(Single<? extends T1> o
1052
1052
*/
1053
1053
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 ,
1054
1054
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 ));
1056
1056
}
1057
1057
1058
1058
/**
@@ -1087,7 +1087,7 @@ public final static <T1, T2, T3, T4, T5, T6, R> Single<R> zip(Single<? extends T
1087
1087
*/
1088
1088
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 ,
1089
1089
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 ));
1091
1091
}
1092
1092
1093
1093
/**
@@ -1124,7 +1124,7 @@ public final static <T1, T2, T3, T4, T5, T6, T7, R> Single<R> zip(Single<? exten
1124
1124
*/
1125
1125
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 ,
1126
1126
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 ));
1128
1128
}
1129
1129
1130
1130
/**
@@ -1163,7 +1163,7 @@ public final static <T1, T2, T3, T4, T5, T6, T7, T8, R> Single<R> zip(Single<? e
1163
1163
*/
1164
1164
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 ,
1165
1165
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 ));
1167
1167
}
1168
1168
1169
1169
/**
@@ -1222,7 +1222,7 @@ public final <R> Single<R> flatMap(final Func1<? super T, ? extends Single<? ext
1222
1222
* @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
1223
1223
*/
1224
1224
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 )));
1226
1226
}
1227
1227
1228
1228
/**
@@ -1748,7 +1748,7 @@ public final Single<T> timeout(long timeout, TimeUnit timeUnit, Single<? extends
1748
1748
if (other == null ) {
1749
1749
other = Single .<T > error (new TimeoutException ());
1750
1750
}
1751
- return lift (new OperatorTimeout <T >(timeout , timeUnit , toObservable (other ), scheduler ));
1751
+ return lift (new OperatorTimeout <T >(timeout , timeUnit , asObservable (other ), scheduler ));
1752
1752
}
1753
1753
1754
1754
/**
0 commit comments