Skip to content

Commit 73a57dd

Browse files
authored
3.x: Remove redundant interface declarations (#7438)
* 3.x: Remove redundant interface declarations * Fix paramvalidator
1 parent f359ca1 commit 73a57dd

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
lines changed

src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferExactBoundary.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ protected void subscribeActual(Subscriber<? super U> s) {
4545
}
4646

4747
static final class BufferExactBoundarySubscriber<T, U extends Collection<? super T>, B>
48-
extends QueueDrainSubscriber<T, U, U> implements FlowableSubscriber<T>, Subscription, Disposable {
48+
extends QueueDrainSubscriber<T, U, U> implements Subscription, Disposable {
4949

5050
final Supplier<U> bufferSupplier;
5151
final Publisher<B> boundary;

src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOn.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -244,8 +244,7 @@ public final boolean isEmpty() {
244244
}
245245
}
246246

247-
static final class ObserveOnSubscriber<T> extends BaseObserveOnSubscriber<T>
248-
implements FlowableSubscriber<T> {
247+
static final class ObserveOnSubscriber<T> extends BaseObserveOnSubscriber<T> {
249248

250249
private static final long serialVersionUID = -4547113800637756442L;
251250

src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToList.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ protected void subscribeActual(Subscriber<? super U> s) {
4646

4747
static final class ToListSubscriber<T, U extends Collection<? super T>>
4848
extends DeferredScalarSubscription<U>
49-
implements FlowableSubscriber<T>, Subscription {
49+
implements FlowableSubscriber<T> {
5050

5151
private static final long serialVersionUID = -8134157938864266736L;
5252
Subscription upstream;

src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferExactBoundary.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ protected void subscribeActual(Observer<? super U> t) {
4343
}
4444

4545
static final class BufferExactBoundaryObserver<T, U extends Collection<? super T>, B>
46-
extends QueueDrainObserver<T, U, U> implements Observer<T>, Disposable {
46+
extends QueueDrainObserver<T, U, U> implements Disposable {
4747

4848
final Supplier<U> bufferSupplier;
4949
final ObservableSource<B> boundary;

src/main/java/io/reactivex/rxjava3/internal/schedulers/NewThreadWorker.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
* worker but doesn't perform task-tracking operations.
2727
*
2828
*/
29-
public class NewThreadWorker extends Scheduler.Worker implements Disposable {
29+
public class NewThreadWorker extends Scheduler.Worker {
3030
private final ScheduledExecutorService executor;
3131

3232
volatile boolean disposed;

src/main/java/io/reactivex/rxjava3/internal/schedulers/TrampolineScheduler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public Disposable scheduleDirect(@NonNull Runnable run, long delay, TimeUnit uni
6262
return EmptyDisposable.INSTANCE;
6363
}
6464

65-
static final class TrampolineWorker extends Scheduler.Worker implements Disposable {
65+
static final class TrampolineWorker extends Scheduler.Worker {
6666
final PriorityBlockingQueue<TimedRunnable> queue = new PriorityBlockingQueue<>();
6767

6868
private final AtomicInteger wip = new AtomicInteger();

src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -560,6 +560,7 @@ public void checkParallelFlowable() {
560560
for (Class<?> interfaces : AllFunctionals.class.getInterfaces()) {
561561
defaultValues.put(interfaces, af);
562562
}
563+
defaultValues.put(Subscriber.class, af);
563564
defaultValues.put(TimeUnit.class, TimeUnit.SECONDS);
564565
defaultValues.put(Scheduler.class, Schedulers.single());
565566
defaultValues.put(BackpressureStrategy.class, BackpressureStrategy.MISSING);
@@ -926,7 +927,7 @@ static final class AllFunctionals
926927
Function3, Function4, Function5, Function6, Function7, Function8, Function9,
927928
FlowableOnSubscribe, ObservableOnSubscribe, SingleOnSubscribe, MaybeOnSubscribe, CompletableOnSubscribe,
928929
FlowableTransformer, ObservableTransformer, SingleTransformer, MaybeTransformer, CompletableTransformer,
929-
Subscriber, FlowableSubscriber, Observer, SingleObserver, MaybeObserver, CompletableObserver,
930+
FlowableSubscriber, Observer, SingleObserver, MaybeObserver, CompletableObserver,
930931
FlowableOperator, ObservableOperator, SingleOperator, MaybeOperator, CompletableOperator,
931932
Comparator, ParallelTransformer
932933
{

0 commit comments

Comments
 (0)