Merge pull request #1621 from benjchristensen/deprecation-removal

Deprecation Removal
ReactiveX · Aug 21, 2014 · 1190e30 · 1190e30
2 parents 2277236 + 22048a3
commit 1190e30
Show file tree

Hide file tree

Showing 28 changed files with 116 additions and 1,317 deletions.
diff --git a/rxjava-contrib/rxjava-async-util/src/test/java/rx/util/async/AsyncTest.java b/rxjava-contrib/rxjava-async-util/src/test/java/rx/util/async/AsyncTest.java
@@ -705,7 +705,7 @@ public String call() {
                 return "one";
             }
         };
-        assertEquals("one", Async.start(func).toBlockingObservable().single());
+        assertEquals("one", Async.start(func).toBlocking().single());
     }
 
     @Test(expected = RuntimeException.class)
@@ -716,7 +716,7 @@ public String call() {
                 throw new RuntimeException("Some error");
             }
         };
-        Async.start(func).toBlockingObservable().single();
+        Async.start(func).toBlocking().single();
     }
 
     @Test

diff --git a/...trib/rxjava-async-util/src/test/java/rx/util/async/operators/OperatorDeferFutureTest.java b/...trib/rxjava-async-util/src/test/java/rx/util/async/operators/OperatorDeferFutureTest.java
@@ -56,7 +56,7 @@ public Observable<Integer> call() throws Exception {
                             if (!ready.await(1000, TimeUnit.MILLISECONDS)) {
                                 throw new IllegalStateException("Not started in time");
                             }
-                            return Observable.from(1);
+                            return Observable.just(1);
                         }
                     });
                 }

diff --git a/...ib/rxjava-async-util/src/test/java/rx/util/async/operators/OperatorForEachFutureTest.java b/...ib/rxjava-async-util/src/test/java/rx/util/async/operators/OperatorForEachFutureTest.java
@@ -55,7 +55,7 @@ public void testSimple() {
         final ExecutorService exec = Executors.newCachedThreadPool();
 
         try {
-            Observable<Integer> source = Observable.from(1, 2, 3)
+            Observable<Integer> source = Observable.just(1, 2, 3)
                     .subscribeOn(Schedulers.computation());
 
             final AtomicInteger sum = new AtomicInteger();
@@ -128,7 +128,7 @@ public void call(Integer t1) {
 
     @Test
     public void testSimpleScheduled() {
-        Observable<Integer> source = Observable.from(1, 2, 3)
+        Observable<Integer> source = Observable.just(1, 2, 3)
                 .subscribeOn(Schedulers.computation());
 
         final AtomicInteger sum = new AtomicInteger();

diff --git a/rxjava-contrib/rxjava-computation-expressions/src/main/java/rx/Statement.java b/rxjava-contrib/rxjava-computation-expressions/src/main/java/rx/Statement.java
@@ -74,7 +74,7 @@ public static <K, R> Observable<R> switchCase(Func0<? extends K> caseSelector,
      */
     public static <K, R> Observable<R> switchCase(Func0<? extends K> caseSelector,
             Map<? super K, ? extends Observable<? extends R>> mapOfCases, Scheduler scheduler) {
-        return switchCase(caseSelector, mapOfCases, Observable.<R> empty(scheduler));
+        return switchCase(caseSelector, mapOfCases, Observable.<R> empty().subscribeOn(scheduler));
     }
 
     /**
@@ -179,7 +179,7 @@ public static <R> Observable<R> ifThen(Func0<Boolean> condition, Observable<? ex
      *         Observable running on the specified Scheduler otherwise
      */
     public static <R> Observable<R> ifThen(Func0<Boolean> condition, Observable<? extends R> then, Scheduler scheduler) {
-        return ifThen(condition, then, Observable.<R> empty(scheduler));
+        return ifThen(condition, then, Observable.<R> empty().subscribeOn(scheduler));
     }
 
     /**

diff --git a/...b/rxjava-computation-expressions/src/test/java/rx/operators/OperatorConditionalsTest.java b/...b/rxjava-computation-expressions/src/test/java/rx/operators/OperatorConditionalsTest.java
@@ -184,8 +184,8 @@ <T> void observeSequenceError(Observable<? extends T> source, Class<? extends Th
 
     @Test
     public void testSimple() {
-        Observable<Integer> source1 = Observable.from(1, 2, 3);
-        Observable<Integer> source2 = Observable.from(4, 5, 6);
+        Observable<Integer> source1 = Observable.just(1, 2, 3);
+        Observable<Integer> source2 = Observable.just(4, 5, 6);
 
         Map<Integer, Observable<Integer>> map = new HashMap<Integer, Observable<Integer>>();
         map.put(1, source1);
@@ -200,8 +200,8 @@ public void testSimple() {
 
     @Test
     public void testDefaultCase() {
-        Observable<Integer> source1 = Observable.from(1, 2, 3);
-        Observable<Integer> source2 = Observable.from(4, 5, 6);
+        Observable<Integer> source1 = Observable.just(1, 2, 3);
+        Observable<Integer> source2 = Observable.just(4, 5, 6);
 
         Map<Integer, Observable<Integer>> map = new HashMap<Integer, Observable<Integer>>();
         map.put(1, source1);
@@ -215,7 +215,7 @@ public void testDefaultCase() {
 
     @Test
     public void testCaseSelectorThrows() {
-        Observable<Integer> source1 = Observable.from(1, 2, 3);
+        Observable<Integer> source1 = Observable.just(1, 2, 3);
 
         Map<Integer, Observable<Integer>> map = new HashMap<Integer, Observable<Integer>>();
         map.put(1, source1);
@@ -228,8 +228,8 @@ public void testCaseSelectorThrows() {
 
     @Test
     public void testMapGetThrows() {
-        Observable<Integer> source1 = Observable.from(1, 2, 3);
-        Observable<Integer> source2 = Observable.from(4, 5, 6);
+        Observable<Integer> source1 = Observable.just(1, 2, 3);
+        Observable<Integer> source2 = Observable.just(4, 5, 6);
 
         Map<Integer, Observable<Integer>> map = new HashMap<Integer, Observable<Integer>>() {
             private static final long serialVersionUID = -4342868139960216388L;
@@ -254,7 +254,7 @@ public Observable<Integer> get(Object key) {
 
     @Test
     public void testMapContainsKeyThrows() {
-        Observable<Integer> source1 = Observable.from(1, 2, 3);
+        Observable<Integer> source1 = Observable.just(1, 2, 3);
 
         Map<Integer, Observable<Integer>> map = new HashMap<Integer, Observable<Integer>>() {
             private static final long serialVersionUID = 1975411728567003983L;
@@ -278,7 +278,7 @@ public boolean containsKey(Object key) {
 
     @Test
     public void testChosenObservableThrows() {
-        Observable<Integer> source1 = Observable.from(1, 2, 3);
+        Observable<Integer> source1 = Observable.just(1, 2, 3);
         Observable<Integer> source2 = Observable.error(new RuntimeException("Forced failure"));
 
         Map<Integer, Observable<Integer>> map = new HashMap<Integer, Observable<Integer>>();
@@ -293,7 +293,7 @@ public void testChosenObservableThrows() {
 
     @Test
     public void testIfThen() {
-        Observable<Integer> source1 = Observable.from(1, 2, 3);
+        Observable<Integer> source1 = Observable.just(1, 2, 3);
 
         Observable<Integer> result = Statement.ifThen(condition, source1);
 
@@ -305,8 +305,8 @@ public void testIfThen() {
 
     @Test
     public void testIfThenElse() {
-        Observable<Integer> source1 = Observable.from(1, 2, 3);
-        Observable<Integer> source2 = Observable.from(4, 5, 6);
+        Observable<Integer> source1 = Observable.just(1, 2, 3);
+        Observable<Integer> source2 = Observable.just(4, 5, 6);
 
         Observable<Integer> result = Statement.ifThen(condition, source1, source2);
 
@@ -318,7 +318,7 @@ public void testIfThenElse() {
 
     @Test
     public void testIfThenConditonThrows() {
-        Observable<Integer> source1 = Observable.from(1, 2, 3);
+        Observable<Integer> source1 = Observable.just(1, 2, 3);
 
         Observable<Integer> result = Statement.ifThen(conditionError, source1);
 
@@ -343,7 +343,7 @@ public void testIfThenObservableThrows() {
 
     @Test
     public void testIfThenElseObservableThrows() {
-        Observable<Integer> source1 = Observable.from(1, 2, 3);
+        Observable<Integer> source1 = Observable.just(1, 2, 3);
         Observable<Integer> source2 = Observable.error(new RuntimeException("Forced failure!"));
 
         Observable<Integer> result = Statement.ifThen(condition, source1, source2);
@@ -356,7 +356,7 @@ public void testIfThenElseObservableThrows() {
 
     @Test
     public void testDoWhile() {
-        Observable<Integer> source1 = Observable.from(1, 2, 3);
+        Observable<Integer> source1 = Observable.just(1, 2, 3);
 
         Observable<Integer> result = Statement.doWhile(source1, condition);
 
@@ -365,7 +365,7 @@ public void testDoWhile() {
 
     @Test
     public void testDoWhileOnce() {
-        Observable<Integer> source1 = Observable.from(1, 2, 3);
+        Observable<Integer> source1 = Observable.just(1, 2, 3);
 
         condition.call(); // toggle to false
         Observable<Integer> result = Statement.doWhile(source1, condition);
@@ -375,15 +375,15 @@ public void testDoWhileOnce() {
 
     @Test
     public void testDoWhileConditionThrows() {
-        Observable<Integer> source1 = Observable.from(1, 2, 3);
+        Observable<Integer> source1 = Observable.just(1, 2, 3);
         Observable<Integer> result = Statement.doWhile(source1, conditionError);
 
         observeError(result, RuntimeException.class, 1, 2, 3);
     }
 
     @Test
     public void testDoWhileSourceThrows() {
-        Observable<Integer> source1 = Observable.concat(Observable.from(1, 2, 3),
+        Observable<Integer> source1 = Observable.concat(Observable.just(1, 2, 3),
                 Observable.<Integer> error(new RuntimeException("Forced failure!")));
 
         Observable<Integer> result = Statement.doWhile(source1, condition);
@@ -404,7 +404,7 @@ public Boolean call() {
 
     @Test
     public void testDoWhileManyTimes() {
-        Observable<Integer> source1 = Observable.from(1, 2, 3).subscribeOn(Schedulers.trampoline());
+        Observable<Integer> source1 = Observable.just(1, 2, 3).subscribeOn(Schedulers.trampoline());
 
         List<Integer> expected = new ArrayList<Integer>(numRecursion * 3);
         for (int i = 0; i < numRecursion; i++) {
@@ -420,31 +420,31 @@ public void testDoWhileManyTimes() {
 
     @Test
     public void testWhileDo() {
-        Observable<Integer> source1 = Observable.from(1, 2, 3);
+        Observable<Integer> source1 = Observable.just(1, 2, 3);
         Observable<Integer> result = Statement.whileDo(source1, countdown(2));
 
         observe(result, 1, 2, 3, 1, 2, 3);
     }
 
     @Test
     public void testWhileDoOnce() {
-        Observable<Integer> source1 = Observable.from(1, 2, 3);
+        Observable<Integer> source1 = Observable.just(1, 2, 3);
         Observable<Integer> result = Statement.whileDo(source1, countdown(1));
 
         observe(result, 1, 2, 3);
     }
 
     @Test
     public void testWhileDoZeroTimes() {
-        Observable<Integer> source1 = Observable.from(1, 2, 3);
+        Observable<Integer> source1 = Observable.just(1, 2, 3);
         Observable<Integer> result = Statement.whileDo(source1, countdown(0));
 
         observe(result);
     }
 
     @Test
     public void testWhileDoManyTimes() {
-        Observable<Integer> source1 = Observable.from(1, 2, 3).subscribeOn(Schedulers.trampoline());
+        Observable<Integer> source1 = Observable.just(1, 2, 3).subscribeOn(Schedulers.trampoline());
 
         List<Integer> expected = new ArrayList<Integer>(numRecursion * 3);
         for (int i = 0; i < numRecursion; i++) {
@@ -460,15 +460,15 @@ public void testWhileDoManyTimes() {
 
     @Test
     public void testWhileDoConditionThrows() {
-        Observable<Integer> source1 = Observable.from(1, 2, 3);
+        Observable<Integer> source1 = Observable.just(1, 2, 3);
         Observable<Integer> result = Statement.whileDo(source1, conditionError);
 
         observeError(result, RuntimeException.class, 1, 2, 3);
     }
 
     @Test
     public void testWhileDoConditionThrowsImmediately() {
-        Observable<Integer> source1 = Observable.from(1, 2, 3);
+        Observable<Integer> source1 = Observable.just(1, 2, 3);
         conditionError.call();
         Observable<Integer> result = Statement.whileDo(source1, conditionError);
 
@@ -477,7 +477,7 @@ public void testWhileDoConditionThrowsImmediately() {
 
     @Test
     public void testWhileDoSourceThrows() {
-        Observable<Integer> source1 = Observable.concat(Observable.from(1, 2, 3),
+        Observable<Integer> source1 = Observable.concat(Observable.just(1, 2, 3),
                 Observable.<Integer> error(new RuntimeException("Forced failure!")));
 
         Observable<Integer> result = Statement.whileDo(source1, condition);

diff --git a/rxjava-contrib/rxjava-debug/src/test/java/rx/debug/DebugHookTest.java b/rxjava-contrib/rxjava-debug/src/test/java/rx/debug/DebugHookTest.java
@@ -95,7 +95,7 @@ public void testSimple() {
         final DebugHook hook = new DebugHook(listener);
         RxJavaPlugins.getInstance().registerObservableExecutionHook(hook);
 
-        Observable.from(1).subscribe(Subscribers.empty());
+        Observable.just(1).subscribe(Subscribers.empty());
 
         final InOrder inOrder = inOrder(listener);
         inOrder.verify(listener).start(subscribe());

diff --git a/rxjava-contrib/rxjava-joins/src/test/java/rx/joins/operators/OperatorJoinsTest.java b/rxjava-contrib/rxjava-joins/src/test/java/rx/joins/operators/OperatorJoinsTest.java
@@ -386,8 +386,8 @@ public void whenArgumentNull2() {
 
     @Test
     public void whenMultipleSymmetric() {
-        Observable<Integer> source1 = Observable.from(1, 2, 3);
-        Observable<Integer> source2 = Observable.from(4, 5, 6);
+        Observable<Integer> source1 = Observable.just(1, 2, 3);
+        Observable<Integer> source2 = Observable.just(4, 5, 6);
 
         Observable<Integer> m = JoinObservable.when(JoinObservable.from(source1).and(source2).then(add)).toObservable();
         m.subscribe(observer);
@@ -401,8 +401,8 @@ public void whenMultipleSymmetric() {
 
     @Test
     public void whenMultipleAsymSymmetric() {
-        Observable<Integer> source1 = Observable.from(1, 2, 3);
-        Observable<Integer> source2 = Observable.from(4, 5);
+        Observable<Integer> source1 = Observable.just(1, 2, 3);
+        Observable<Integer> source2 = Observable.just(4, 5);
 
         Observable<Integer> m = JoinObservable.when(JoinObservable.from(source1).and(source2).then(add)).toObservable();
         m.subscribe(observer);