Skip to content

Commit 26ca287

Browse files
abersnazebenjchristensen
authored andcommitted
black magic applied.
1 parent 158ec87 commit 26ca287

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,14 +192,14 @@ public void call(Subscriber<? super R> o) {
192192
* @param transformer
193193
* @return
194194
*/
195-
public <R> Observable<R> compose(Transformer<T, R> transformer) {
195+
public <R> Observable<? extends R> compose(Transformer<? super T, ? extends R> transformer) {
196196
return transformer.call(this);
197197
}
198198

199199
/**
200200
* Transformer function for `compose`
201201
*/
202-
public static interface Transformer<T, R> extends Func1<Observable<T>, Observable<R>> {
202+
public static interface Transformer<T, R> extends Func1<Observable<? extends T>, Observable<? extends R>> {
203203
// cover for generics insanity
204204
}
205205

rxjava-core/src/test/java/rx/CovarianceTest.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public void testCovarianceOfCompose() {
6565
movie.compose(new Transformer<Movie, Movie>() {
6666

6767
@Override
68-
public Observable<Movie> call(Observable<Movie> t1) {
68+
public Observable<? extends Movie> call(Observable<? extends Movie> t1) {
6969
return Observable.from(new Movie());
7070
}
7171

@@ -76,12 +76,10 @@ public Observable<Movie> call(Observable<Movie> t1) {
7676
public void testCovarianceOfCompose2() {
7777
Observable<Movie> movie = Observable.<Movie> from(new HorrorMovie());
7878
movie.compose(new Transformer<Movie, Movie>() {
79-
8079
@Override
81-
public Observable<Movie> call(Observable<Movie> t1) {
80+
public Observable<? extends Movie> call(Observable<? extends Movie> t1) {
8281
return Observable.from(new HorrorMovie());
8382
}
84-
8583
});
8684
}
8785

rxjava-core/src/test/java/rx/ObservableTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1108,9 +1108,9 @@ public void testCompose() {
11081108
Observable.from(1, 2, 3).compose(new Transformer<Integer, String>() {
11091109

11101110
@Override
1111-
public Observable<String> call(Observable<Integer> t1) {
1111+
public Observable<? extends String> call(Observable<? extends Integer> t1) {
11121112
return t1.map(new Func1<Integer, String>() {
1113-
1113+
11141114
@Override
11151115
public String call(Integer t1) {
11161116
return String.valueOf(t1);

0 commit comments

Comments
 (0)