Skip to content

Commit 14831e6

Browse files
akarnokdakarnokd
committed
Reinforce Function<T, R> return argument type where R is non-trivial
1 parent 3da4f5f commit 14831e6

File tree

8 files changed

+155
-131
lines changed

8 files changed

+155
-131
lines changed

‎src/main/java/io/reactivex/rxjava3/core/Completable.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2483,7 +2483,7 @@ public final Completable repeatUntil(@NonNull BooleanSupplier stop) {
24832483
@CheckReturnValue
24842484
@SchedulerSupport(SchedulerSupport.NONE)
24852485
@NonNull
2486-
public final Completable repeatWhen(@NonNull Function<? super Flowable<Object>, ? extends Publisher<@NonNull ?>> handler) {
2486+
public final Completable repeatWhen(@NonNull Function<? super Flowable<Object>, @NonNull ? extends Publisher<@NonNull ?>> handler) {
24872487
return fromPublisher(toFlowable().repeatWhen(handler));
24882488
}
24892489

@@ -2655,7 +2655,7 @@ public final Completable retryUntil(@NonNull BooleanSupplier stop) {
26552655
@CheckReturnValue
26562656
@SchedulerSupport(SchedulerSupport.NONE)
26572657
@NonNull
2658-
public final Completable retryWhen(@NonNull Function<? super Flowable<Throwable>, ? extends Publisher<@NonNull ?>> handler) {
2658+
public final Completable retryWhen(@NonNull Function<? super Flowable<Throwable>, @NonNull ? extends Publisher<@NonNull ?>> handler) {
26592659
return fromPublisher(toFlowable().retryWhen(handler));
26602660
}
26612661

‎src/main/java/io/reactivex/rxjava3/core/Flowable.java

Lines changed: 70 additions & 70 deletions
Large diffs are not rendered by default.

‎src/main/java/io/reactivex/rxjava3/core/Maybe.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3974,7 +3974,7 @@ public final Maybe<T> filter(@NonNull Predicate<? super T> predicate) {
39743974
@CheckReturnValue
39753975
@NonNull
39763976
@SchedulerSupport(SchedulerSupport.NONE)
3977-
public final <@NonNull U> Flowable<U> flattenAsFlowable(@NonNull Function<? super T, ? extends Iterable<? extends U>> mapper) {
3977+
public final <@NonNull U> Flowable<U> flattenAsFlowable(@NonNull Function<? super T, @NonNull ? extends Iterable<? extends U>> mapper) {
39783978
Objects.requireNonNull(mapper, "mapper is null");
39793979
return RxJavaPlugins.onAssembly(new MaybeFlatMapIterableFlowable<>(this, mapper));
39803980
}
@@ -4001,7 +4001,7 @@ public final Maybe<T> filter(@NonNull Predicate<? super T> predicate) {
40014001
@CheckReturnValue
40024002
@NonNull
40034003
@SchedulerSupport(SchedulerSupport.NONE)
4004-
public final <@NonNull U> Observable<U> flattenAsObservable(@NonNull Function<? super T, ? extends Iterable<? extends U>> mapper) {
4004+
public final <@NonNull U> Observable<U> flattenAsObservable(@NonNull Function<? super T, @NonNull ? extends Iterable<? extends U>> mapper) {
40054005
Objects.requireNonNull(mapper, "mapper is null");
40064006
return RxJavaPlugins.onAssembly(new MaybeFlatMapIterableObservable<>(this, mapper));
40074007
}
@@ -4055,7 +4055,7 @@ public final Maybe<T> filter(@NonNull Predicate<? super T> predicate) {
40554055
@CheckReturnValue
40564056
@NonNull
40574057
@SchedulerSupport(SchedulerSupport.NONE)
4058-
public final <@NonNull R> Flowable<R> flatMapPublisher(@NonNull Function<? super T, ? extends Publisher<? extends R>> mapper) {
4058+
public final <@NonNull R> Flowable<R> flatMapPublisher(@NonNull Function<? super T, @NonNull ? extends Publisher<? extends R>> mapper) {
40594059
Objects.requireNonNull(mapper, "mapper is null");
40604060
return RxJavaPlugins.onAssembly(new MaybeFlatMapPublisher<>(this, mapper));
40614061
}
@@ -4843,7 +4843,7 @@ public final Flowable<T> repeatUntil(@NonNull BooleanSupplier stop) {
48434843
@CheckReturnValue
48444844
@SchedulerSupport(SchedulerSupport.NONE)
48454845
@NonNull
4846-
public final Flowable<T> repeatWhen(@NonNull Function<? super Flowable<Object>, ? extends Publisher<@NonNull ?>> handler) {
4846+
public final Flowable<T> repeatWhen(@NonNull Function<? super Flowable<Object>, @NonNull ? extends Publisher<@NonNull ?>> handler) {
48474847
return toFlowable().repeatWhen(handler);
48484848
}
48494849

@@ -5061,7 +5061,7 @@ public final Maybe<T> retryUntil(@NonNull BooleanSupplier stop) {
50615061
@SchedulerSupport(SchedulerSupport.NONE)
50625062
@NonNull
50635063
public final Maybe<T> retryWhen(
5064-
@NonNull Function<? super Flowable<Throwable>, ? extends Publisher<@NonNull ?>> handler) {
5064+
@NonNull Function<? super Flowable<Throwable>, @NonNull ? extends Publisher<@NonNull ?>> handler) {
50655065
return toFlowable().retryWhen(handler).singleElement();
50665066
}
50675067

@@ -6304,7 +6304,7 @@ public final CompletionStage<T> toCompletionStage(@Nullable T defaultItem) {
63046304
@SchedulerSupport(SchedulerSupport.NONE)
63056305
@BackpressureSupport(BackpressureKind.FULL)
63066306
@NonNull
6307-
public final <@NonNull R> Flowable<R> flattenStreamAsFlowable(@NonNull Function<? super T, ? extends Stream<? extends R>> mapper) {
6307+
public final <@NonNull R> Flowable<R> flattenStreamAsFlowable(@NonNull Function<? super T, @NonNull ? extends Stream<? extends R>> mapper) {
63086308
Objects.requireNonNull(mapper, "mapper is null");
63096309
return RxJavaPlugins.onAssembly(new MaybeFlattenStreamAsFlowable<>(this, mapper));
63106310
}
@@ -6344,7 +6344,7 @@ public final CompletionStage<T> toCompletionStage(@Nullable T defaultItem) {
63446344
@CheckReturnValue
63456345
@SchedulerSupport(SchedulerSupport.NONE)
63466346
@NonNull
6347-
public final <@NonNull R> Observable<R> flattenStreamAsObservable(@NonNull Function<? super T, ? extends Stream<? extends R>> mapper) {
6347+
public final <@NonNull R> Observable<R> flattenStreamAsObservable(@NonNull Function<? super T, @NonNull ? extends Stream<? extends R>> mapper) {
63486348
Objects.requireNonNull(mapper, "mapper is null");
63496349
return RxJavaPlugins.onAssembly(new MaybeFlattenStreamAsObservable<>(this, mapper));
63506350
}

‎src/main/java/io/reactivex/rxjava3/core/Observable.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7318,7 +7318,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
73187318
@CheckReturnValue
73197319
@SchedulerSupport(SchedulerSupport.NONE)
73207320
@NonNull
7321-
public final <@NonNull U> Observable<U> concatMapIterable(@NonNull Function<? super T, ? extends Iterable<? extends U>> mapper) {
7321+
public final <@NonNull U> Observable<U> concatMapIterable(@NonNull Function<? super T, @NonNull ? extends Iterable<? extends U>> mapper) {
73227322
Objects.requireNonNull(mapper, "mapper is null");
73237323
return RxJavaPlugins.onAssembly(new ObservableFlattenIterable<>(this, mapper));
73247324
}
@@ -9488,7 +9488,7 @@ public final Completable flatMapCompletable(@NonNull Function<? super T, ? exten
94889488
@CheckReturnValue
94899489
@SchedulerSupport(SchedulerSupport.NONE)
94909490
@NonNull
9491-
public final <@NonNull U> Observable<U> flatMapIterable(@NonNull Function<? super T, ? extends Iterable<? extends U>> mapper) {
9491+
public final <@NonNull U> Observable<U> flatMapIterable(@NonNull Function<? super T, @NonNull ? extends Iterable<? extends U>> mapper) {
94929492
Objects.requireNonNull(mapper, "mapper is null");
94939493
return RxJavaPlugins.onAssembly(new ObservableFlattenIterable<>(this, mapper));
94949494
}
@@ -9522,7 +9522,7 @@ public final Completable flatMapCompletable(@NonNull Function<? super T, ? exten
95229522
@CheckReturnValue
95239523
@SchedulerSupport(SchedulerSupport.NONE)
95249524
@NonNull
9525-
public final <@NonNull U, @NonNull V> Observable<V> flatMapIterable(@NonNull Function<? super T, ? extends Iterable<? extends U>> mapper,
9525+
public final <@NonNull U, @NonNull V> Observable<V> flatMapIterable(@NonNull Function<? super T, @NonNull ? extends Iterable<? extends U>> mapper,
95269526
@NonNull BiFunction<? super T, ? super U, ? extends V> combiner) {
95279527
Objects.requireNonNull(mapper, "mapper is null");
95289528
Objects.requireNonNull(combiner, "combiner is null");
@@ -17034,7 +17034,7 @@ public final Stream<T> blockingStream(int capacityHint) {
1703417034
@CheckReturnValue
1703517035
@SchedulerSupport(SchedulerSupport.NONE)
1703617036
@NonNull
17037-
public final <@NonNull R> Observable<R> concatMapStream(@NonNull Function<? super T, ? extends Stream<? extends R>> mapper) {
17037+
public final <@NonNull R> Observable<R> concatMapStream(@NonNull Function<? super T, @NonNull ? extends Stream<? extends R>> mapper) {
1703817038
return flatMapStream(mapper);
1703917039
}
1704017040

@@ -17081,7 +17081,7 @@ public final Stream<T> blockingStream(int capacityHint) {
1708117081
@CheckReturnValue
1708217082
@SchedulerSupport(SchedulerSupport.NONE)
1708317083
@NonNull
17084-
public final <@NonNull R> Observable<R> flatMapStream(@NonNull Function<? super T, ? extends Stream<? extends R>> mapper) {
17084+
public final <@NonNull R> Observable<R> flatMapStream(@NonNull Function<? super T, @NonNull ? extends Stream<? extends R>> mapper) {
1708517085
Objects.requireNonNull(mapper, "mapper is null");
1708617086
return RxJavaPlugins.onAssembly(new ObservableFlatMapStream<>(this, mapper));
1708717087
}

‎src/main/java/io/reactivex/rxjava3/core/Single.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3506,7 +3506,7 @@ public final Maybe<T> filter(@NonNull Predicate<? super T> predicate) {
35063506
@CheckReturnValue
35073507
@NonNull
35083508
@SchedulerSupport(SchedulerSupport.NONE)
3509-
public final <@NonNull R> Flowable<R> flatMapPublisher(@NonNull Function<? super T, ? extends Publisher<? extends R>> mapper) {
3509+
public final <@NonNull R> Flowable<R> flatMapPublisher(@NonNull Function<? super T, @NonNull ? extends Publisher<? extends R>> mapper) {
35103510
Objects.requireNonNull(mapper, "mapper is null");
35113511
return RxJavaPlugins.onAssembly(new SingleFlatMapPublisher<>(this, mapper));
35123512
}
@@ -3537,7 +3537,7 @@ public final Maybe<T> filter(@NonNull Predicate<? super T> predicate) {
35373537
@CheckReturnValue
35383538
@NonNull
35393539
@SchedulerSupport(SchedulerSupport.NONE)
3540-
public final <@NonNull U> Flowable<U> flattenAsFlowable(@NonNull Function<? super T, ? extends Iterable<? extends U>> mapper) {
3540+
public final <@NonNull U> Flowable<U> flattenAsFlowable(@NonNull Function<? super T, @NonNull ? extends Iterable<? extends U>> mapper) {
35413541
Objects.requireNonNull(mapper, "mapper is null");
35423542
return RxJavaPlugins.onAssembly(new SingleFlatMapIterableFlowable<>(this, mapper));
35433543
}
@@ -4333,7 +4333,7 @@ public final Flowable<T> repeat(long times) {
43334333
@CheckReturnValue
43344334
@SchedulerSupport(SchedulerSupport.NONE)
43354335
@NonNull
4336-
public final Flowable<T> repeatWhen(@NonNull Function<? super Flowable<Object>, ? extends Publisher<@NonNull ?>> handler) {
4336+
public final Flowable<T> repeatWhen(@NonNull Function<? super Flowable<Object>, @NonNull ? extends Publisher<@NonNull ?>> handler) {
43374337
return toFlowable().repeatWhen(handler);
43384338
}
43394339

@@ -4538,7 +4538,7 @@ public final Single<T> retryUntil(@NonNull BooleanSupplier stop) {
45384538
@CheckReturnValue
45394539
@SchedulerSupport(SchedulerSupport.NONE)
45404540
@NonNull
4541-
public final Single<T> retryWhen(@NonNull Function<? super Flowable<Throwable>, ? extends Publisher<@NonNull ?>> handler) {
4541+
public final Single<T> retryWhen(@NonNull Function<? super Flowable<Throwable>, @NonNull ? extends Publisher<@NonNull ?>> handler) {
45424542
return toSingle(toFlowable().retryWhen(handler));
45434543
}
45444544

@@ -5716,7 +5716,7 @@ public final CompletionStage<T> toCompletionStage() {
57165716
@SchedulerSupport(SchedulerSupport.NONE)
57175717
@BackpressureSupport(BackpressureKind.FULL)
57185718
@NonNull
5719-
public final <@NonNull R> Flowable<R> flattenStreamAsFlowable(@NonNull Function<? super T, ? extends Stream<? extends R>> mapper) {
5719+
public final <@NonNull R> Flowable<R> flattenStreamAsFlowable(@NonNull Function<? super T, @NonNull ? extends Stream<? extends R>> mapper) {
57205720
Objects.requireNonNull(mapper, "mapper is null");
57215721
return RxJavaPlugins.onAssembly(new SingleFlattenStreamAsFlowable<>(this, mapper));
57225722
}
@@ -5757,7 +5757,7 @@ public final CompletionStage<T> toCompletionStage() {
57575757
@CheckReturnValue
57585758
@SchedulerSupport(SchedulerSupport.NONE)
57595759
@NonNull
5760-
public final <@NonNull R> Observable<R> flattenStreamAsObservable(@NonNull Function<? super T, ? extends Stream<? extends R>> mapper) {
5760+
public final <@NonNull R> Observable<R> flattenStreamAsObservable(@NonNull Function<? super T, @NonNull ? extends Stream<? extends R>> mapper) {
57615761
Objects.requireNonNull(mapper, "mapper is null");
57625762
return RxJavaPlugins.onAssembly(new SingleFlattenStreamAsObservable<>(this, mapper));
57635763
}

0 commit comments

Comments
 (0)