Skip to content

Commit 354a16d

Browse files
authored
2.x: add ParallelTransformer interface, params-validation (ReactiveX#5197)
* 2.x: add ParallelTransformer interface, params-validation * Add explicit requireNonNull calls.
1 parent 7df3e3c commit 354a16d

File tree

9 files changed

+102
-51
lines changed

9 files changed

+102
-51
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1010,7 +1010,7 @@ public final Completable cache() {
10101010
@CheckReturnValue
10111011
@SchedulerSupport(SchedulerSupport.NONE)
10121012
public final Completable compose(CompletableTransformer transformer) {
1013-
return wrap(transformer.apply(this));
1013+
return wrap(ObjectHelper.requireNonNull(transformer, "transformer is null").apply(this));
10141014
}
10151015

10161016
/**
@@ -1866,7 +1866,7 @@ private Completable timeout0(long timeout, TimeUnit unit, Scheduler scheduler, C
18661866
@SchedulerSupport(SchedulerSupport.NONE)
18671867
public final <U> U to(Function<? super Completable, U> converter) {
18681868
try {
1869-
return converter.apply(this);
1869+
return ObjectHelper.requireNonNull(converter, "converter is null").apply(this);
18701870
} catch (Throwable ex) {
18711871
Exceptions.throwIfFatal(ex);
18721872
throw ExceptionHelper.wrapOrThrow(ex);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6592,7 +6592,7 @@ public final <U> Single<U> collectInto(final U initialItem, BiConsumer<? super U
65926592
@BackpressureSupport(BackpressureKind.PASS_THROUGH)
65936593
@SchedulerSupport(SchedulerSupport.NONE)
65946594
public final <R> Flowable<R> compose(FlowableTransformer<? super T, ? extends R> composer) {
6595-
return fromPublisher(((FlowableTransformer<T, R>) composer).apply(this));
6595+
return fromPublisher(((FlowableTransformer<T, R>) ObjectHelper.requireNonNull(composer, "composer is null")).apply(this));
65966596
}
65976597

65986598
/**
@@ -14543,7 +14543,7 @@ public final Flowable<Timed<T>> timestamp(final TimeUnit unit, final Scheduler s
1454314543
@SchedulerSupport(SchedulerSupport.NONE)
1454414544
public final <R> R to(Function<? super Flowable<T>, R> converter) {
1454514545
try {
14546-
return converter.apply(this);
14546+
return ObjectHelper.requireNonNull(converter, "converter is null").apply(this);
1454714547
} catch (Throwable ex) {
1454814548
Exceptions.throwIfFatal(ex);
1454914549
throw ExceptionHelper.wrapOrThrow(ex);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2092,7 +2092,7 @@ public final <U> Maybe<U> cast(final Class<? extends U> clazz) {
20922092
@CheckReturnValue
20932093
@SchedulerSupport(SchedulerSupport.NONE)
20942094
public final <R> Maybe<R> compose(MaybeTransformer<? super T, ? extends R> transformer) {
2095-
return wrap(((MaybeTransformer<T, R>) transformer).apply(this));
2095+
return wrap(((MaybeTransformer<T, R>) ObjectHelper.requireNonNull(transformer, "transformer is null")).apply(this));
20962096
}
20972097

20982098
/**
@@ -3065,7 +3065,7 @@ public final <U> Maybe<U> ofType(final Class<U> clazz) {
30653065
@SchedulerSupport(SchedulerSupport.NONE)
30663066
public final <R> R to(Function<? super Maybe<T>, R> convert) {
30673067
try {
3068-
return convert.apply(this);
3068+
return ObjectHelper.requireNonNull(convert, "convert is null").apply(this);
30693069
} catch (Throwable ex) {
30703070
Exceptions.throwIfFatal(ex);
30713071
throw ExceptionHelper.wrapOrThrow(ex);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5921,7 +5921,7 @@ public final <U> Single<U> collectInto(final U initialValue, BiConsumer<? super
59215921
@CheckReturnValue
59225922
@SchedulerSupport(SchedulerSupport.NONE)
59235923
public final <R> Observable<R> compose(ObservableTransformer<? super T, ? extends R> composer) {
5924-
return wrap(((ObservableTransformer<T, R>) composer).apply(this));
5924+
return wrap(((ObservableTransformer<T, R>) ObjectHelper.requireNonNull(composer, "composer is null")).apply(this));
59255925
}
59265926

59275927
/**
@@ -12226,7 +12226,7 @@ public final Observable<Timed<T>> timestamp(final TimeUnit unit, final Scheduler
1222612226
@SchedulerSupport(SchedulerSupport.NONE)
1222712227
public final <R> R to(Function<? super Observable<T>, R> converter) {
1222812228
try {
12229-
return converter.apply(this);
12229+
return ObjectHelper.requireNonNull(converter, "converter is null").apply(this);
1223012230
} catch (Throwable ex) {
1223112231
Exceptions.throwIfFatal(ex);
1223212232
throw ExceptionHelper.wrapOrThrow(ex);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1548,7 +1548,7 @@ public final Single<T> hide() {
15481548
@CheckReturnValue
15491549
@SchedulerSupport(SchedulerSupport.NONE)
15501550
public final <R> Single<R> compose(SingleTransformer<? super T, ? extends R> transformer) {
1551-
return wrap(((SingleTransformer<T, R>) transformer).apply(this));
1551+
return wrap(((SingleTransformer<T, R>) ObjectHelper.requireNonNull(transformer, "transformer is null")).apply(this));
15521552
}
15531553

15541554
/**
@@ -2953,7 +2953,7 @@ private Single<T> timeout0(final long timeout, final TimeUnit unit, final Schedu
29532953
@SchedulerSupport(SchedulerSupport.NONE)
29542954
public final <R> R to(Function<? super Single<T>, R> convert) {
29552955
try {
2956-
return convert.apply(this);
2956+
return ObjectHelper.requireNonNull(convert, "convert is null").apply(this);
29572957
} catch (Throwable ex) {
29582958
Exceptions.throwIfFatal(ex);
29592959
throw ExceptionHelper.wrapOrThrow(ex);

0 commit comments

Comments
 (0)