Skip to content

Commit b57169b

Browse files
authored
3.x: Add NonNull & SafeVarargs annotations + validator (#6791)
1 parent ecdf257 commit b57169b

29 files changed

+2066
-1531
lines changed

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

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

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

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

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

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

src/main/java/io/reactivex/rxjava3/core/Notification.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public final class Notification<T> {
2727
final Object value;
2828

2929
/** Not meant to be implemented externally. */
30-
private Notification(Object value) {
30+
private Notification(@Nullable Object value) {
3131
this.value = value;
3232
}
3333

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

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

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

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

src/test/java/io/reactivex/rxjava3/flowable/FlowableNullTests.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,6 @@ public void mergeArrayNull() {
483483
Flowable.mergeArray(128, 128, (Publisher<Object>[])null);
484484
}
485485

486-
@SuppressWarnings("unchecked")
487486
@Test(expected = NullPointerException.class)
488487
public void mergeArrayOneIsNull() {
489488
Flowable.mergeArray(128, 128, just1, null).blockingLast();
@@ -514,7 +513,6 @@ public void mergeDelayErrorArrayNull() {
514513
Flowable.mergeArrayDelayError(128, 128, (Publisher<Object>[])null);
515514
}
516515

517-
@SuppressWarnings("unchecked")
518516
@Test(expected = NullPointerException.class)
519517
public void mergeDelayErrorArrayOneIsNull() {
520518
Flowable.mergeArrayDelayError(128, 128, just1, null).blockingLast();

src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEagerTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1210,7 +1210,6 @@ public void arrayDelayErrorMaxConcurrency() {
12101210
PublishProcessor<Integer> pp2 = PublishProcessor.create();
12111211
PublishProcessor<Integer> pp3 = PublishProcessor.create();
12121212

1213-
@SuppressWarnings("unchecked")
12141213
TestSubscriber<Integer> ts = Flowable.concatArrayEagerDelayError(2, 2, pp1, pp2, pp3)
12151214
.test();
12161215

@@ -1246,7 +1245,6 @@ public void arrayDelayErrorMaxConcurrencyErrorDelayed() {
12461245
PublishProcessor<Integer> pp2 = PublishProcessor.create();
12471246
PublishProcessor<Integer> pp3 = PublishProcessor.create();
12481247

1249-
@SuppressWarnings("unchecked")
12501248
TestSubscriber<Integer> ts = Flowable.concatArrayEagerDelayError(2, 2, pp1, pp2, pp3)
12511249
.test();
12521250

src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeDelayErrorTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,6 @@ public void array() {
622622
}
623623
}
624624

625-
@SuppressWarnings("unchecked")
626625
@Test
627626
public void mergeArrayDelayError() {
628627
Flowable.mergeArrayDelayError(Flowable.just(1), Flowable.just(2))

src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1518,7 +1518,6 @@ public void array() {
15181518
}
15191519
}
15201520

1521-
@SuppressWarnings("unchecked")
15221521
@Test
15231522
public void mergeArray2() {
15241523
Flowable.mergeArray(Flowable.just(1), Flowable.just(2))

0 commit comments

Comments
 (0)