Skip to content

Commit 47189ac

Browse files
akarnokdakarnokd
authored
3.x: Move nullness annotation to use sites of Supplier (#7385)
1 parent 9d36262 commit 47189ac

File tree

7 files changed

+19
-19
lines changed

7 files changed

+19
-19
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
@@ -479,7 +479,7 @@ public static Completable unsafeCreate(@NonNull CompletableSource onSubscribe) {
479479
@CheckReturnValue
480480
@NonNull
481481
@SchedulerSupport(SchedulerSupport.NONE)
482-
public static Completable defer(@NonNull Supplier<? extends CompletableSource> supplier) {
482+
public static Completable defer(@NonNull Supplier<? extends @NonNull CompletableSource> supplier) {
483483
Objects.requireNonNull(supplier, "supplier is null");
484484
return RxJavaPlugins.onAssembly(new CompletableDefer(supplier));
485485
}
@@ -503,7 +503,7 @@ public static Completable defer(@NonNull Supplier<? extends CompletableSource> s
503503
@CheckReturnValue
504504
@NonNull
505505
@SchedulerSupport(SchedulerSupport.NONE)
506-
public static Completable error(@NonNull Supplier<? extends Throwable> supplier) {
506+
public static Completable error(@NonNull Supplier<? extends @NonNull Throwable> supplier) {
507507
Objects.requireNonNull(supplier, "supplier is null");
508508
return RxJavaPlugins.onAssembly(new CompletableErrorSupplier(supplier));
509509
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2040,7 +2040,7 @@ public static int bufferSize() {
20402040
@NonNull
20412041
@BackpressureSupport(BackpressureKind.PASS_THROUGH)
20422042
@SchedulerSupport(SchedulerSupport.NONE)
2043-
public static <@NonNull T> Flowable<T> defer(@NonNull Supplier<? extends Publisher<? extends T>> supplier) {
2043+
public static <@NonNull T> Flowable<T> defer(@NonNull Supplier<? extends @NonNull Publisher<? extends T>> supplier) {
20442044
Objects.requireNonNull(supplier, "supplier is null");
20452045
return RxJavaPlugins.onAssembly(new FlowableDefer<>(supplier));
20462046
}
@@ -2095,7 +2095,7 @@ public static int bufferSize() {
20952095
@NonNull
20962096
@BackpressureSupport(BackpressureKind.PASS_THROUGH)
20972097
@SchedulerSupport(SchedulerSupport.NONE)
2098-
public static <@NonNull T> Flowable<T> error(@NonNull Supplier<? extends Throwable> supplier) {
2098+
public static <@NonNull T> Flowable<T> error(@NonNull Supplier<? extends @NonNull Throwable> supplier) {
20992099
Objects.requireNonNull(supplier, "supplier is null");
21002100
return RxJavaPlugins.onAssembly(new FlowableError<>(supplier));
21012101
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -889,7 +889,7 @@ public abstract class Maybe<T> implements MaybeSource<T> {
889889
@CheckReturnValue
890890
@NonNull
891891
@SchedulerSupport(SchedulerSupport.NONE)
892-
public static <@NonNull T> Maybe<T> defer(@NonNull Supplier<? extends MaybeSource<? extends T>> supplier) {
892+
public static <@NonNull T> Maybe<T> defer(@NonNull Supplier<? extends @NonNull MaybeSource<? extends T>> supplier) {
893893
Objects.requireNonNull(supplier, "supplier is null");
894894
return RxJavaPlugins.onAssembly(new MaybeDefer<>(supplier));
895895
}
@@ -961,7 +961,7 @@ public abstract class Maybe<T> implements MaybeSource<T> {
961961
@CheckReturnValue
962962
@NonNull
963963
@SchedulerSupport(SchedulerSupport.NONE)
964-
public static <@NonNull T> Maybe<T> error(@NonNull Supplier<? extends Throwable> supplier) {
964+
public static <@NonNull T> Maybe<T> error(@NonNull Supplier<? extends @NonNull Throwable> supplier) {
965965
Objects.requireNonNull(supplier, "supplier is null");
966966
return RxJavaPlugins.onAssembly(new MaybeErrorCallable<>(supplier));
967967
}
@@ -1079,7 +1079,7 @@ public abstract class Maybe<T> implements MaybeSource<T> {
10791079
@CheckReturnValue
10801080
@NonNull
10811081
@SchedulerSupport(SchedulerSupport.NONE)
1082-
public static <@NonNull T> Maybe<T> fromCallable(@NonNull Callable<? extends T> callable) {
1082+
public static <T> Maybe<@NonNull T> fromCallable(@NonNull Callable<? extends @Nullable T> callable) {
10831083
Objects.requireNonNull(callable, "callable is null");
10841084
return RxJavaPlugins.onAssembly(new MaybeFromCallable<>(callable));
10851085
}
@@ -1285,7 +1285,7 @@ public abstract class Maybe<T> implements MaybeSource<T> {
12851285
@CheckReturnValue
12861286
@NonNull
12871287
@SchedulerSupport(SchedulerSupport.NONE)
1288-
public static <@NonNull T> Maybe<T> fromSupplier(@NonNull Supplier<? extends T> supplier) {
1288+
public static <T> Maybe<@NonNull T> fromSupplier(@NonNull Supplier<? extends @Nullable T> supplier) {
12891289
Objects.requireNonNull(supplier, "supplier is null");
12901290
return RxJavaPlugins.onAssembly(new MaybeFromSupplier<>(supplier));
12911291
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1790,7 +1790,7 @@ public static int bufferSize() {
17901790
@CheckReturnValue
17911791
@NonNull
17921792
@SchedulerSupport(SchedulerSupport.NONE)
1793-
public static <@NonNull T> Observable<T> defer(@NonNull Supplier<? extends ObservableSource<? extends T>> supplier) {
1793+
public static <@NonNull T> Observable<T> defer(@NonNull Supplier<? extends @NonNull ObservableSource<? extends T>> supplier) {
17941794
Objects.requireNonNull(supplier, "supplier is null");
17951795
return RxJavaPlugins.onAssembly(new ObservableDefer<>(supplier));
17961796
}
@@ -1839,7 +1839,7 @@ public static int bufferSize() {
18391839
@CheckReturnValue
18401840
@NonNull
18411841
@SchedulerSupport(SchedulerSupport.NONE)
1842-
public static <@NonNull T> Observable<T> error(@NonNull Supplier<? extends Throwable> supplier) {
1842+
public static <@NonNull T> Observable<T> error(@NonNull Supplier<? extends @NonNull Throwable> supplier) {
18431843
Objects.requireNonNull(supplier, "supplier is null");
18441844
return RxJavaPlugins.onAssembly(new ObservableError<>(supplier));
18451845
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -895,7 +895,7 @@ public abstract class Single<@NonNull T> implements SingleSource<T> {
895895
@CheckReturnValue
896896
@NonNull
897897
@SchedulerSupport(SchedulerSupport.NONE)
898-
public static <@NonNull T> Single<T> defer(@NonNull Supplier<? extends SingleSource<? extends T>> supplier) {
898+
public static <@NonNull T> Single<T> defer(@NonNull Supplier<? extends @NonNull SingleSource<? extends T>> supplier) {
899899
Objects.requireNonNull(supplier, "supplier is null");
900900
return RxJavaPlugins.onAssembly(new SingleDefer<>(supplier));
901901
}
@@ -917,7 +917,7 @@ public abstract class Single<@NonNull T> implements SingleSource<T> {
917917
@CheckReturnValue
918918
@NonNull
919919
@SchedulerSupport(SchedulerSupport.NONE)
920-
public static <@NonNull T> Single<T> error(@NonNull Supplier<? extends Throwable> supplier) {
920+
public static <@NonNull T> Single<T> error(@NonNull Supplier<? extends @NonNull Throwable> supplier) {
921921
Objects.requireNonNull(supplier, "supplier is null");
922922
return RxJavaPlugins.onAssembly(new SingleError<>(supplier));
923923
}

‎src/main/java/io/reactivex/rxjava3/functions/Supplier.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313

1414
package io.reactivex.rxjava3.functions;
1515

16-
import io.reactivex.rxjava3.annotations.NonNull;
17-
1816
/**
1917
* A functional interface (callback) that provides a single value or
2018
* throws an exception.
@@ -25,7 +23,7 @@
2523
* @since 3.0.0
2624
*/
2725
@FunctionalInterface
28-
public interface Supplier<@NonNull T> {
26+
public interface Supplier<T> {
2927

3028
/**
3129
* Produces a value or throws an exception.

‎src/test/java/io/reactivex/rxjava3/validators/NonNullMethodTypeArgumentCheck.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,12 @@ static void process(Class<?> clazz) {
5757

5858
for (String ta : parseTypeArguments(line)) {
5959
if (!ta.startsWith("@NonNull") && !ta.startsWith("@Nullable")) {
60-
result.append("Missing annotation on argument ").append(ta).append("\r\nat ")
61-
.append(parentPackage).append(".").append(className).append(".method(")
62-
.append(className).append(".java:").append(lineCount).append(")\r\n");
63-
count++;
60+
if (!("Maybe".equals(clazz.getSimpleName()) && (line.contains("fromCallable(") || line.contains("fromSupplier(")))) {
61+
result.append("Missing annotation on argument ").append(ta).append("\r\nat ")
62+
.append(parentPackage).append(".").append(className).append(".method(")
63+
.append(className).append(".java:").append(lineCount).append(")\r\n");
64+
count++;
65+
}
6466
}
6567
}
6668
}

0 commit comments

Comments
 (0)