Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

{Flowable,Observable}.collect(Collector) contravariant on T #7033

Merged
merged 1 commit into from
Jul 28, 2020
Merged

{Flowable,Observable}.collect(Collector) contravariant on T #7033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/io/reactivex/rxjava3/core/Flowable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19802,7 +19802,7 @@ public final TestSubscriber<T> test(long initialRequest, boolean cancel) { // No
@BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
@SchedulerSupport(SchedulerSupport.NONE)
@NonNull
public final <@NonNull R, A> Single<R> collect(@NonNull Collector<T, A, R> collector) {
public final <@NonNull R, A> Single<R> collect(@NonNull Collector<? super T, A, R> collector) {
Objects.requireNonNull(collector, "collector is null");
return RxJavaPlugins.onAssembly(new FlowableCollectWithCollectorSingle<>(this, collector));
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/reactivex/rxjava3/core/Observable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16642,7 +16642,7 @@ public final TestObserver<T> test(boolean dispose) { // NoPMD
@CheckReturnValue
@SchedulerSupport(SchedulerSupport.NONE)
@NonNull
public final <@NonNull R, A> Single<R> collect(@NonNull Collector<T, A, R> collector) {
public final <@NonNull R, A> Single<R> collect(@NonNull Collector<? super T, A, R> collector) {
Objects.requireNonNull(collector, "collector is null");
return RxJavaPlugins.onAssembly(new ObservableCollectWithCollectorSingle<>(this, collector));
}
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableCollectWithCollector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,17 @@ public final class FlowableCollectWithCollector<T, A, R> extends Flowable<R> {

final Flowable<T> source;

final Collector<T, A, R> collector;
final Collector<? super T, A, R> collector;

public FlowableCollectWithCollector(Flowable<T> source, Collector<T, A, R> collector) {
public FlowableCollectWithCollector(Flowable<T> source, Collector<? super T, A, R> collector) {
this.source = source;
this.collector = collector;
}

@Override
protected void subscribeActual(@NonNull Subscriber<? super R> s) {
A container;
BiConsumer<A, T> accumulator;
BiConsumer<A, ? super T> accumulator;
Function<A, R> finisher;

try {
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableCollectWithCollectorSingle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ public final class FlowableCollectWithCollectorSingle<T, A, R> extends Single<R>

final Flowable<T> source;

final Collector<T, A, R> collector;
final Collector<? super T, A, R> collector;

public FlowableCollectWithCollectorSingle(Flowable<T> source, Collector<T, A, R> collector) {
public FlowableCollectWithCollectorSingle(Flowable<T> source, Collector<? super T, A, R> collector) {
this.source = source;
this.collector = collector;
}
Expand All @@ -54,7 +54,7 @@ public Flowable<R> fuseToFlowable() {
@Override
protected void subscribeActual(@NonNull SingleObserver<? super R> observer) {
A container;
BiConsumer<A, T> accumulator;
BiConsumer<A, ? super T> accumulator;
Function<A, R> finisher;

try {
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableCollectWithCollector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,17 @@ public final class ObservableCollectWithCollector<T, A, R> extends Observable<R>

final Observable<T> source;

final Collector<T, A, R> collector;
final Collector<? super T, A, R> collector;

public ObservableCollectWithCollector(Observable<T> source, Collector<T, A, R> collector) {
public ObservableCollectWithCollector(Observable<T> source, Collector<? super T, A, R> collector) {
this.source = source;
this.collector = collector;
}

@Override
protected void subscribeActual(@NonNull Observer<? super R> observer) {
A container;
BiConsumer<A, T> accumulator;
BiConsumer<A, ? super T> accumulator;
Function<A, R> finisher;

try {
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableCollectWithCollectorSingle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ public final class ObservableCollectWithCollectorSingle<T, A, R> extends Single<

final Observable<T> source;

final Collector<T, A, R> collector;
final Collector<? super T, A, R> collector;

public ObservableCollectWithCollectorSingle(Observable<T> source, Collector<T, A, R> collector) {
public ObservableCollectWithCollectorSingle(Observable<T> source, Collector<? super T, A, R> collector) {
this.source = source;
this.collector = collector;
}
Expand All @@ -51,7 +51,7 @@ public Observable<R> fuseToObservable() {
@Override
protected void subscribeActual(@NonNull SingleObserver<? super R> observer) {
A container;
BiConsumer<A, T> accumulator;
BiConsumer<A, ? super T> accumulator;
Function<A, R> finisher;

try {
Expand Down