Skip to content

Commit d71b764

Browse files
benjchristensenbenjchristensen
committed
from(T) -> just(T)
See #1563 for discussion.
1 parent 2144fe4 commit d71b764

File tree

78 files changed

+698
-408
lines changed

Some content is hidden

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

78 files changed

+698
-408
lines changed

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

Lines changed: 330 additions & 40 deletions
Large diffs are not rendered by default.

‎rxjava-core/src/main/java/rx/internal/operators/OperatorSequenceEqual.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package rx.internal.operators;
1717

1818
import static rx.Observable.concat;
19-
import static rx.Observable.from;
19+
import static rx.Observable.just;
2020
import static rx.Observable.zip;
2121
import rx.Observable;
2222
import rx.functions.Func1;
@@ -43,7 +43,7 @@ public Object call(T t1) {
4343
return t1;
4444
}
4545

46-
}), from(LOCAL_ONCOMPLETED));
46+
}), just(LOCAL_ONCOMPLETED));
4747
}
4848

4949
/**

‎rxjava-core/src/test/java/rx/CombineLatestTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ public class CombineLatestTests {
3333
*/
3434
@Test
3535
public void testCovarianceOfCombineLatest() {
36-
Observable<HorrorMovie> horrors = Observable.from(new HorrorMovie());
37-
Observable<CoolRating> ratings = Observable.from(new CoolRating());
36+
Observable<HorrorMovie> horrors = Observable.just(new HorrorMovie());
37+
Observable<CoolRating> ratings = Observable.just(new CoolRating());
3838

3939
Observable.<Movie, CoolRating, Result> combineLatest(horrors, ratings, combine).toBlocking().forEach(action);
4040
Observable.<Movie, CoolRating, Result> combineLatest(horrors, ratings, combine).toBlocking().forEach(action);

‎rxjava-core/src/test/java/rx/ConcatTests.java‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ public class ConcatTests {
3131

3232
@Test
3333
public void testConcatSimple() {
34-
Observable<String> o1 = Observable.from("one", "two");
35-
Observable<String> o2 = Observable.from("three", "four");
34+
Observable<String> o1 = Observable.just("one", "two");
35+
Observable<String> o2 = Observable.just("three", "four");
3636

3737
List<String> values = Observable.concat(o1, o2).toList().toBlocking().single();
3838

@@ -44,11 +44,11 @@ public void testConcatSimple() {
4444

4545
@Test
4646
public void testConcatWithObservableOfObservable() {
47-
Observable<String> o1 = Observable.from("one", "two");
48-
Observable<String> o2 = Observable.from("three", "four");
49-
Observable<String> o3 = Observable.from("five", "six");
47+
Observable<String> o1 = Observable.just("one", "two");
48+
Observable<String> o2 = Observable.just("three", "four");
49+
Observable<String> o3 = Observable.just("five", "six");
5050

51-
Observable<Observable<String>> os = Observable.from(o1, o2, o3);
51+
Observable<Observable<String>> os = Observable.just(o1, o2, o3);
5252

5353
List<String> values = Observable.concat(os).toList().toBlocking().single();
5454

@@ -62,9 +62,9 @@ public void testConcatWithObservableOfObservable() {
6262

6363
@Test
6464
public void testConcatWithIterableOfObservable() {
65-
Observable<String> o1 = Observable.from("one", "two");
66-
Observable<String> o2 = Observable.from("three", "four");
67-
Observable<String> o3 = Observable.from("five", "six");
65+
Observable<String> o1 = Observable.just("one", "two");
66+
Observable<String> o2 = Observable.just("three", "four");
67+
Observable<String> o3 = Observable.just("five", "six");
6868

6969
@SuppressWarnings("unchecked")
7070
Iterable<Observable<String>> is = Arrays.asList(o1, o2, o3);
@@ -86,10 +86,10 @@ public void testConcatCovariance() {
8686
Media media = new Media();
8787
HorrorMovie horrorMovie2 = new HorrorMovie();
8888

89-
Observable<Media> o1 = Observable.<Media> from(horrorMovie1, movie);
90-
Observable<Media> o2 = Observable.from(media, horrorMovie2);
89+
Observable<Media> o1 = Observable.<Media> just(horrorMovie1, movie);
90+
Observable<Media> o2 = Observable.just(media, horrorMovie2);
9191

92-
Observable<Observable<Media>> os = Observable.from(o1, o2);
92+
Observable<Observable<Media>> os = Observable.just(o1, o2);
9393

9494
List<Media> values = Observable.concat(os).toList().toBlocking().single();
9595

@@ -108,10 +108,10 @@ public void testConcatCovariance2() {
108108
Media media2 = new Media();
109109
HorrorMovie horrorMovie2 = new HorrorMovie();
110110

111-
Observable<Media> o1 = Observable.from(horrorMovie1, movie, media1);
112-
Observable<Media> o2 = Observable.from(media2, horrorMovie2);
111+
Observable<Media> o1 = Observable.just(horrorMovie1, movie, media1);
112+
Observable<Media> o2 = Observable.just(media2, horrorMovie2);
113113

114-
Observable<Observable<Media>> os = Observable.from(o1, o2);
114+
Observable<Observable<Media>> os = Observable.just(o1, o2);
115115

116116
List<Media> values = Observable.concat(os).toList().toBlocking().single();
117117

@@ -130,8 +130,8 @@ public void testConcatCovariance3() {
130130
Media media = new Media();
131131
HorrorMovie horrorMovie2 = new HorrorMovie();
132132

133-
Observable<Movie> o1 = Observable.from(horrorMovie1, movie);
134-
Observable<Media> o2 = Observable.from(media, horrorMovie2);
133+
Observable<Movie> o1 = Observable.just(horrorMovie1, movie);
134+
Observable<Media> o2 = Observable.just(media, horrorMovie2);
135135

136136
List<Media> values = Observable.concat(o1, o2).toList().toBlocking().single();
137137

@@ -160,7 +160,7 @@ public void call(Subscriber<? super Movie> o) {
160160
}
161161
});
162162

163-
Observable<Media> o2 = Observable.from(media, horrorMovie2);
163+
Observable<Media> o2 = Observable.just(media, horrorMovie2);
164164

165165
List<Media> values = Observable.concat(o1, o2).toList().toBlocking().single();
166166

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public class CovarianceTest {
3333
*/
3434
@Test
3535
public void testCovarianceOfFrom() {
36-
Observable.<Movie> from(new HorrorMovie());
36+
Observable.<Movie> just(new HorrorMovie());
3737
Observable.<Movie> from(new ArrayList<HorrorMovie>());
3838
// Observable.<HorrorMovie>from(new Movie()); // may not compile
3939
}
@@ -49,11 +49,11 @@ public Integer call(Media t1, Media t2) {
4949
};
5050

5151
// this one would work without the covariance generics
52-
Observable<Media> o = Observable.from(new Movie(), new TVSeason(), new Album());
52+
Observable<Media> o = Observable.just(new Movie(), new TVSeason(), new Album());
5353
o.toSortedList(SORT_FUNCTION);
5454

5555
// this one would NOT work without the covariance generics
56-
Observable<Movie> o2 = Observable.from(new Movie(), new ActionMovie(), new HorrorMovie());
56+
Observable<Movie> o2 = Observable.just(new Movie(), new ActionMovie(), new HorrorMovie());
5757
o2.toSortedList(SORT_FUNCTION);
5858
}
5959

‎rxjava-core/src/test/java/rx/MergeTests.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,17 @@ public class MergeTests {
3434
*/
3535
@Test
3636
public void testCovarianceOfMerge() {
37-
Observable<HorrorMovie> horrors = Observable.from(new HorrorMovie());
37+
Observable<HorrorMovie> horrors = Observable.just(new HorrorMovie());
3838
Observable<Observable<HorrorMovie>> metaHorrors = Observable.just(horrors);
3939
Observable.<Media> merge(metaHorrors);
4040
}
4141

4242
@Test
4343
public void testMergeCovariance() {
44-
Observable<Media> o1 = Observable.<Media> from(new HorrorMovie(), new Movie());
45-
Observable<Media> o2 = Observable.from(new Media(), new HorrorMovie());
44+
Observable<Media> o1 = Observable.<Media> just(new HorrorMovie(), new Movie());
45+
Observable<Media> o2 = Observable.just(new Media(), new HorrorMovie());
4646

47-
Observable<Observable<Media>> os = Observable.from(o1, o2);
47+
Observable<Observable<Media>> os = Observable.just(o1, o2);
4848

4949
List<Media> values = Observable.merge(os).toList().toBlocking().single();
5050

@@ -53,10 +53,10 @@ public void testMergeCovariance() {
5353

5454
@Test
5555
public void testMergeCovariance2() {
56-
Observable<Media> o1 = Observable.from(new HorrorMovie(), new Movie(), new Media());
57-
Observable<Media> o2 = Observable.from(new Media(), new HorrorMovie());
56+
Observable<Media> o1 = Observable.just(new HorrorMovie(), new Movie(), new Media());
57+
Observable<Media> o2 = Observable.just(new Media(), new HorrorMovie());
5858

59-
Observable<Observable<Media>> os = Observable.from(o1, o2);
59+
Observable<Observable<Media>> os = Observable.just(o1, o2);
6060

6161
List<Media> values = Observable.merge(os).toList().toBlocking().single();
6262

@@ -65,8 +65,8 @@ public void testMergeCovariance2() {
6565

6666
@Test
6767
public void testMergeCovariance3() {
68-
Observable<Movie> o1 = Observable.from(new HorrorMovie(), new Movie());
69-
Observable<Media> o2 = Observable.from(new Media(), new HorrorMovie());
68+
Observable<Movie> o1 = Observable.just(new HorrorMovie(), new Movie());
69+
Observable<Media> o2 = Observable.just(new Media(), new HorrorMovie());
7070

7171
List<Media> values = Observable.merge(o1, o2).toList().toBlocking().single();
7272

@@ -90,7 +90,7 @@ public void call(Subscriber<? super Movie> o) {
9090
}
9191
});
9292

93-
Observable<Media> o2 = Observable.from(new Media(), new HorrorMovie());
93+
Observable<Media> o2 = Observable.just(new Media(), new HorrorMovie());
9494

9595
List<Media> values = Observable.merge(o1, o2).toList().toBlocking().single();
9696

‎rxjava-core/src/test/java/rx/ObservableDoOnTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public class ObservableDoOnTest {
3333
@Test
3434
public void testDoOnEach() {
3535
final AtomicReference<String> r = new AtomicReference<String>();
36-
String output = Observable.from("one").doOnNext(new Action1<String>() {
36+
String output = Observable.just("one").doOnNext(new Action1<String>() {
3737

3838
@Override
3939
public void call(String v) {
@@ -69,7 +69,7 @@ public void call(Throwable v) {
6969
@Test
7070
public void testDoOnCompleted() {
7171
final AtomicBoolean r = new AtomicBoolean();
72-
String output = Observable.from("one").doOnCompleted(new Action0() {
72+
String output = Observable.just("one").doOnCompleted(new Action0() {
7373

7474
@Override
7575
public void call() {

0 commit comments

Comments
 (0)