Skip to content

Commit 0438505

Browse files
author
jmhofer
committed
lots of Observer<? super X>
1 parent 69c6e80 commit 0438505

60 files changed

Lines changed: 509 additions & 514 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.

‎rxjava-contrib/rxjava-swing/src/main/java/rx/swing/sources/AbstractButtonSource.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ public enum AbstractButtonSource { ; // no instances
4242
* @see SwingObservable.fromButtonAction
4343
*/
4444
public static Observable<ActionEvent> fromActionOf(final AbstractButton button) {
45-
return Observable.create(new Func1<Observer<ActionEvent>, Subscription>() {
45+
return Observable.create(new Func1<Observer<? super ActionEvent>, Subscription>() {
4646
@Override
47-
public Subscription call(final Observer<ActionEvent> observer) {
47+
public Subscription call(final Observer<? super ActionEvent> observer) {
4848
final ActionListener listener = new ActionListener() {
4949
@Override
5050
public void actionPerformed(ActionEvent e) {

‎rxjava-contrib/rxjava-swing/src/main/java/rx/swing/sources/ComponentEventSource.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ public enum ComponentEventSource { ; // no instances
3636
* @see SwingObservable.fromComponentEvents
3737
*/
3838
public static Observable<ComponentEvent> fromComponentEventsOf(final Component component) {
39-
return Observable.create(new Func1<Observer<ComponentEvent>, Subscription>() {
39+
return Observable.create(new Func1<Observer<? super ComponentEvent>, Subscription>() {
4040
@Override
41-
public Subscription call(final Observer<ComponentEvent> observer) {
41+
public Subscription call(final Observer<? super ComponentEvent> observer) {
4242
final ComponentListener listener = new ComponentListener() {
4343
@Override
4444
public void componentHidden(ComponentEvent event) {

‎rxjava-contrib/rxjava-swing/src/main/java/rx/swing/sources/KeyEventSource.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ public enum KeyEventSource { ; // no instances
5050
* @see SwingObservable.fromKeyEvents(Component)
5151
*/
5252
public static Observable<KeyEvent> fromKeyEventsOf(final Component component) {
53-
return Observable.create(new Func1<Observer<KeyEvent>, Subscription>() {
53+
return Observable.create(new Func1<Observer<? super KeyEvent>, Subscription>() {
5454
@Override
55-
public Subscription call(final Observer<KeyEvent> observer) {
55+
public Subscription call(final Observer<? super KeyEvent> observer) {
5656
final KeyListener listener = new KeyListener() {
5757
@Override
5858
public void keyPressed(KeyEvent event) {

‎rxjava-contrib/rxjava-swing/src/main/java/rx/swing/sources/MouseEventSource.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ public enum MouseEventSource { ; // no instances
3333
* @see SwingObservable.fromMouseEvents
3434
*/
3535
public static Observable<MouseEvent> fromMouseEventsOf(final Component component) {
36-
return Observable.create(new Func1<Observer<MouseEvent>, Subscription>() {
36+
return Observable.create(new Func1<Observer<? super MouseEvent>, Subscription>() {
3737
@Override
38-
public Subscription call(final Observer<MouseEvent> observer) {
38+
public Subscription call(final Observer<? super MouseEvent> observer) {
3939
final MouseListener listener = new MouseListener() {
4040
@Override
4141
public void mouseClicked(MouseEvent event) {
@@ -78,9 +78,9 @@ public void call() {
7878
* @see SwingObservable.fromMouseMotionEvents
7979
*/
8080
public static Observable<MouseEvent> fromMouseMotionEventsOf(final Component component) {
81-
return Observable.create(new Func1<Observer<MouseEvent>, Subscription>() {
81+
return Observable.create(new Func1<Observer<? super MouseEvent>, Subscription>() {
8282
@Override
83-
public Subscription call(final Observer<MouseEvent> observer) {
83+
public Subscription call(final Observer<? super MouseEvent> observer) {
8484
final MouseMotionListener listener = new MouseMotionListener() {
8585
@Override
8686
public void mouseDragged(MouseEvent event) {

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public class Observable<T> {
108108

109109
private final static RxJavaObservableExecutionHook hook = RxJavaPlugins.getInstance().getObservableExecutionHook();
110110

111-
private final Func1<? super Observer<T>, ? extends Subscription> onSubscribe;
111+
private final Func1<? super Observer<? super T>, ? extends Subscription> onSubscribe;
112112

113113
/**
114114
* Observable with Function to execute when subscribed to.
@@ -119,7 +119,7 @@ public class Observable<T> {
119119
* @param onSubscribe
120120
* {@link Func1} to be executed when {@link #subscribe(Observer)} is called.
121121
*/
122-
protected Observable(Func1<? super Observer<T>, ? extends Subscription> onSubscribe) {
122+
protected Observable(Func1<? super Observer<? super T>, ? extends Subscription> onSubscribe) {
123123
this.onSubscribe = onSubscribe;
124124
}
125125

@@ -155,9 +155,9 @@ protected Observable() {
155155
* @throws IllegalArgumentException
156156
* if the {@link Observer} provided as the argument to {@code subscribe()} is {@code null}
157157
*/
158-
public Subscription subscribe(Observer<T> observer) {
158+
public Subscription subscribe(Observer<? super T> observer) {
159159
// allow the hook to intercept and/or decorate
160-
Func1<? super Observer<T>, ? extends Subscription> onSubscribeFunction = hook.onSubscribeStart(this, onSubscribe);
160+
Func1<? super Observer<? super T>, ? extends Subscription> onSubscribeFunction = hook.onSubscribeStart(this, onSubscribe);
161161
// validate and proceed
162162
if (observer == null) {
163163
throw new IllegalArgumentException("observer can not be null");
@@ -233,7 +233,7 @@ public Subscription subscribe(Observer<T> observer) {
233233
* @throws IllegalArgumentException
234234
* if an argument to {@code subscribe()} is {@code null}
235235
*/
236-
public Subscription subscribe(Observer<T> observer, Scheduler scheduler) {
236+
public Subscription subscribe(Observer<? super T> observer, Scheduler scheduler) {
237237
return subscribeOn(scheduler).subscribe(observer);
238238
}
239239

@@ -242,7 +242,7 @@ public Subscription subscribe(Observer<T> observer, Scheduler scheduler) {
242242
* <p>
243243
* See https://github.com/Netflix/RxJava/issues/216 for discussion on "Guideline 6.4: Protect calls to user code from within an operator"
244244
*/
245-
private Subscription protectivelyWrapAndSubscribe(Observer<T> o) {
245+
private Subscription protectivelyWrapAndSubscribe(Observer<? super T> o) {
246246
SafeObservableSubscription subscription = new SafeObservableSubscription();
247247
return subscription.wrap(subscribe(new SafeObserver<T>(subscription, o)));
248248
}
@@ -397,10 +397,10 @@ private void handleError(Throwable e) {
397397
*/
398398
private static class NeverObservable<T> extends Observable<T> {
399399
public NeverObservable() {
400-
super(new Func1<Observer<T>, Subscription>() {
400+
super(new Func1<Observer<? super T>, Subscription>() {
401401

402402
@Override
403-
public Subscription call(Observer<T> t1) {
403+
public Subscription call(Observer<? super T> t1) {
404404
return Subscriptions.empty();
405405
}
406406

@@ -417,7 +417,7 @@ public Subscription call(Observer<T> t1) {
417417
private static class ThrowObservable<T> extends Observable<T> {
418418

419419
public ThrowObservable(final Throwable exception) {
420-
super(new Func1<Observer<T>, Subscription>() {
420+
super(new Func1<Observer<? super T>, Subscription>() {
421421

422422
/**
423423
* Accepts an {@link Observer} and calls its {@link Observer#onError onError} method.
@@ -427,7 +427,7 @@ public ThrowObservable(final Throwable exception) {
427427
* @return a reference to the subscription
428428
*/
429429
@Override
430-
public Subscription call(Observer<T> observer) {
430+
public Subscription call(Observer<? super T> observer) {
431431
observer.onError(exception);
432432
return Subscriptions.empty();
433433
}
@@ -461,7 +461,7 @@ public Subscription call(Observer<T> observer) {
461461
* @return an Observable that, when an {@link Observer} subscribes to it, will execute the given
462462
* function
463463
*/
464-
public static <T> Observable<T> create(Func1<? super Observer<T>, ? extends Subscription> func) {
464+
public static <T> Observable<T> create(Func1<? super Observer<? super T>, ? extends Subscription> func) {
465465
return new Observable<T>(func);
466466
}
467467

@@ -918,7 +918,7 @@ public static <T> Observable<T> from(Future<T> future, long timeout, TimeUnit un
918918
* Observable
919919
* @return an Observable that emits the zipped results
920920
*/
921-
public static <R, T0, T1> Observable<R> zip(Observable<T0> w0, Observable<T1> w1, Func2<? super T0, ? super T1, ? extends R> reduceFunction) {
921+
public static <R, T0, T1> Observable<R> zip(Observable<? extends T0> w0, Observable<? extends T1> w1, Func2<? super T0, ? super T1, ? extends R> reduceFunction) {
922922
return create(OperationZip.zip(w0, w1, reduceFunction));
923923
}
924924

@@ -992,7 +992,7 @@ public static <T> Observable<Boolean> sequenceEqual(Observable<T> first, Observa
992992
* Observables, results in an item that will be emitted by the resulting Observable
993993
* @return an Observable that emits the zipped results
994994
*/
995-
public static <R, T0, T1, T2> Observable<R> zip(Observable<T0> w0, Observable<T1> w1, Observable<T2> w2, Func3<? super T0, ? super T1, ? super T2, ? extends R> function) {
995+
public static <R, T0, T1, T2> Observable<R> zip(Observable<? extends T0> w0, Observable<? extends T1> w1, Observable<? extends T2> w2, Func3<? super T0, ? super T1, ? super T2, ? extends R> function) {
996996
return create(OperationZip.zip(w0, w1, w2, function));
997997
}
998998

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
*/
6161
public class BlockingObservable<T> extends Observable<T> {
6262

63-
protected BlockingObservable(Func1<? super Observer<T>, ? extends Subscription> onSubscribe) {
63+
protected BlockingObservable(Func1<? super Observer<? super T>, ? extends Subscription> onSubscribe) {
6464
super(onSubscribe);
6565
}
6666

@@ -76,10 +76,10 @@ private BlockingObservable() {
7676
* Convert an Observable into a BlockingObservable.
7777
*/
7878
public static <T> BlockingObservable<T> from(final Observable<T> o) {
79-
return new BlockingObservable<T>(new Func1<Observer<T>, Subscription>() {
79+
return new BlockingObservable<T>(new Func1<Observer<? super T>, Subscription>() {
8080

8181
@Override
82-
public Subscription call(Observer<T> observer) {
82+
public Subscription call(Observer<? super T> observer) {
8383
return o.subscribe(observer);
8484
}
8585
});
@@ -784,10 +784,10 @@ public void testToIterable() {
784784

785785
@Test(expected = TestException.class)
786786
public void testToIterableWithException() {
787-
BlockingObservable<String> obs = BlockingObservable.from(create(new Func1<Observer<String>, Subscription>() {
787+
BlockingObservable<String> obs = BlockingObservable.from(create(new Func1<Observer<? super String>, Subscription>() {
788788

789789
@Override
790-
public Subscription call(Observer<String> observer) {
790+
public Subscription call(Observer<? super String> observer) {
791791
observer.onNext("one");
792792
observer.onError(new TestException());
793793
return Subscriptions.empty();
@@ -807,10 +807,10 @@ public Subscription call(Observer<String> observer) {
807807
@Test
808808
public void testForEachWithError() {
809809
try {
810-
BlockingObservable.from(Observable.create(new Func1<Observer<String>, Subscription>() {
810+
BlockingObservable.from(Observable.create(new Func1<Observer<? super String>, Subscription>() {
811811

812812
@Override
813-
public Subscription call(final Observer<String> observer) {
813+
public Subscription call(final Observer<? super String> observer) {
814814
final BooleanSubscription subscription = new BooleanSubscription();
815815
new Thread(new Runnable() {
816816

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
public abstract class ConnectableObservable<T> extends Observable<T> {
3939

40-
protected ConnectableObservable(Func1<? super Observer<T>, ? extends Subscription> onSubscribe) {
40+
protected ConnectableObservable(Func1<? super Observer<? super T>, ? extends Subscription> onSubscribe) {
4141
super(onSubscribe);
4242
}
4343

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
public class GroupedObservable<K, T> extends Observable<T> {
3333
private final K key;
3434

35-
public GroupedObservable(K key, Func1<? super Observer<T>, ? extends Subscription> onSubscribe) {
35+
public GroupedObservable(K key, Func1<? super Observer<? super T>, ? extends Subscription> onSubscribe) {
3636
super(onSubscribe);
3737
this.key = key;
3838
}

‎rxjava-core/src/main/java/rx/operators/OperationAll.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@
3434
*/
3535
public class OperationAll {
3636

37-
public static <T> Func1<Observer<Boolean>, Subscription> all(Observable<T> sequence, Func1<? super T, Boolean> predicate) {
37+
public static <T> Func1<Observer<? super Boolean>, Subscription> all(Observable<T> sequence, Func1<? super T, Boolean> predicate) {
3838
return new AllObservable<T>(sequence, predicate);
3939
}
4040

41-
private static class AllObservable<T> implements Func1<Observer<Boolean>, Subscription> {
41+
private static class AllObservable<T> implements Func1<Observer<? super Boolean>, Subscription> {
4242
private final Observable<T> sequence;
4343
private final Func1<? super T, Boolean> predicate;
4444

@@ -52,17 +52,17 @@ private AllObservable(Observable<T> sequence, Func1<? super T, Boolean> predicat
5252

5353

5454
@Override
55-
public Subscription call(final Observer<Boolean> observer) {
55+
public Subscription call(final Observer<? super Boolean> observer) {
5656
return subscription.wrap(sequence.subscribe(new AllObserver(observer)));
5757

5858
}
5959

6060
private class AllObserver implements Observer<T> {
61-
private final Observer<Boolean> underlying;
61+
private final Observer<? super Boolean> underlying;
6262

6363
private final AtomicBoolean status = new AtomicBoolean(true);
6464

65-
public AllObserver(Observer<Boolean> underlying) {
65+
public AllObserver(Observer<? super Boolean> underlying) {
6666
this.underlying = underlying;
6767
}
6868

0 commit comments

Comments
 (0)