2.x: fix private field access, few generics problems (#5176)

Author: akarnokd

src/main/java/io/reactivex/internal/operators/completable/CompletableDelay.java

@@ -48,7 +48,7 @@ protected void subscribeActual(final CompletableObserver s) {
     final class Delay implements CompletableObserver {
 
         private final CompositeDisposable set;
-        private final CompletableObserver s;
+        final CompletableObserver s;
 
         Delay(CompositeDisposable set, CompletableObserver s) {
             this.set = set;

src/main/java/io/reactivex/internal/operators/completable/CompletablePeek.java

@@ -57,7 +57,7 @@ final class CompletableObserverImplementation implements CompletableObserver, Di
 
         Disposable d;
 
-        private CompletableObserverImplementation(CompletableObserver actual) {
+        CompletableObserverImplementation(CompletableObserver actual) {
             this.actual = actual;
         }
 

src/main/java/io/reactivex/internal/operators/completable/CompletableResumeNext.java

@@ -43,8 +43,8 @@ protected void subscribeActual(final CompletableObserver s) {
 
     final class ResumeNext implements CompletableObserver {
 
-        private final CompletableObserver s;
-        private final SequentialDisposable sd;
+        final CompletableObserver s;
+        final SequentialDisposable sd;
 
         ResumeNext(CompletableObserver s, SequentialDisposable sd) {
             this.s = s;

src/main/java/io/reactivex/internal/operators/completable/CompletableTimeout.java

@@ -90,8 +90,8 @@ public void onComplete() {
 
     final class DisposeTask implements Runnable {
         private final AtomicBoolean once;
-        private final CompositeDisposable set;
-        private final CompletableObserver s;
+        final CompositeDisposable set;
+        final CompletableObserver s;
 
         DisposeTask(AtomicBoolean once, CompositeDisposable set, CompletableObserver s) {
             this.once = once;

src/main/java/io/reactivex/internal/operators/flowable/FlowableDelaySubscriptionOther.java

@@ -44,8 +44,8 @@ public void subscribeActual(final Subscriber<? super T> child) {
     }
 
     final class DelaySubscriber implements FlowableSubscriber<U> {
-        private final SubscriptionArbiter serial;
-        private final Subscriber<? super T> child;
+        final SubscriptionArbiter serial;
+        final Subscriber<? super T> child;
         boolean done;
 
         DelaySubscriber(SubscriptionArbiter serial, Subscriber<? super T> child) {

src/main/java/io/reactivex/internal/operators/flowable/FlowableReplay.java

@@ -1256,7 +1256,7 @@ public void subscribe(Subscriber<? super T> child) {
         }
     }
 
-    static final class DefaultUnboundedFactory implements Callable {
+    static final class DefaultUnboundedFactory implements Callable<Object> {
         @Override
         public Object call() {
             return new UnboundedReplayBuffer<Object>(16);

src/main/java/io/reactivex/internal/operators/flowable/FlowableWithLatestFrom.java

@@ -40,7 +40,7 @@ protected void subscribeActual(Subscriber<? super R> s) {
 
         serial.onSubscribe(wlf);
 
-        other.subscribe(new FlowableWithLatestSubscriber<U>(wlf));
+        other.subscribe(new FlowableWithLatestSubscriber(wlf));
 
         source.subscribe(wlf);
     }
@@ -117,7 +117,7 @@ public void otherError(Throwable e) {
         }
     }
 
-    final class FlowableWithLatestSubscriber<U> implements FlowableSubscriber<U> {
+    final class FlowableWithLatestSubscriber implements FlowableSubscriber<U> {
         private final WithLatestFromSubscriber<T, U, R> wlf;
 
         FlowableWithLatestSubscriber(WithLatestFromSubscriber<T, U, R> wlf) {

src/main/java/io/reactivex/internal/operators/observable/ObservableDelaySubscriptionOther.java

@@ -44,8 +44,8 @@ public void subscribeActual(final Observer<? super T> child) {
     }
 
     final class DelayObserver implements Observer<U> {
-        private final SequentialDisposable serial;
-        private final Observer<? super T> child;
+        final SequentialDisposable serial;
+        final Observer<? super T> child;
         boolean done;
 
         DelayObserver(SequentialDisposable serial, Observer<? super T> child) {

src/main/java/io/reactivex/internal/operators/observable/ObservableReplay.java

@@ -892,9 +892,9 @@ Node getHead() {
         }
     }
 
-    static final class UnBoundedFactory implements BufferSupplier {
+    static final class UnBoundedFactory implements BufferSupplier<Object> {
         @Override
-        public ReplayBuffer call() {
+        public ReplayBuffer<Object> call() {
             return new UnboundedReplayBuffer<Object>(16);
         }
     }
@@ -1027,7 +1027,7 @@ protected void subscribeActual(Observer<? super R> child) {
 
             observable.subscribe(srw);
 
-            co.connect(new DisposeConsumer(srw));
+            co.connect(new DisposeConsumer<R>(srw));
         }
     }
 

src/main/java/io/reactivex/internal/operators/single/SingleDelay.java

@@ -44,7 +44,7 @@ protected void subscribeActual(final SingleObserver<? super T> s) {
 
     final class Delay implements SingleObserver<T> {
         private final SequentialDisposable sd;
-        private final SingleObserver<? super T> s;
+        final SingleObserver<? super T> s;
 
         Delay(SequentialDisposable sd, SingleObserver<? super T> s) {
             this.sd = sd;

src/main/java/io/reactivex/internal/operators/single/SingleTimeout.java

@@ -58,8 +58,8 @@ protected void subscribeActual(final SingleObserver<? super T> s) {
 
     final class TimeoutDispose implements Runnable {
         private final AtomicBoolean once;
-        private final CompositeDisposable set;
-        private final SingleObserver<? super T> s;
+        final CompositeDisposable set;
+        final SingleObserver<? super T> s;
 
         TimeoutDispose(AtomicBoolean once, CompositeDisposable set, SingleObserver<? super T> s) {
             this.once = once;