2.x: Java 9 compatibility fixes (March 3) (#5153)

ReactiveX · Mar 3, 2017 · 26eff79 · 26eff79
1 parent 19ba993
commit 26eff79
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/src/main/java/io/reactivex/internal/operators/flowable/BlockingFlowableIterable.java b/src/main/java/io/reactivex/internal/operators/flowable/BlockingFlowableIterable.java
@@ -27,11 +27,11 @@
 import io.reactivex.internal.util.*;
 
 public final class BlockingFlowableIterable<T> implements Iterable<T> {
-    final Flowable<? extends T> source;
+    final Flowable<T> source;
 
     final int bufferSize;
 
-    public BlockingFlowableIterable(Flowable<? extends T> source, int bufferSize) {
+    public BlockingFlowableIterable(Flowable<T> source, int bufferSize) {
         this.source = source;
         this.bufferSize = bufferSize;
     }

diff --git a/src/main/java/io/reactivex/internal/operators/flowable/BlockingFlowableMostRecent.java b/src/main/java/io/reactivex/internal/operators/flowable/BlockingFlowableMostRecent.java
@@ -29,11 +29,11 @@
  */
 public final class BlockingFlowableMostRecent<T> implements Iterable<T> {
 
-    final Flowable<? extends T> source;
+    final Flowable<T> source;
 
     final T initialValue;
 
-    public BlockingFlowableMostRecent(Flowable<? extends T> source, T initialValue) {
+    public BlockingFlowableMostRecent(Flowable<T> source, T initialValue) {
         this.source = source;
         this.initialValue = initialValue;
     }

diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableCache.java b/src/main/java/io/reactivex/internal/operators/flowable/FlowableCache.java
@@ -93,7 +93,7 @@ protected void subscribeActual(Subscriber<? super T> t) {
      */
     static final class CacheState<T> extends LinkedArrayList implements FlowableSubscriber<T> {
         /** The source observable to connect to. */
-        final Flowable<? extends T> source;
+        final Flowable<T> source;
         /** Holds onto the subscriber connected to source. */
         final AtomicReference<Subscription> connection = new AtomicReference<Subscription>();
         /** Guarded by connection (not this). */
@@ -114,7 +114,7 @@ static final class CacheState<T> extends LinkedArrayList implements FlowableSubs
         boolean sourceDone;
 
         @SuppressWarnings("unchecked")
-        CacheState(Flowable<? extends T> source, int capacityHint) {
+        CacheState(Flowable<T> source, int capacityHint) {
             super(capacityHint);
             this.source = source;
             this.subscribers = new AtomicReference<ReplaySubscription<T>[]>(EMPTY);

diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableRefCount.java b/src/main/java/io/reactivex/internal/operators/flowable/FlowableRefCount.java
@@ -32,7 +32,7 @@
  *            the value type
  */
 public final class FlowableRefCount<T> extends AbstractFlowableWithUpstream<T, T> {
-    final ConnectableFlowable<? extends T> source;
+    final ConnectableFlowable<T> source;
     volatile CompositeDisposable baseDisposable = new CompositeDisposable();
     final AtomicInteger subscriptionCount = new AtomicInteger();
 

diff --git a/src/test/java/io/reactivex/TestHelper.java b/src/test/java/io/reactivex/TestHelper.java
@@ -644,7 +644,7 @@ public static void doubleOnSubscribe(MaybeObserver<?> subscriber) {
      * isCancelled properly before and after calling dispose.
      * @param source the source to test
      */
-    public static void checkDisposed(Flowable<?> source) {
+    public static <T> void checkDisposed(Flowable<T> source) {
         final TestSubscriber<Object> ts = new TestSubscriber<Object>(0L);
         source.subscribe(new FlowableSubscriber<Object>() {
             @Override