Skip to content

Commit cac2118

Browse files
benjchristensenbenjchristensen
committed
working on stuff
1 parent 584ef6e commit cac2118

85 files changed

Lines changed: 470 additions & 479 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎language-adaptors/rxjava-groovy/src/main/java/rx/lang/groovy/GroovyCreateWrapper.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
import groovy.lang.Closure;
1919
import rx.Observable.OnSubscribe;
20-
import rx.Observer;
20+
import rx.Subscriber;
2121
import rx.Subscription;
2222

2323
public class GroovyCreateWrapper<T> implements OnSubscribe<T> {
@@ -29,7 +29,7 @@ public GroovyCreateWrapper(Closure<Void> closure) {
2929
}
3030

3131
@Override
32-
public void call(Observer<? super T> op) {
32+
public void call(Subscriber<? super T> op) {
3333
Object o = closure.call(op);
3434
/*
3535
* If the new signature is being used, we will get NULL back.

‎language-adaptors/rxjava-groovy/src/test/groovy/rx/lang/groovy/ObservableTests.groovy‎

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,28 +15,21 @@
1515
*/
1616
package rx.lang.groovy
1717

18-
import static org.mockito.Matchers.*;
19-
import static org.mockito.Mockito.*;
20-
21-
import java.util.Arrays;
22-
import java.util.Collection;
23-
import java.util.Map;
24-
25-
import org.junit.Before;
26-
import org.junit.Test;
27-
import static org.junit.Assert.*;
28-
29-
import org.mockito.Mock;
30-
import org.mockito.MockitoAnnotations;
31-
32-
import rx.Notification;
33-
import rx.Observable;
34-
import rx.Observable.OnSubscribeFunc;
35-
import rx.Observer;
36-
import rx.Subscription;
37-
import rx.observables.GroupedObservable;
38-
import rx.subscriptions.Subscriptions;
39-
import rx.util.functions.Func1;
18+
import static org.junit.Assert.*
19+
import static org.mockito.Matchers.*
20+
import static org.mockito.Mockito.*
21+
22+
import org.junit.Before
23+
import org.junit.Test
24+
import org.mockito.Mock
25+
import org.mockito.MockitoAnnotations
26+
27+
import rx.Notification
28+
import rx.Observable
29+
import rx.Observer
30+
import rx.Subscription
31+
import rx.Observable.OnSubscribeFunc
32+
import rx.subscriptions.Subscriptions
4033

4134
def class ObservableTests {
4235

‎rxjava-contrib/rxjava-android/src/main/java/rx/operators/OperationObserveFromAndroidComponent.java‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,13 @@
1717

1818
import rx.Observable;
1919
import rx.Observer;
20+
import rx.Subscriber;
2021
import rx.Subscription;
2122
import rx.android.schedulers.AndroidSchedulers;
22-
import rx.subjects.PublishSubject;
2323
import android.app.Activity;
24-
import android.app.Fragment;
2524
import android.os.Looper;
2625
import android.util.Log;
2726

28-
import java.util.concurrent.Callable;
29-
import java.util.concurrent.Executors;
30-
import java.util.concurrent.Future;
31-
import java.util.concurrent.TimeUnit;
32-
3327
public class OperationObserveFromAndroidComponent {
3428

3529
public static <T> Observable<T> observeFromAndroidComponent(Observable<T> source, android.app.Fragment fragment) {

‎rxjava-contrib/rxjava-android/src/test/java/rx/android/operators/OperationObserveFromAndroidComponentTest.java‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,11 @@
4040
import rx.Observable;
4141
import rx.Observable.OnSubscribeFunc;
4242
import rx.Observer;
43+
import rx.Subscriber;
4344
import rx.Subscription;
4445
import rx.android.schedulers.AndroidSchedulers;
4546
import rx.observers.TestObserver;
47+
import rx.observers.TestSubscriber;
4648
import rx.operators.OperationObserveFromAndroidComponent;
4749
import rx.schedulers.Schedulers;
4850
import rx.subjects.PublishSubject;
@@ -149,8 +151,8 @@ public void itForwardsOnErrorToTargetObserver() {
149151
public void itDropsOnNextOnCompletedSequenceIfTargetComponentIsGone() throws Throwable {
150152
PublishSubject<Integer> source = PublishSubject.create();
151153

152-
final Observable.OnSubscribeFunc<Integer> operator = newOnSubscribeFragmentInstance(source.toObservable(), mockFragment);
153-
operator.onSubscribe(mockObserver);
154+
final Observable.OnSubscribeFunc<Integer> operator = newOnSubscribeFragmentInstance(source, mockFragment);
155+
operator.onSubscribe(new TestSubscriber<Integer>(mockObserver));
154156

155157
source.onNext(1);
156158
releaseComponentRef(operator);
@@ -167,8 +169,8 @@ public void itDropsOnNextOnCompletedSequenceIfTargetComponentIsGone() throws Thr
167169
public void itDropsOnErrorIfTargetComponentIsGone() throws Throwable {
168170
PublishSubject<Integer> source = PublishSubject.create();
169171

170-
final Observable.OnSubscribeFunc<Integer> operator = newOnSubscribeFragmentInstance(source.toObservable(), mockFragment);
171-
operator.onSubscribe(mockObserver);
172+
final Observable.OnSubscribeFunc<Integer> operator = newOnSubscribeFragmentInstance(source, mockFragment);
173+
operator.onSubscribe(new TestSubscriber<Integer>(mockObserver));
172174

173175
source.onNext(1);
174176
releaseComponentRef(operator);
@@ -203,7 +205,7 @@ private void releaseComponentRef(Observable.OnSubscribeFunc<Integer> operator) t
203205
@Test
204206
public void itDoesNotForwardOnNextOnCompletedSequenceIfFragmentIsDetached() {
205207
PublishSubject<Integer> source = PublishSubject.create();
206-
OperationObserveFromAndroidComponent.observeFromAndroidComponent(source.toObservable(), mockFragment).subscribe(new TestObserver<Integer>(mockObserver));
208+
OperationObserveFromAndroidComponent.observeFromAndroidComponent(source, mockFragment).subscribe(new TestObserver<Integer>(mockObserver));
207209

208210
source.onNext(1);
209211

@@ -219,7 +221,7 @@ public void itDoesNotForwardOnNextOnCompletedSequenceIfFragmentIsDetached() {
219221
@Test
220222
public void itDoesNotForwardOnErrorIfFragmentIsDetached() {
221223
PublishSubject<Integer> source = PublishSubject.create();
222-
OperationObserveFromAndroidComponent.observeFromAndroidComponent(source.toObservable(), mockFragment).subscribe(new TestObserver<Integer>(mockObserver));
224+
OperationObserveFromAndroidComponent.observeFromAndroidComponent(source, mockFragment).subscribe(new TestObserver<Integer>(mockObserver));
223225

224226
source.onNext(1);
225227

‎rxjava-contrib/rxjava-apache-http/src/main/java/rx/apache/http/ObservableHttp.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import rx.Observable;
2626
import rx.Observable.OnSubscribeFunc;
2727
import rx.Observer;
28+
import rx.Subscriber;
2829
import rx.Subscription;
2930
import rx.apache.http.consumers.ResponseConsumerDelegate;
3031
import rx.subscriptions.CompositeSubscription;

‎rxjava-contrib/rxjava-apache-http/src/main/java/rx/apache/http/consumers/ResponseConsumerBasic.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import rx.Observable;
3030
import rx.Observable.OnSubscribeFunc;
3131
import rx.Observer;
32+
import rx.Subscriber;
3233
import rx.Subscription;
3334
import rx.apache.http.ObservableHttpResponse;
3435
import rx.subscriptions.CompositeSubscription;

‎rxjava-contrib/rxjava-apache-http/src/main/java/rx/apache/http/consumers/ResponseConsumerEventStream.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import rx.Observable;
3232
import rx.Observable.OnSubscribeFunc;
3333
import rx.Observer;
34+
import rx.Subscriber;
3435
import rx.Subscription;
3536
import rx.apache.http.ObservableHttpResponse;
3637
import rx.subjects.PublishSubject;
@@ -85,7 +86,7 @@ protected void onResponseReceived(HttpResponse response) throws HttpException, I
8586

8687
@Override
8788
public Subscription onSubscribe(Observer<? super byte[]> observer) {
88-
parentSubscription.add(contentSubject.toObservable().subscribe(observer));
89+
parentSubscription.add(contentSubject.subscribe(observer));
8990
return parentSubscription;
9091
}
9192
});

‎rxjava-contrib/rxjava-async-util/src/main/java/rx/util/async/Async.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -605,7 +605,7 @@ public void call() {
605605
subject.onCompleted();
606606
}
607607
});
608-
return subject.toObservable();
608+
return subject;
609609
}
610610
};
611611
}
@@ -662,7 +662,7 @@ public void call() {
662662
subject.onCompleted();
663663
}
664664
});
665-
return subject.toObservable();
665+
return subject;
666666
}
667667
};
668668
}
@@ -721,7 +721,7 @@ public void call() {
721721
subject.onCompleted();
722722
}
723723
});
724-
return subject.toObservable();
724+
return subject;
725725
}
726726
};
727727
}
@@ -782,7 +782,7 @@ public void call() {
782782
subject.onCompleted();
783783
}
784784
});
785-
return subject.toObservable();
785+
return subject;
786786
}
787787
};
788788
}
@@ -845,7 +845,7 @@ public void call() {
845845
subject.onCompleted();
846846
}
847847
});
848-
return subject.toObservable();
848+
return subject;
849849
}
850850
};
851851
}
@@ -910,7 +910,7 @@ public void call() {
910910
subject.onCompleted();
911911
}
912912
});
913-
return subject.toObservable();
913+
return subject;
914914
}
915915
};
916916
}
@@ -977,7 +977,7 @@ public void call() {
977977
subject.onCompleted();
978978
}
979979
});
980-
return subject.toObservable();
980+
return subject;
981981
}
982982
};
983983
}
@@ -1046,7 +1046,7 @@ public void call() {
10461046
subject.onCompleted();
10471047
}
10481048
});
1049-
return subject.toObservable();
1049+
return subject;
10501050
}
10511051
};
10521052
}
@@ -1117,7 +1117,7 @@ public void call() {
11171117
subject.onCompleted();
11181118
}
11191119
});
1120-
return subject.toObservable();
1120+
return subject;
11211121
}
11221122
};
11231123
}
@@ -1190,7 +1190,7 @@ public void call() {
11901190
subject.onCompleted();
11911191
}
11921192
});
1193-
return subject.toObservable();
1193+
return subject;
11941194
}
11951195
};
11961196
}
@@ -1243,7 +1243,7 @@ public void call() {
12431243
subject.onCompleted();
12441244
}
12451245
});
1246-
return subject.toObservable();
1246+
return subject;
12471247
}
12481248
};
12491249
}

‎rxjava-contrib/rxjava-async-util/src/main/java/rx/util/async/operators/LatchedObserver.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import java.util.concurrent.CountDownLatch;
1919
import java.util.concurrent.TimeUnit;
2020
import java.util.concurrent.atomic.AtomicBoolean;
21+
2122
import rx.Observer;
2223
import rx.util.functions.Action0;
2324
import rx.util.functions.Action1;
@@ -28,7 +29,7 @@
2829
* a terminal state has been reached.
2930
* @param <T> the observed value type
3031
*/
31-
abstract class LatchedObserver<T> extends Observer<T> {
32+
abstract class LatchedObserver<T> implements Observer<T> {
3233
/** The CountDownLatch to count-down on a terminal state. */
3334
protected final CountDownLatch latch;
3435
/** Contains the error. */

‎rxjava-contrib/rxjava-async-util/src/main/java/rx/util/async/operators/OperationFromFunctionals.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@
1616
package rx.util.async.operators;
1717

1818
import java.util.concurrent.Callable;
19+
1920
import rx.Observable.OnSubscribeFunc;
2021
import rx.Observer;
22+
import rx.Subscriber;
2123
import rx.Subscription;
2224
import rx.subscriptions.Subscriptions;
2325
import rx.util.functions.Action0;

0 commit comments

Comments
 (0)