Skip to content

Commit 3c86972

Browse files
akarnokdakarnokd
committed
1.x: javac 9 compatibility fixes
1 parent 4dad04a commit 3c86972

18 files changed

+63
-60
lines changed

‎src/main/java/rx/Observable.java‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,7 @@ public static <T> Observable<T> amb(Observable<? extends T> o1, Observable<? ext
609609
*/
610610
@SuppressWarnings("unchecked")
611611
public static <T1, T2, R> Observable<R> combineLatest(Observable<? extends T1> o1, Observable<? extends T2> o2, Func2<? super T1, ? super T2, ? extends R> combineFunction) {
612-
return combineLatest(Arrays.asList(o1, o2), Functions.fromFunc(combineFunction));
612+
return (Observable<R>)combineLatest(Arrays.asList(o1, o2), Functions.fromFunc(combineFunction));
613613
}
614614

615615
/**
@@ -637,7 +637,7 @@ public static <T1, T2, R> Observable<R> combineLatest(Observable<? extends T1> o
637637
*/
638638
@SuppressWarnings("unchecked")
639639
public static <T1, T2, T3, R> Observable<R> combineLatest(Observable<? extends T1> o1, Observable<? extends T2> o2, Observable<? extends T3> o3, Func3<? super T1, ? super T2, ? super T3, ? extends R> combineFunction) {
640-
return combineLatest(Arrays.asList(o1, o2, o3), Functions.fromFunc(combineFunction));
640+
return (Observable<R>)combineLatest(Arrays.asList(o1, o2, o3), Functions.fromFunc(combineFunction));
641641
}
642642

643643
/**
@@ -668,7 +668,7 @@ public static <T1, T2, T3, R> Observable<R> combineLatest(Observable<? extends T
668668
@SuppressWarnings("unchecked")
669669
public static <T1, T2, T3, T4, R> Observable<R> combineLatest(Observable<? extends T1> o1, Observable<? extends T2> o2, Observable<? extends T3> o3, Observable<? extends T4> o4,
670670
Func4<? super T1, ? super T2, ? super T3, ? super T4, ? extends R> combineFunction) {
671-
return combineLatest(Arrays.asList(o1, o2, o3, o4), Functions.fromFunc(combineFunction));
671+
return (Observable<R>)combineLatest(Arrays.asList(o1, o2, o3, o4), Functions.fromFunc(combineFunction));
672672
}
673673

674674
/**
@@ -701,7 +701,7 @@ public static <T1, T2, T3, T4, R> Observable<R> combineLatest(Observable<? exten
701701
@SuppressWarnings("unchecked")
702702
public static <T1, T2, T3, T4, T5, R> Observable<R> combineLatest(Observable<? extends T1> o1, Observable<? extends T2> o2, Observable<? extends T3> o3, Observable<? extends T4> o4, Observable<? extends T5> o5,
703703
Func5<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? extends R> combineFunction) {
704-
return combineLatest(Arrays.asList(o1, o2, o3, o4, o5), Functions.fromFunc(combineFunction));
704+
return (Observable<R>)combineLatest(Arrays.asList(o1, o2, o3, o4, o5), Functions.fromFunc(combineFunction));
705705
}
706706

707707
/**
@@ -736,7 +736,7 @@ public static <T1, T2, T3, T4, T5, R> Observable<R> combineLatest(Observable<? e
736736
@SuppressWarnings("unchecked")
737737
public static <T1, T2, T3, T4, T5, T6, R> Observable<R> combineLatest(Observable<? extends T1> o1, Observable<? extends T2> o2, Observable<? extends T3> o3, Observable<? extends T4> o4, Observable<? extends T5> o5, Observable<? extends T6> o6,
738738
Func6<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? extends R> combineFunction) {
739-
return combineLatest(Arrays.asList(o1, o2, o3, o4, o5, o6), Functions.fromFunc(combineFunction));
739+
return (Observable<R>)combineLatest(Arrays.asList(o1, o2, o3, o4, o5, o6), Functions.fromFunc(combineFunction));
740740
}
741741

742742
/**
@@ -773,7 +773,7 @@ public static <T1, T2, T3, T4, T5, T6, R> Observable<R> combineLatest(Observable
773773
@SuppressWarnings("unchecked")
774774
public static <T1, T2, T3, T4, T5, T6, T7, R> Observable<R> combineLatest(Observable<? extends T1> o1, Observable<? extends T2> o2, Observable<? extends T3> o3, Observable<? extends T4> o4, Observable<? extends T5> o5, Observable<? extends T6> o6, Observable<? extends T7> o7,
775775
Func7<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? extends R> combineFunction) {
776-
return combineLatest(Arrays.asList(o1, o2, o3, o4, o5, o6, o7), Functions.fromFunc(combineFunction));
776+
return (Observable<R>)combineLatest(Arrays.asList(o1, o2, o3, o4, o5, o6, o7), Functions.fromFunc(combineFunction));
777777
}
778778

779779
/**
@@ -812,7 +812,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Observable<R> combineLatest(Observ
812812
@SuppressWarnings("unchecked")
813813
public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Observable<R> combineLatest(Observable<? extends T1> o1, Observable<? extends T2> o2, Observable<? extends T3> o3, Observable<? extends T4> o4, Observable<? extends T5> o5, Observable<? extends T6> o6, Observable<? extends T7> o7, Observable<? extends T8> o8,
814814
Func8<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? extends R> combineFunction) {
815-
return combineLatest(Arrays.asList(o1, o2, o3, o4, o5, o6, o7, o8), Functions.fromFunc(combineFunction));
815+
return (Observable<R>)combineLatest(Arrays.asList(o1, o2, o3, o4, o5, o6, o7, o8), Functions.fromFunc(combineFunction));
816816
}
817817

818818
/**
@@ -854,7 +854,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Observable<R> combineLatest(Ob
854854
public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Observable<R> combineLatest(Observable<? extends T1> o1, Observable<? extends T2> o2, Observable<? extends T3> o3, Observable<? extends T4> o4, Observable<? extends T5> o5, Observable<? extends T6> o6, Observable<? extends T7> o7, Observable<? extends T8> o8,
855855
Observable<? extends T9> o9,
856856
Func9<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? super T9, ? extends R> combineFunction) {
857-
return combineLatest(Arrays.asList(o1, o2, o3, o4, o5, o6, o7, o8, o9), Functions.fromFunc(combineFunction));
857+
return (Observable<R>)combineLatest(Arrays.asList(o1, o2, o3, o4, o5, o6, o7, o8, o9), Functions.fromFunc(combineFunction));
858858
}
859859
/**
860860
* Combines a list of source Observables by emitting an item that aggregates the latest values of each of
@@ -1330,7 +1330,7 @@ public static <T> Observable<T> error(Throwable exception) {
13301330
* @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
13311331
*/
13321332
public static <T> Observable<T> from(Future<? extends T> future) {
1333-
return create(OnSubscribeToObservableFuture.toObservableFuture(future));
1333+
return (Observable<T>)create(OnSubscribeToObservableFuture.toObservableFuture(future));
13341334
}
13351335

13361336
/**
@@ -1361,7 +1361,7 @@ public static <T> Observable<T> from(Future<? extends T> future) {
13611361
* @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
13621362
*/
13631363
public static <T> Observable<T> from(Future<? extends T> future, long timeout, TimeUnit unit) {
1364-
return create(OnSubscribeToObservableFuture.toObservableFuture(future, timeout, unit));
1364+
return (Observable<T>)create(OnSubscribeToObservableFuture.toObservableFuture(future, timeout, unit));
13651365
}
13661366

13671367
/**
@@ -1390,7 +1390,8 @@ public static <T> Observable<T> from(Future<? extends T> future, long timeout, T
13901390
*/
13911391
public static <T> Observable<T> from(Future<? extends T> future, Scheduler scheduler) {
13921392
// TODO in a future revision the Scheduler will become important because we'll start polling instead of blocking on the Future
1393-
return create(OnSubscribeToObservableFuture.toObservableFuture(future)).subscribeOn(scheduler);
1393+
Observable<T> o = (Observable<T>)create(OnSubscribeToObservableFuture.toObservableFuture(future));
1394+
return o.subscribeOn(scheduler);
13941395
}
13951396

13961397
/**
@@ -5834,7 +5835,7 @@ public final <R> Observable<R> flatMapIterable(Func1<? super T, ? extends Iterab
58345835
*/
58355836
public final <U, R> Observable<R> flatMapIterable(Func1<? super T, ? extends Iterable<? extends U>> collectionSelector,
58365837
Func2<? super T, ? super U, ? extends R> resultSelector) {
5837-
return flatMap(OperatorMapPair.convertSelector(collectionSelector), resultSelector);
5838+
return (Observable<R>)flatMap(OperatorMapPair.convertSelector(collectionSelector), resultSelector);
58385839
}
58395840

58405841
/**
@@ -5870,7 +5871,7 @@ public final <U, R> Observable<R> flatMapIterable(Func1<? super T, ? extends Ite
58705871
@Beta
58715872
public final <U, R> Observable<R> flatMapIterable(Func1<? super T, ? extends Iterable<? extends U>> collectionSelector,
58725873
Func2<? super T, ? super U, ? extends R> resultSelector, int maxConcurrent) {
5873-
return flatMap(OperatorMapPair.convertSelector(collectionSelector), resultSelector, maxConcurrent);
5874+
return (Observable<R>)flatMap(OperatorMapPair.convertSelector(collectionSelector), resultSelector, maxConcurrent);
58745875
}
58755876

58765877
/**
@@ -6655,7 +6656,7 @@ public final Observable<T> onErrorResumeNext(final Func1<Throwable, ? extends Ob
66556656
* @see <a href="http://reactivex.io/documentation/operators/catch.html">ReactiveX operators documentation: Catch</a>
66566657
*/
66576658
public final Observable<T> onErrorResumeNext(final Observable<? extends T> resumeSequence) {
6658-
return lift(OperatorOnErrorResumeNextViaFunction.withOther(resumeSequence));
6659+
return lift((Operator<T, T>)OperatorOnErrorResumeNextViaFunction.withOther(resumeSequence));
66596660
}
66606661

66616662
/**
@@ -6685,7 +6686,7 @@ public final Observable<T> onErrorResumeNext(final Observable<? extends T> resum
66856686
* @see <a href="http://reactivex.io/documentation/operators/catch.html">ReactiveX operators documentation: Catch</a>
66866687
*/
66876688
public final Observable<T> onErrorReturn(Func1<Throwable, ? extends T> resumeFunction) {
6688-
return lift(OperatorOnErrorResumeNextViaFunction.withSingle(resumeFunction));
6689+
return lift((Operator<T, T>)OperatorOnErrorResumeNextViaFunction.withSingle(resumeFunction));
66896690
}
66906691

66916692
/**
@@ -6721,7 +6722,7 @@ public final Observable<T> onErrorReturn(Func1<Throwable, ? extends T> resumeFun
67216722
* @see <a href="http://reactivex.io/documentation/operators/catch.html">ReactiveX operators documentation: Catch</a>
67226723
*/
67236724
public final Observable<T> onExceptionResumeNext(final Observable<? extends T> resumeSequence) {
6724-
return lift(OperatorOnErrorResumeNextViaFunction.withException(resumeSequence));
6725+
return lift((Operator<T, T>)OperatorOnErrorResumeNextViaFunction.withException(resumeSequence));
67256726
}
67266727

67276728
/**
@@ -10564,7 +10565,7 @@ public final <T2, R> Observable<R> zipWith(Iterable<? extends T2> other, Func2<?
1056410565
* @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
1056510566
*/
1056610567
public final <T2, R> Observable<R> zipWith(Observable<? extends T2> other, Func2<? super T, ? super T2, ? extends R> zipFunction) {
10567-
return zip(this, other, zipFunction);
10568+
return (Observable<R>)zip(this, other, zipFunction);
1056810569
}
1056910570

1057010571
/**

0 commit comments

Comments
 (0)