Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change Transformer to Func1<Observable<T>, Observable<R>> #1778

Merged
merged 1 commit into from
Oct 20, 2014
Merged

Change Transformer to Func1<Observable<T>, Observable<R>> #1778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/main/java/rx/Observable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,17 +174,15 @@ public void call(Subscriber<? super R> o) {
* @return the source Observable, transformed by the transformer function
* @see <a href="https://github.com/ReactiveX/RxJava/wiki/Implementing-Your-Own-Operators">RxJava wiki: Implementing Your Own Operators</a>
*/
@SuppressWarnings("unchecked")
public <R> Observable<R> compose(Transformer<? super T, ? extends R> transformer) {
// Casting to Observable<R> is type-safe because we know Observable is covariant.
return (Observable<R>) ((Transformer<T, ? extends R>) transformer).call(this);
return ((Transformer<T, R>) transformer).call(this);
}

/**
* Transformer function used by {@link #compose}.
* @warn more complete description needed
*/
public static interface Transformer<T, R> extends Func1<Observable<T>, Observable<? extends R>> {
public static interface Transformer<T, R> extends Func1<Observable<T>, Observable<R>> {
// cover for generics insanity
}

Expand Down
10 changes: 5 additions & 5 deletions src/test/java/rx/CovarianceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public Observable<String> call(GroupedObservable<Class<? extends Movie>, Movie>
return g.compose(new Transformer<Movie, Movie>() {

@Override
public Observable<? extends Movie> call(Observable<Movie> m) {
public Observable<Movie> call(Observable<Movie> m) {
return m.concatWith(Observable.just(new ActionMovie()));
}

Expand All @@ -112,7 +112,7 @@ public void testCovarianceOfCompose() {
Observable<Movie> movie2 = movie.compose(new Transformer<Movie, Movie>() {

@Override
public Observable<? extends Movie> call(Observable<Movie> t1) {
public Observable<Movie> call(Observable<Movie> t1) {
return Observable.just(new Movie());
}

Expand All @@ -124,7 +124,7 @@ public void testCovarianceOfCompose2() {
Observable<Movie> movie = Observable.<Movie> just(new HorrorMovie());
Observable<HorrorMovie> movie2 = movie.compose(new Transformer<Movie, HorrorMovie>() {
@Override
public Observable<? extends HorrorMovie> call(Observable<Movie> t1) {
public Observable<HorrorMovie> call(Observable<Movie> t1) {
return Observable.just(new HorrorMovie());
}
});
Expand All @@ -135,7 +135,7 @@ public void testCovarianceOfCompose3() {
Observable<Movie> movie = Observable.<Movie>just(new HorrorMovie());
Observable<HorrorMovie> movie2 = movie.compose(new Transformer<Movie, HorrorMovie>() {
@Override
public Observable<? extends HorrorMovie> call(Observable<Movie> t1) {
public Observable<HorrorMovie> call(Observable<Movie> t1) {
return Observable.just(new HorrorMovie()).map(new Func1<HorrorMovie, HorrorMovie>() {

@Override
Expand All @@ -152,7 +152,7 @@ public void testCovarianceOfCompose4() {
Observable<HorrorMovie> movie = Observable.just(new HorrorMovie());
Observable<HorrorMovie> movie2 = movie.compose(new Transformer<HorrorMovie, HorrorMovie>() {
@Override
public Observable<? extends HorrorMovie> call(Observable<HorrorMovie> t1) {
public Observable<HorrorMovie> call(Observable<HorrorMovie> t1) {
return t1.map(new Func1<HorrorMovie, HorrorMovie>() {

@Override
Expand Down