3.x: Remove redundant interface declarations (ReactiveX#7438)

akarnokd · web-flow · commit 73a57dd1064b · 2022-06-06T12:19:04.000+02:00
* 3.x: Remove redundant interface declarations

* Fix paramvalidator
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferExactBoundary.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferExactBoundary.java
@@ -45,7 +45,7 @@ protected void subscribeActual(Subscriber<? super U> s) {
     }
 
     static final class BufferExactBoundarySubscriber<T, U extends Collection<? super T>, B>
-    extends QueueDrainSubscriber<T, U, U> implements FlowableSubscriber<T>, Subscription, Disposable {
+    extends QueueDrainSubscriber<T, U, U> implements Subscription, Disposable {
 
         final Supplier<U> bufferSupplier;
         final Publisher<B> boundary;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOn.java
@@ -244,8 +244,7 @@ public final boolean isEmpty() {
         }
     }
 
-    static final class ObserveOnSubscriber<T> extends BaseObserveOnSubscriber<T>
-    implements FlowableSubscriber<T> {
+    static final class ObserveOnSubscriber<T> extends BaseObserveOnSubscriber<T> {
 
         private static final long serialVersionUID = -4547113800637756442L;
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToList.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToList.java
@@ -46,7 +46,7 @@ protected void subscribeActual(Subscriber<? super U> s) {
 
     static final class ToListSubscriber<T, U extends Collection<? super T>>
     extends DeferredScalarSubscription<U>
-    implements FlowableSubscriber<T>, Subscription {
+    implements FlowableSubscriber<T> {
 
         private static final long serialVersionUID = -8134157938864266736L;
         Subscription upstream;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferExactBoundary.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferExactBoundary.java
@@ -43,7 +43,7 @@ protected void subscribeActual(Observer<? super U> t) {
     }
 
     static final class BufferExactBoundaryObserver<T, U extends Collection<? super T>, B>
-    extends QueueDrainObserver<T, U, U> implements Observer<T>, Disposable {
+    extends QueueDrainObserver<T, U, U> implements Disposable {
 
         final Supplier<U> bufferSupplier;
         final ObservableSource<B> boundary;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/NewThreadWorker.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/NewThreadWorker.java
@@ -26,7 +26,7 @@
  * worker but doesn't perform task-tracking operations.
  *
  */
-public class NewThreadWorker extends Scheduler.Worker implements Disposable {
+public class NewThreadWorker extends Scheduler.Worker {
     private final ScheduledExecutorService executor;
 
     volatile boolean disposed;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/TrampolineScheduler.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/TrampolineScheduler.java
@@ -62,7 +62,7 @@ public Disposable scheduleDirect(@NonNull Runnable run, long delay, TimeUnit uni
         return EmptyDisposable.INSTANCE;
     }
 
-    static final class TrampolineWorker extends Scheduler.Worker implements Disposable {
+    static final class TrampolineWorker extends Scheduler.Worker {
         final PriorityBlockingQueue<TimedRunnable> queue = new PriorityBlockingQueue<>();
 
         private final AtomicInteger wip = new AtomicInteger();
diff --git a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
@@ -560,6 +560,7 @@ public void checkParallelFlowable() {
         for (Class<?> interfaces : AllFunctionals.class.getInterfaces()) {
             defaultValues.put(interfaces, af);
         }
+        defaultValues.put(Subscriber.class, af);
         defaultValues.put(TimeUnit.class, TimeUnit.SECONDS);
         defaultValues.put(Scheduler.class, Schedulers.single());
         defaultValues.put(BackpressureStrategy.class, BackpressureStrategy.MISSING);
@@ -926,7 +927,7 @@ static final class AllFunctionals
     Function3, Function4, Function5, Function6, Function7, Function8, Function9,
     FlowableOnSubscribe, ObservableOnSubscribe, SingleOnSubscribe, MaybeOnSubscribe, CompletableOnSubscribe,
     FlowableTransformer, ObservableTransformer, SingleTransformer, MaybeTransformer, CompletableTransformer,
-    Subscriber, FlowableSubscriber, Observer, SingleObserver, MaybeObserver, CompletableObserver,
+    FlowableSubscriber, Observer, SingleObserver, MaybeObserver, CompletableObserver,
     FlowableOperator, ObservableOperator, SingleOperator, MaybeOperator, CompletableOperator,
     Comparator, ParallelTransformer
     {

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ protected void subscribeActual(Subscriber<? super U> s) {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`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 {`
`49`	`49`
`50`	`50`	`final Supplier<U> bufferSupplier;`
`51`	`51`	`final Publisher<B> boundary;`
Original file line number	Diff line number	Diff line change
`@@ -244,8 +244,7 @@ public final boolean isEmpty() {`
`244`	`244`	`}`
`245`	`245`	`}`
`246`	`246`
`247`		`- static final class ObserveOnSubscriber<T> extends BaseObserveOnSubscriber<T>`
`248`		`- implements FlowableSubscriber<T> {`
	`247`	`+ static final class ObserveOnSubscriber<T> extends BaseObserveOnSubscriber<T> {`
`249`	`248`
`250`	`249`	`private static final long serialVersionUID = -4547113800637756442L;`
`251`	`250`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ protected void subscribeActual(Observer<? super U> t) {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`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 {`
`47`	`47`
`48`	`48`	`final Supplier<U> bufferSupplier;`
`49`	`49`	`final ObservableSource<B> boundary;`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`* worker but doesn't perform task-tracking operations.`
`27`	`27`	`*`
`28`	`28`	`*/`
`29`		`-public class NewThreadWorker extends Scheduler.Worker implements Disposable {`
	`29`	`+public class NewThreadWorker extends Scheduler.Worker {`
`30`	`30`	`private final ScheduledExecutorService executor;`
`31`	`31`
`32`	`32`	`volatile boolean disposed;`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public Disposable scheduleDirect(@NonNull Runnable run, long delay, TimeUnit uni`
`62`	`62`	`return EmptyDisposable.INSTANCE;`
`63`	`63`	`}`
`64`	`64`
`65`		`- static final class TrampolineWorker extends Scheduler.Worker implements Disposable {`
	`65`	`+ static final class TrampolineWorker extends Scheduler.Worker {`
`66`	`66`	`final PriorityBlockingQueue<TimedRunnable> queue = new PriorityBlockingQueue<>();`
`67`	`67`
`68`	`68`	`private final AtomicInteger wip = new AtomicInteger();`