from(T) -> just(T)

See ReactiveX#1563 for discussion.
benjchristensen · Aug 14, 2014 · d71b764 · d71b764
1 parent 2144fe4
commit d71b764
Show file tree

Hide file tree

Showing 78 changed files with 698 additions and 408 deletions.
diff --git a/rxjava-core/src/main/java/rx/Observable.java b/rxjava-core/src/main/java/rx/Observable.java
diff --git a/rxjava-core/src/main/java/rx/internal/operators/OperatorSequenceEqual.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorSequenceEqual.java
@@ -16,7 +16,7 @@
 package rx.internal.operators;
 
 import static rx.Observable.concat;
-import static rx.Observable.from;
+import static rx.Observable.just;
 import static rx.Observable.zip;
 import rx.Observable;
 import rx.functions.Func1;
@@ -43,7 +43,7 @@ public Object call(T t1) {
                         return t1;
                     }
 
-                }), from(LOCAL_ONCOMPLETED));
+                }), just(LOCAL_ONCOMPLETED));
     }
 
     /**

diff --git a/rxjava-core/src/test/java/rx/CombineLatestTests.java b/rxjava-core/src/test/java/rx/CombineLatestTests.java
@@ -33,8 +33,8 @@ public class CombineLatestTests {
      */
     @Test
     public void testCovarianceOfCombineLatest() {
-        Observable<HorrorMovie> horrors = Observable.from(new HorrorMovie());
-        Observable<CoolRating> ratings = Observable.from(new CoolRating());
+        Observable<HorrorMovie> horrors = Observable.just(new HorrorMovie());
+        Observable<CoolRating> ratings = Observable.just(new CoolRating());
 
         Observable.<Movie, CoolRating, Result> combineLatest(horrors, ratings, combine).toBlocking().forEach(action);
         Observable.<Movie, CoolRating, Result> combineLatest(horrors, ratings, combine).toBlocking().forEach(action);

diff --git a/rxjava-core/src/test/java/rx/ConcatTests.java b/rxjava-core/src/test/java/rx/ConcatTests.java
@@ -31,8 +31,8 @@ public class ConcatTests {
 
     @Test
     public void testConcatSimple() {
-        Observable<String> o1 = Observable.from("one", "two");
-        Observable<String> o2 = Observable.from("three", "four");
+        Observable<String> o1 = Observable.just("one", "two");
+        Observable<String> o2 = Observable.just("three", "four");
 
         List<String> values = Observable.concat(o1, o2).toList().toBlocking().single();
 
@@ -44,11 +44,11 @@ public void testConcatSimple() {
 
     @Test
     public void testConcatWithObservableOfObservable() {
-        Observable<String> o1 = Observable.from("one", "two");
-        Observable<String> o2 = Observable.from("three", "four");
-        Observable<String> o3 = Observable.from("five", "six");
+        Observable<String> o1 = Observable.just("one", "two");
+        Observable<String> o2 = Observable.just("three", "four");
+        Observable<String> o3 = Observable.just("five", "six");
 
-        Observable<Observable<String>> os = Observable.from(o1, o2, o3);
+        Observable<Observable<String>> os = Observable.just(o1, o2, o3);
 
         List<String> values = Observable.concat(os).toList().toBlocking().single();
 
@@ -62,9 +62,9 @@ public void testConcatWithObservableOfObservable() {
 
     @Test
     public void testConcatWithIterableOfObservable() {
-        Observable<String> o1 = Observable.from("one", "two");
-        Observable<String> o2 = Observable.from("three", "four");
-        Observable<String> o3 = Observable.from("five", "six");
+        Observable<String> o1 = Observable.just("one", "two");
+        Observable<String> o2 = Observable.just("three", "four");
+        Observable<String> o3 = Observable.just("five", "six");
 
         @SuppressWarnings("unchecked")
         Iterable<Observable<String>> is = Arrays.asList(o1, o2, o3);
@@ -86,10 +86,10 @@ public void testConcatCovariance() {
     	Media media = new Media();
     	HorrorMovie horrorMovie2 = new HorrorMovie();
 
-        Observable<Media> o1 = Observable.<Media> from(horrorMovie1, movie);
-        Observable<Media> o2 = Observable.from(media, horrorMovie2);
+        Observable<Media> o1 = Observable.<Media> just(horrorMovie1, movie);
+        Observable<Media> o2 = Observable.just(media, horrorMovie2);
 
-        Observable<Observable<Media>> os = Observable.from(o1, o2);
+        Observable<Observable<Media>> os = Observable.just(o1, o2);
 
         List<Media> values = Observable.concat(os).toList().toBlocking().single();
 
@@ -108,10 +108,10 @@ public void testConcatCovariance2() {
     	Media media2 = new Media();
     	HorrorMovie horrorMovie2 = new HorrorMovie();
 
-        Observable<Media> o1 = Observable.from(horrorMovie1, movie, media1);
-        Observable<Media> o2 = Observable.from(media2, horrorMovie2);
+        Observable<Media> o1 = Observable.just(horrorMovie1, movie, media1);
+        Observable<Media> o2 = Observable.just(media2, horrorMovie2);
 
-        Observable<Observable<Media>> os = Observable.from(o1, o2);
+        Observable<Observable<Media>> os = Observable.just(o1, o2);
 
         List<Media> values = Observable.concat(os).toList().toBlocking().single();
 
@@ -130,8 +130,8 @@ public void testConcatCovariance3() {
     	Media media = new Media();
     	HorrorMovie horrorMovie2 = new HorrorMovie();
 
-        Observable<Movie> o1 = Observable.from(horrorMovie1, movie);
-        Observable<Media> o2 = Observable.from(media, horrorMovie2);
+        Observable<Movie> o1 = Observable.just(horrorMovie1, movie);
+        Observable<Media> o2 = Observable.just(media, horrorMovie2);
 
         List<Media> values = Observable.concat(o1, o2).toList().toBlocking().single();
 
@@ -160,7 +160,7 @@ public void call(Subscriber<? super Movie> o) {
             }
         });
 
-        Observable<Media> o2 = Observable.from(media, horrorMovie2);
+        Observable<Media> o2 = Observable.just(media, horrorMovie2);
 
         List<Media> values = Observable.concat(o1, o2).toList().toBlocking().single();
 

diff --git a/rxjava-core/src/test/java/rx/CovarianceTest.java b/rxjava-core/src/test/java/rx/CovarianceTest.java
@@ -33,7 +33,7 @@ public class CovarianceTest {
      */
     @Test
     public void testCovarianceOfFrom() {
-        Observable.<Movie> from(new HorrorMovie());
+        Observable.<Movie> just(new HorrorMovie());
         Observable.<Movie> from(new ArrayList<HorrorMovie>());
         // Observable.<HorrorMovie>from(new Movie()); // may not compile
     }
@@ -49,11 +49,11 @@ public Integer call(Media t1, Media t2) {
         };
 
         // this one would work without the covariance generics
-        Observable<Media> o = Observable.from(new Movie(), new TVSeason(), new Album());
+        Observable<Media> o = Observable.just(new Movie(), new TVSeason(), new Album());
         o.toSortedList(SORT_FUNCTION);
 
         // this one would NOT work without the covariance generics
-        Observable<Movie> o2 = Observable.from(new Movie(), new ActionMovie(), new HorrorMovie());
+        Observable<Movie> o2 = Observable.just(new Movie(), new ActionMovie(), new HorrorMovie());
         o2.toSortedList(SORT_FUNCTION);
     }
 

diff --git a/rxjava-core/src/test/java/rx/MergeTests.java b/rxjava-core/src/test/java/rx/MergeTests.java
@@ -34,17 +34,17 @@ public class MergeTests {
      */
     @Test
     public void testCovarianceOfMerge() {
-        Observable<HorrorMovie> horrors = Observable.from(new HorrorMovie());
+        Observable<HorrorMovie> horrors = Observable.just(new HorrorMovie());
         Observable<Observable<HorrorMovie>> metaHorrors = Observable.just(horrors);
         Observable.<Media> merge(metaHorrors);
     }
 
     @Test
     public void testMergeCovariance() {
-        Observable<Media> o1 = Observable.<Media> from(new HorrorMovie(), new Movie());
-        Observable<Media> o2 = Observable.from(new Media(), new HorrorMovie());
+        Observable<Media> o1 = Observable.<Media> just(new HorrorMovie(), new Movie());
+        Observable<Media> o2 = Observable.just(new Media(), new HorrorMovie());
 
-        Observable<Observable<Media>> os = Observable.from(o1, o2);
+        Observable<Observable<Media>> os = Observable.just(o1, o2);
 
         List<Media> values = Observable.merge(os).toList().toBlocking().single();
 
@@ -53,10 +53,10 @@ public void testMergeCovariance() {
 
     @Test
     public void testMergeCovariance2() {
-        Observable<Media> o1 = Observable.from(new HorrorMovie(), new Movie(), new Media());
-        Observable<Media> o2 = Observable.from(new Media(), new HorrorMovie());
+        Observable<Media> o1 = Observable.just(new HorrorMovie(), new Movie(), new Media());
+        Observable<Media> o2 = Observable.just(new Media(), new HorrorMovie());
 
-        Observable<Observable<Media>> os = Observable.from(o1, o2);
+        Observable<Observable<Media>> os = Observable.just(o1, o2);
 
         List<Media> values = Observable.merge(os).toList().toBlocking().single();
 
@@ -65,8 +65,8 @@ public void testMergeCovariance2() {
 
     @Test
     public void testMergeCovariance3() {
-        Observable<Movie> o1 = Observable.from(new HorrorMovie(), new Movie());
-        Observable<Media> o2 = Observable.from(new Media(), new HorrorMovie());
+        Observable<Movie> o1 = Observable.just(new HorrorMovie(), new Movie());
+        Observable<Media> o2 = Observable.just(new Media(), new HorrorMovie());
 
         List<Media> values = Observable.merge(o1, o2).toList().toBlocking().single();
 
@@ -90,7 +90,7 @@ public void call(Subscriber<? super Movie> o) {
             }
         });
 
-        Observable<Media> o2 = Observable.from(new Media(), new HorrorMovie());
+        Observable<Media> o2 = Observable.just(new Media(), new HorrorMovie());
 
         List<Media> values = Observable.merge(o1, o2).toList().toBlocking().single();
 

diff --git a/rxjava-core/src/test/java/rx/ObservableDoOnTest.java b/rxjava-core/src/test/java/rx/ObservableDoOnTest.java
@@ -33,7 +33,7 @@ public class ObservableDoOnTest {
     @Test
     public void testDoOnEach() {
         final AtomicReference<String> r = new AtomicReference<String>();
-        String output = Observable.from("one").doOnNext(new Action1<String>() {
+        String output = Observable.just("one").doOnNext(new Action1<String>() {
 
             @Override
             public void call(String v) {
@@ -69,7 +69,7 @@ public void call(Throwable v) {
     @Test
     public void testDoOnCompleted() {
         final AtomicBoolean r = new AtomicBoolean();
-        String output = Observable.from("one").doOnCompleted(new Action0() {
+        String output = Observable.just("one").doOnCompleted(new Action0() {
 
             @Override
             public void call() {