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

Deprecate toBlockingObservable in favor of toBlocking #1233

Merged
merged 1 commit into from
May 20, 2014
Merged

Deprecate toBlockingObservable in favor of toBlocking #1233

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
7 changes: 4 additions & 3 deletions rxjava-core/src/main/java/rx/Observable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6949,21 +6949,22 @@ public final Observable<Timestamped<T>> timestamp(Scheduler scheduler) {
*
* @return a {@code BlockingObservable} version of this Observable
* @see <a href="https://github.com/Netflix/RxJava/wiki/Blocking-Observable-Operators">RxJava Wiki: Blocking Observable Observers</a>
*
* @deprecated Use {@link #toBlocking()} instead.
*/
@Deprecated
public final BlockingObservable<T> toBlockingObservable() {
return BlockingObservable.from(this);
}

/**
* Converts an Observable into a {@link BlockingObservable} (an Observable with blocking operators).
*
* This method is an alias for {@link #toBlockingObservable()}.
*
* @return a {@code BlockingObservable} version of this Observable
* @see <a href="https://github.com/Netflix/RxJava/wiki/Blocking-Observable-Operators">RxJava Wiki: Blocking Observable Observers</a>
*/
public final BlockingObservable<T> toBlocking() {
return toBlockingObservable();
return BlockingObservable.from(this);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion rxjava-core/src/main/java/rx/observables/BlockingObservable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
* An extension of {@link Observable} that provides blocking operators.
* <p>
* You construct a <code>BlockingObservable</code> from an
* <code>Observable</code> with {@link #from(Observable)} or {@link Observable#toBlockingObservable()} <p>
* <code>Observable</code> with {@link #from(Observable)} or {@link Observable#toBlocking()} <p>
* The documentation for this interface makes use of a form of marble diagram
* that has been modified to illustrate blocking operators. The following legend
* explains these marble diagrams:
Expand Down
2 changes: 1 addition & 1 deletion rxjava-core/src/perf/java/rx/archive/schedulers/TestRecursionMemoryUsage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,6 @@ public void call() {
}
});
}
}).toBlockingObservable().last();
}).toBlocking().last();
}
}
10 changes: 5 additions & 5 deletions rxjava-core/src/test/java/rx/CombineLatestTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ public void testCovarianceOfCombineLatest() {
Observable<HorrorMovie> horrors = Observable.from(new HorrorMovie());
Observable<CoolRating> ratings = Observable.from(new CoolRating());

Observable.<Movie, CoolRating, Result> combineLatest(horrors, ratings, combine).toBlockingObservable().forEach(action);
Observable.<Movie, CoolRating, Result> combineLatest(horrors, ratings, combine).toBlockingObservable().forEach(action);
Observable.<Media, Rating, ExtendedResult> combineLatest(horrors, ratings, combine).toBlockingObservable().forEach(extendedAction);
Observable.<Media, Rating, Result> combineLatest(horrors, ratings, combine).toBlockingObservable().forEach(action);
Observable.<Media, Rating, ExtendedResult> combineLatest(horrors, ratings, combine).toBlockingObservable().forEach(action);
Observable.<Movie, CoolRating, Result> combineLatest(horrors, ratings, combine).toBlocking().forEach(action);
Observable.<Movie, CoolRating, Result> combineLatest(horrors, ratings, combine).toBlocking().forEach(action);
Observable.<Media, Rating, ExtendedResult> combineLatest(horrors, ratings, combine).toBlocking().forEach(extendedAction);
Observable.<Media, Rating, Result> combineLatest(horrors, ratings, combine).toBlocking().forEach(action);
Observable.<Media, Rating, ExtendedResult> combineLatest(horrors, ratings, combine).toBlocking().forEach(action);

Observable.<Movie, CoolRating, Result> combineLatest(horrors, ratings, combine);
}
Expand Down
14 changes: 7 additions & 7 deletions rxjava-core/src/test/java/rx/ConcatTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public void testConcatSimple() {
Observable<String> o1 = Observable.from("one", "two");
Observable<String> o2 = Observable.from("three", "four");

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

assertEquals("one", values.get(0));
assertEquals("two", values.get(1));
Expand All @@ -51,7 +51,7 @@ public void testConcatWithObservableOfObservable() {

Observable<Observable<String>> os = Observable.from(o1, o2, o3);

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

assertEquals("one", values.get(0));
assertEquals("two", values.get(1));
Expand All @@ -68,7 +68,7 @@ public void testConcatWithIterableOfObservable() {
@SuppressWarnings("unchecked")
Iterable<Observable<String>> is = Arrays.asList(o1, o2, o3);

List<String> values = Observable.concat(Observable.from(is)).toList().toBlockingObservable().single();
List<String> values = Observable.concat(Observable.from(is)).toList().toBlocking().single();

assertEquals("one", values.get(0));
assertEquals("two", values.get(1));
Expand All @@ -83,7 +83,7 @@ public void testConcatCovariance() {

Observable<Observable<Media>> os = Observable.from(o1, o2);

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

assertEquals(4, values.size());
}
Expand All @@ -95,7 +95,7 @@ public void testConcatCovariance2() {

Observable<Observable<Media>> os = Observable.from(o1, o2);

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

assertEquals(5, values.size());
}
Expand All @@ -105,7 +105,7 @@ public void testConcatCovariance3() {
Observable<Movie> o1 = Observable.from(new HorrorMovie(), new Movie());
Observable<Media> o2 = Observable.from(new Media(), new HorrorMovie());

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

assertTrue(values.get(0) instanceof HorrorMovie);
assertTrue(values.get(1) instanceof Movie);
Expand All @@ -129,7 +129,7 @@ public void call(Subscriber<? super Movie> o) {

Observable<Media> o2 = Observable.from(new Media(), new HorrorMovie());

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

assertTrue(values.get(0) instanceof HorrorMovie);
assertTrue(values.get(1) instanceof Movie);
Expand Down
4 changes: 2 additions & 2 deletions rxjava-core/src/test/java/rx/GroupByTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public String call(Event event) {
}

}).take(1)
.toBlockingObservable().forEach(new Action1<GroupedObservable<String, Event>>() {
.toBlocking().forEach(new Action1<GroupedObservable<String, Event>>() {

@Override
public void call(GroupedObservable<String, Event> g) {
Expand Down Expand Up @@ -79,7 +79,7 @@ public String call(Event event) {

})
.take(20)
.toBlockingObservable().forEach(new Action1<String>() {
.toBlocking().forEach(new Action1<String>() {

@Override
public void call(String v) {
Expand Down
8 changes: 4 additions & 4 deletions rxjava-core/src/test/java/rx/MergeTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public void testMergeCovariance() {

Observable<Observable<Media>> os = Observable.from(o1, o2);

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

assertEquals(4, values.size());
}
Expand All @@ -58,7 +58,7 @@ public void testMergeCovariance2() {

Observable<Observable<Media>> os = Observable.from(o1, o2);

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

assertEquals(5, values.size());
}
Expand All @@ -68,7 +68,7 @@ public void testMergeCovariance3() {
Observable<Movie> o1 = Observable.from(new HorrorMovie(), new Movie());
Observable<Media> o2 = Observable.from(new Media(), new HorrorMovie());

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

assertTrue(values.get(0) instanceof HorrorMovie);
assertTrue(values.get(1) instanceof Movie);
Expand All @@ -92,7 +92,7 @@ public void call(Subscriber<? super Movie> o) {

Observable<Media> o2 = Observable.from(new Media(), new HorrorMovie());

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

assertTrue(values.get(0) instanceof HorrorMovie);
assertTrue(values.get(1) instanceof Movie);
Expand Down
6 changes: 3 additions & 3 deletions rxjava-core/src/test/java/rx/ObservableDoOnTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public void testDoOnEach() {
public void call(String v) {
r.set(v);
}
}).toBlockingObservable().single();
}).toBlocking().single();

assertEquals("one", output);
assertEquals("one", r.get());
Expand All @@ -56,7 +56,7 @@ Observable.<String> error(new RuntimeException("an error")).doOnError(new Action
public void call(Throwable v) {
r.set(v);
}
}).toBlockingObservable().single();
}).toBlocking().single();
fail("expected exception, not a return value");
} catch (Throwable e) {
t = e;
Expand All @@ -75,7 +75,7 @@ public void testDoOnCompleted() {
public void call() {
r.set(true);
}
}).toBlockingObservable().single();
}).toBlocking().single();

assertEquals("one", output);
assertTrue(r.get());
Expand Down
30 changes: 15 additions & 15 deletions rxjava-core/src/test/java/rx/ObservableTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ public void before() {
@Test
public void fromArray() {
String[] items = new String[] { "one", "two", "three" };
assertEquals(new Integer(3), Observable.from(items).count().toBlockingObservable().single());
assertEquals("two", Observable.from(items).skip(1).take(1).toBlockingObservable().single());
assertEquals("three", Observable.from(items).takeLast(1).toBlockingObservable().single());
assertEquals(new Integer(3), Observable.from(items).count().toBlocking().single());
assertEquals("two", Observable.from(items).skip(1).take(1).toBlocking().single());
assertEquals("three", Observable.from(items).takeLast(1).toBlocking().single());
}

@Test
Expand All @@ -86,26 +86,26 @@ public void fromIterable() {
items.add("two");
items.add("three");

assertEquals(new Integer(3), Observable.from(items).count().toBlockingObservable().single());
assertEquals("two", Observable.from(items).skip(1).take(1).toBlockingObservable().single());
assertEquals("three", Observable.from(items).takeLast(1).toBlockingObservable().single());
assertEquals(new Integer(3), Observable.from(items).count().toBlocking().single());
assertEquals("two", Observable.from(items).skip(1).take(1).toBlocking().single());
assertEquals("three", Observable.from(items).takeLast(1).toBlocking().single());
}

@Test
public void fromArityArgs3() {
Observable<String> items = Observable.from("one", "two", "three");

assertEquals(new Integer(3), items.count().toBlockingObservable().single());
assertEquals("two", items.skip(1).take(1).toBlockingObservable().single());
assertEquals("three", items.takeLast(1).toBlockingObservable().single());
assertEquals(new Integer(3), items.count().toBlocking().single());
assertEquals("two", items.skip(1).take(1).toBlocking().single());
assertEquals("three", items.takeLast(1).toBlocking().single());
}

@Test
public void fromArityArgs1() {
Observable<String> items = Observable.from("one");

assertEquals(new Integer(1), items.count().toBlockingObservable().single());
assertEquals("one", items.takeLast(1).toBlockingObservable().single());
assertEquals(new Integer(1), items.count().toBlocking().single());
assertEquals("one", items.takeLast(1).toBlocking().single());
}

@Test
Expand Down Expand Up @@ -253,7 +253,7 @@ public Integer call(Integer t1, Integer t2) {
return t1 + t2;
}

}).toBlockingObservable().forEach(new Action1<Integer>() {
}).toBlocking().forEach(new Action1<Integer>() {

@Override
public void call(Integer t1) {
Expand All @@ -279,7 +279,7 @@ public Integer call(Integer t1, Integer t2) {
return t1 + t2;
}

}).toBlockingObservable().last();
}).toBlocking().last();

assertEquals(1, value);
}
Expand Down Expand Up @@ -970,7 +970,7 @@ public void testCollectToList() {
public void call(List<Integer> list, Integer v) {
list.add(v);
}
}).toBlockingObservable().last();
}).toBlocking().last();

assertEquals(3, list.size());
assertEquals(1, list.get(0).intValue());
Expand All @@ -989,7 +989,7 @@ public void call(StringBuilder sb, Integer v) {
}
sb.append(v);
}
}).toBlockingObservable().last().toString();
}).toBlocking().last().toString();

assertEquals("1-2-3", value);
}
Expand Down
2 changes: 1 addition & 1 deletion rxjava-core/src/test/java/rx/ObservableWindowTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public void testWindow() {
public Observable<List<Integer>> call(Observable<Integer> xs) {
return xs.toList();
}
})).toBlockingObservable().forEach(new Action1<List<Integer>>() {
})).toBlocking().forEach(new Action1<List<Integer>>() {

@Override
public void call(List<Integer> xs) {
Expand Down
2 changes: 1 addition & 1 deletion rxjava-core/src/test/java/rx/ReduceTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public void reduceInts() {
public Integer call(Integer t1, Integer t2) {
return t1 + t2;
}
}).toBlockingObservable().single();
}).toBlocking().single();

assertEquals(6, value);
}
Expand Down
2 changes: 1 addition & 1 deletion rxjava-core/src/test/java/rx/ScanTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public Map<String, String> call(Map<String, String> accum, Event perInstanceEven

})
.take(10)
.toBlockingObservable().forEach(new Action1<Map<String, String>>() {
.toBlocking().forEach(new Action1<Map<String, String>>() {

@Override
public void call(Map<String, String> v) {
Expand Down
6 changes: 3 additions & 3 deletions rxjava-core/src/test/java/rx/StartWithTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public class StartWithTests {

@Test
public void startWith1() {
List<String> values = Observable.from("one", "two").startWith("zero").toList().toBlockingObservable().single();
List<String> values = Observable.from("one", "two").startWith("zero").toList().toBlocking().single();

assertEquals("zero", values.get(0));
assertEquals("two", values.get(2));
Expand All @@ -37,7 +37,7 @@ public void startWithIterable() {
List<String> li = new ArrayList<String>();
li.add("alpha");
li.add("beta");
List<String> values = Observable.from("one", "two").startWith(li).toList().toBlockingObservable().single();
List<String> values = Observable.from("one", "two").startWith(li).toList().toBlocking().single();

assertEquals("alpha", values.get(0));
assertEquals("beta", values.get(1));
Expand All @@ -50,7 +50,7 @@ public void startWithObservable() {
List<String> li = new ArrayList<String>();
li.add("alpha");
li.add("beta");
List<String> values = Observable.from("one", "two").startWith(Observable.from(li)).toList().toBlockingObservable().single();
List<String> values = Observable.from("one", "two").startWith(Observable.from(li)).toList().toBlocking().single();

assertEquals("alpha", values.get(0));
assertEquals("beta", values.get(1));
Expand Down
14 changes: 7 additions & 7 deletions rxjava-core/src/test/java/rx/ZipTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public Map<String, String> call(Map<String, String> accum, Event perInstanceEven
}
})
.take(10)
.toBlockingObservable().forEach(new Action1<Map<String, String>>() {
.toBlocking().forEach(new Action1<Map<String, String>>() {

@Override
public void call(Map<String, String> v) {
Expand All @@ -89,11 +89,11 @@ public void testCovarianceOfZip() {
Observable<HorrorMovie> horrors = Observable.from(new HorrorMovie());
Observable<CoolRating> ratings = Observable.from(new CoolRating());

Observable.<Movie, CoolRating, Result> zip(horrors, ratings, combine).toBlockingObservable().forEach(action);
Observable.<Movie, CoolRating, Result> zip(horrors, ratings, combine).toBlockingObservable().forEach(action);
Observable.<Media, Rating, ExtendedResult> zip(horrors, ratings, combine).toBlockingObservable().forEach(extendedAction);
Observable.<Media, Rating, Result> zip(horrors, ratings, combine).toBlockingObservable().forEach(action);
Observable.<Media, Rating, ExtendedResult> zip(horrors, ratings, combine).toBlockingObservable().forEach(action);
Observable.<Movie, CoolRating, Result> zip(horrors, ratings, combine).toBlocking().forEach(action);
Observable.<Movie, CoolRating, Result> zip(horrors, ratings, combine).toBlocking().forEach(action);
Observable.<Media, Rating, ExtendedResult> zip(horrors, ratings, combine).toBlocking().forEach(extendedAction);
Observable.<Media, Rating, Result> zip(horrors, ratings, combine).toBlocking().forEach(action);
Observable.<Media, Rating, ExtendedResult> zip(horrors, ratings, combine).toBlocking().forEach(action);

Observable.<Movie, CoolRating, Result> zip(horrors, ratings, combine);
}
Expand All @@ -120,7 +120,7 @@ public Object call(final Object... args) {
}
});

assertSame(invoked, result.toBlockingObservable().last());
assertSame(invoked, result.toBlocking().last());
}

Func2<Media, Rating, ExtendedResult> combine = new Func2<Media, Rating, ExtendedResult>() {
Expand Down
Loading