ReactiveX · ldaley · Sep 4, 2014
diff --git a/build.gradle b/build.gradle
@@ -9,7 +9,7 @@ description = "Adapter between RxJava and ReactiveStreams"
 
 dependencies {
     compile 'io.reactivex:rxjava:1.0.+'
-    compile 'org.reactivestreams:reactive-streams:0.4.0.M1'
+    compile 'org.reactivestreams:reactive-streams:0.4.0.M2'
     testCompile 'junit:junit-dep:4.10'
     testCompile 'org.mockito:mockito-core:1.8.5'
 }

diff --git a/src/main/java/rx/RxReactiveStreams.java b/src/main/java/rx/RxReactiveStreams.java
@@ -32,8 +32,7 @@ public static <T> Observable<T> toObservable(final Publisher<T> publisher) {
         return Observable.create(new PublisherObservableOnSubscribe<T>(publisher));
     }
 
-    // Make subscriber contravariant after https://github.com/reactive-streams/reactive-streams/issues/104 is fixed
-    public static <T> void subscribe(Observable<T> observable, Subscriber<T> subscriber) {
+    public static <T> void subscribe(Observable<T> observable, Subscriber<? super T> subscriber) {
         observable.subscribe(new ObservableSubscriber<T>(subscriber));
     }
 

diff --git a/src/main/java/rx/internal/ObservablePublisher.java b/src/main/java/rx/internal/ObservablePublisher.java
@@ -29,7 +29,7 @@ public ObservablePublisher(Observable<T> observable) {
     }
 
     @Override
-    public void subscribe(final Subscriber<T> s) {
+    public void subscribe(final Subscriber<? super T> s) {
         RxReactiveStreams.subscribe(observable, s);
     }
 

diff --git a/src/main/java/rx/internal/ObservableSubscriber.java b/src/main/java/rx/internal/ObservableSubscriber.java
@@ -19,17 +19,17 @@
 import org.reactivestreams.Subscription;
 
 public class ObservableSubscriber<T> extends rx.Subscriber<T> {
-    private final Subscriber<T> rsSubscriber;
+    private final Subscriber<? super T> rsSubscriber;
 
-    public ObservableSubscriber(Subscriber<T> rsSubscriber) {
+    public ObservableSubscriber(Subscriber<? super T> rsSubscriber) {
         this.rsSubscriber = rsSubscriber;
 
-        // Reactive streams contract requires not sending anything until an explict request is made
+        // Reactive streams contract requires not sending anything until an explicit request is made
         request(0);
 
         rsSubscriber.onSubscribe(new Subscription() {
             @Override
-            public void request(int n) {
+            public void request(long n) {
                 ObservableSubscriber.this.request(n);
             }
 

diff --git a/src/main/java/rx/internal/PublisherSubscriber.java b/src/main/java/rx/internal/PublisherSubscriber.java
@@ -1,12 +1,4 @@
-package rx.internal;
-
-import org.reactivestreams.Subscriber;
-import org.reactivestreams.Subscription;
-import rx.Producer;
-import rx.functions.Action0;
-import rx.subscriptions.Subscriptions;
-
-/**
+/*
  * Copyright 2014 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,6 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+package rx.internal;
+
+import org.reactivestreams.Subscriber;
+import org.reactivestreams.Subscription;
+import rx.Producer;
+import rx.functions.Action0;
+import rx.subscriptions.Subscriptions;
+
 public class PublisherSubscriber<T> implements Subscriber<T> {
     private final rx.Subscriber<? super T> rxSubscriber;
 
@@ -33,14 +34,7 @@ public void onSubscribe(final Subscription rsSubscription) {
         rxSubscriber.setProducer(new Producer() {
             @Override
             public void request(long n) {
-                // 0.4.0.M1 of reactive streams is bugged in that Subsription.request() takes an int
-                // https://github.com/reactive-streams/reactive-streams/issues/105
-                // MUST update this after that change
-                if (n <= Integer.MAX_VALUE) {
-                    rsSubscription.request((int) n);
-                } else {
-                    rsSubscription.request(Integer.MAX_VALUE);
-                }
+                rsSubscription.request(n);
             }
         });
 

diff --git a/src/test/java/rx/test/IterablePublisher.java b/src/test/java/rx/test/IterablePublisher.java
@@ -30,13 +30,13 @@ public IterablePublisher(Iterable<T> iterable) {
     }
 
     @Override
-    public void subscribe(final Subscriber<T> subscriber) {
+    public void subscribe(final Subscriber<? super T> subscriber) {
         subscriber.onSubscribe(new Subscription() {
 
             Iterator<T> iterator = iterable.iterator();
 
             @Override
-            public void request(int n) {
+            public void request(long n) {
                 for (int i = 0; i < n; ++i) {
                     if (iterator.hasNext()) {
                         T next;