Skip to content

Commit 673b03c

Browse files
benjchristensenbenjchristensen
committed
Change Lift to use rx.Observable.Operator
The generics insanity has to stop.
1 parent c7366d3 commit 673b03c

52 files changed

Lines changed: 51 additions & 72 deletions

Some content is hidden

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

‎rxjava-contrib/rxjava-debug/src/main/java/rx/operators/DebugSubscriber.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package rx.operators;
22

3+
import rx.Observable.Operator;
34
import rx.Observer;
45
import rx.Subscriber;
56
import rx.plugins.DebugNotification;

‎rxjava-contrib/rxjava-debug/src/main/java/rx/plugins/DebugHook.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
import rx.Observable;
44
import rx.Observable.OnSubscribe;
5+
import rx.Observable.Operator;
56
import rx.Subscriber;
67
import rx.Subscription;
78
import rx.operators.DebugSubscriber;
8-
import rx.operators.Operator;
99
import rx.util.functions.Action1;
1010
import rx.util.functions.Actions;
1111
import rx.util.functions.Func1;

‎rxjava-contrib/rxjava-debug/src/main/java/rx/plugins/DebugNotification.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22

33
import rx.Notification;
44
import rx.Observable.OnSubscribe;
5+
import rx.Observable.Operator;
56
import rx.Observer;
67
import rx.observers.SafeSubscriber;
78
import rx.operators.DebugSubscriber;
8-
import rx.operators.Operator;
9-
import rx.plugins.DebugNotification.Kind;
109

1110
public class DebugNotification<T> {
1211
public static enum Kind {

‎rxjava-contrib/rxjava-debug/src/main/java/rx/plugins/NotificationEvent.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
import rx.Notification;
44
import rx.Observable.OnSubscribe;
5+
import rx.Observable.Operator;
56
import rx.Observer;
67
import rx.observers.SafeSubscriber;
78
import rx.operators.DebugSubscriber;
8-
import rx.operators.Operator;
99

1010
public class NotificationEvent<T> {
1111
public static enum Kind {

‎rxjava-contrib/rxjava-string/src/main/java/rx/observables/StringObservable.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131

3232
import rx.Observable;
3333
import rx.Observable.OnSubscribe;
34+
import rx.Observable.Operator;
3435
import rx.Subscriber;
35-
import rx.operators.Operator;
3636
import rx.util.functions.Func1;
3737
import rx.util.functions.Func2;
3838

‎rxjava-core/src/main/java/rx/Observable.java‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@
9494
import rx.operators.OperationToObservableFuture;
9595
import rx.operators.OperationUsing;
9696
import rx.operators.OperationWindow;
97-
import rx.operators.Operator;
9897
import rx.operators.OperatorCast;
9998
import rx.operators.OperatorDoOnEach;
10099
import rx.operators.OperatorFilter;
@@ -174,7 +173,7 @@ public class Observable<T> {
174173
* {@link OnSubscribe} to be executed when {@link #subscribe(Subscriber)} is called
175174
*/
176175
protected Observable(OnSubscribe<T> f) {
177-
this.f = f;
176+
this.f = hook.onCreate(f);
178177
}
179178

180179
private final static RxJavaObservableExecutionHook hook = RxJavaPlugins.getInstance().getObservableExecutionHook();
@@ -206,19 +205,28 @@ protected Observable(OnSubscribe<T> f) {
206205
* @see <a href="http://msdn.microsoft.com/en-us/library/system.reactive.linq.observable.create.aspx">MSDN: Observable.Create</a>
207206
*/
208207
public final static <T> Observable<T> create(OnSubscribe<T> f) {
209-
return new Observable<T>(hook.onCreate(f));
208+
return new Observable<T>(f);
210209
}
211210

212211
/**
213-
*
212+
* Invoked when Obserable.subscribe is called.
214213
*/
215214
public static interface OnSubscribe<T> extends Action1<Subscriber<? super T>> {
216-
215+
// cover for generics insanity
217216
}
217+
218+
/**
219+
* Operator function for lifting into an Observable.
220+
*/
221+
public interface Operator<R, T> extends Func1<Subscriber<? super R>, Subscriber<? super T>> {
222+
// cover for generics insanity
223+
}
224+
218225

219226
/**
220-
*
227+
* @Deprecated
221228
*/
229+
@Deprecated
222230
public final static <T> Observable<T> create(final OnSubscribeFunc<T> f) {
223231
return new Observable<T>(new OnSubscribe<T>() {
224232

@@ -253,11 +261,11 @@ public static interface OnSubscribeFunc<T> extends Function {
253261
* @param bind
254262
* @return an Observable that emits values that are the result of applying the bind function to the values of the current Observable
255263
*/
256-
public <R> Observable<R> lift(final Func1<Subscriber<? super R>, Subscriber<? super T>> bind) {
264+
public <R> Observable<R> lift(final Operator<R, T> bind) {
257265
return new Observable<R>(new OnSubscribe<R>() {
258266
@Override
259267
public void call(Subscriber<? super R> o) {
260-
subscribe(hook.onLift((Operator<R, T>) bind).call(o));
268+
subscribe(hook.onLift(bind).call(o));
261269
}
262270
});
263271
}

‎rxjava-core/src/main/java/rx/joins/JoinObserver1.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import rx.Observable;
2626
import rx.Subscriber;
2727
import rx.observers.SafeSubscriber;
28-
import rx.operators.SafeObservableSubscription;
2928
import rx.util.functions.Action1;
3029

3130
/**

‎rxjava-core/src/main/java/rx/observables/BlockingObservable.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import rx.operators.OperationNext;
3030
import rx.operators.OperationToFuture;
3131
import rx.operators.OperationToIterator;
32-
import rx.operators.SafeObservableSubscription;
3332
import rx.util.functions.Action1;
3433
import rx.util.functions.Func1;
3534

‎rxjava-core/src/main/java/rx/observers/Observers.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package rx.observers;
22

33
import rx.Observer;
4-
import rx.Subscriber;
54
import rx.util.OnErrorNotImplementedException;
65
import rx.util.functions.Action0;
76
import rx.util.functions.Action1;

‎rxjava-core/src/main/java/rx/observers/TestObserver.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package rx.observers;
1717

1818
import java.util.ArrayList;
19-
import java.util.Arrays;
2019
import java.util.Collections;
2120
import java.util.List;
2221

0 commit comments

Comments
 (0)