Skip to content

Commit 373532b

Browse files
DavidMGrossDavidMGross
committed
Merge branch 'master' of https://github.com/Netflix/RxJava into docs
2 parents 6b60a4a + 5cd3776 commit 373532b

Some content is hidden

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

41 files changed

+125
-124
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7048,21 +7048,22 @@ public final Observable<Timestamped<T>> timestamp(Scheduler scheduler) {
70487048
*
70497049
* @return a {@code BlockingObservable} version of this Observable
70507050
* @see <a href="https://github.com/Netflix/RxJava/wiki/Blocking-Observable-Operators">RxJava Wiki: Blocking Observable Observers</a>
7051+
*
7052+
* @deprecated Use {@link #toBlocking()} instead.
70517053
*/
7054+
@Deprecated
70527055
public final BlockingObservable<T> toBlockingObservable() {
70537056
return BlockingObservable.from(this);
70547057
}
70557058

70567059
/**
70577060
* Converts an Observable into a {@link BlockingObservable} (an Observable with blocking operators).
70587061
*
7059-
* This method is an alias for {@link #toBlockingObservable()}.
7060-
*
70617062
* @return a {@code BlockingObservable} version of this Observable
70627063
* @see <a href="https://github.com/Netflix/RxJava/wiki/Blocking-Observable-Operators">RxJava Wiki: Blocking Observable Observers</a>
70637064
*/
70647065
public final BlockingObservable<T> toBlocking() {
7065-
return toBlockingObservable();
7066+
return BlockingObservable.from(this);
70667067
}
70677068

70687069
/**

‎rxjava-core/src/main/java/rx/observables/BlockingObservable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
* An extension of {@link Observable} that provides blocking operators.
3636
* <p>
3737
* You construct a <code>BlockingObservable</code> from an
38-
* <code>Observable</code> with {@link #from(Observable)} or {@link Observable#toBlockingObservable()} <p>
38+
* <code>Observable</code> with {@link #from(Observable)} or {@link Observable#toBlocking()} <p>
3939
* The documentation for this interface makes use of a form of marble diagram
4040
* that has been modified to illustrate blocking operators. The following legend
4141
* explains these marble diagrams:

‎rxjava-core/src/perf/java/rx/archive/schedulers/TestRecursionMemoryUsage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,6 @@ public void call() {
6666
}
6767
});
6868
}
69-
}).toBlockingObservable().last();
69+
}).toBlocking().last();
7070
}
7171
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ public void testCovarianceOfCombineLatest() {
3636
Observable<HorrorMovie> horrors = Observable.from(new HorrorMovie());
3737
Observable<CoolRating> ratings = Observable.from(new CoolRating());
3838

39-
Observable.<Movie, CoolRating, Result> combineLatest(horrors, ratings, combine).toBlockingObservable().forEach(action);
40-
Observable.<Movie, CoolRating, Result> combineLatest(horrors, ratings, combine).toBlockingObservable().forEach(action);
41-
Observable.<Media, Rating, ExtendedResult> combineLatest(horrors, ratings, combine).toBlockingObservable().forEach(extendedAction);
42-
Observable.<Media, Rating, Result> combineLatest(horrors, ratings, combine).toBlockingObservable().forEach(action);
43-
Observable.<Media, Rating, ExtendedResult> combineLatest(horrors, ratings, combine).toBlockingObservable().forEach(action);
39+
Observable.<Movie, CoolRating, Result> combineLatest(horrors, ratings, combine).toBlocking().forEach(action);
40+
Observable.<Movie, CoolRating, Result> combineLatest(horrors, ratings, combine).toBlocking().forEach(action);
41+
Observable.<Media, Rating, ExtendedResult> combineLatest(horrors, ratings, combine).toBlocking().forEach(extendedAction);
42+
Observable.<Media, Rating, Result> combineLatest(horrors, ratings, combine).toBlocking().forEach(action);
43+
Observable.<Media, Rating, ExtendedResult> combineLatest(horrors, ratings, combine).toBlocking().forEach(action);
4444

4545
Observable.<Movie, CoolRating, Result> combineLatest(horrors, ratings, combine);
4646
}

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public void testConcatSimple() {
3535
Observable<String> o1 = Observable.from("one", "two");
3636
Observable<String> o2 = Observable.from("three", "four");
3737

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

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

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

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

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

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

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

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

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

8888
assertEquals(4, values.size());
8989
}
@@ -95,7 +95,7 @@ public void testConcatCovariance2() {
9595

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

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

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

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

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

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

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

134134
assertTrue(values.get(0) instanceof HorrorMovie);
135135
assertTrue(values.get(1) instanceof Movie);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public String call(Event event) {
3838
}
3939

4040
}).take(1)
41-
.toBlockingObservable().forEach(new Action1<GroupedObservable<String, Event>>() {
41+
.toBlocking().forEach(new Action1<GroupedObservable<String, Event>>() {
4242

4343
@Override
4444
public void call(GroupedObservable<String, Event> g) {
@@ -79,7 +79,7 @@ public String call(Event event) {
7979

8080
})
8181
.take(20)
82-
.toBlockingObservable().forEach(new Action1<String>() {
82+
.toBlocking().forEach(new Action1<String>() {
8383

8484
@Override
8585
public void call(String v) {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public void testMergeCovariance() {
4646

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

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

5151
assertEquals(4, values.size());
5252
}
@@ -58,7 +58,7 @@ public void testMergeCovariance2() {
5858

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

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

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

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

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

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

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

9797
assertTrue(values.get(0) instanceof HorrorMovie);
9898
assertTrue(values.get(1) instanceof Movie);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public void testDoOnEach() {
3939
public void call(String v) {
4040
r.set(v);
4141
}
42-
}).toBlockingObservable().single();
42+
}).toBlocking().single();
4343

4444
assertEquals("one", output);
4545
assertEquals("one", r.get());
@@ -56,7 +56,7 @@ Observable.<String> error(new RuntimeException("an error")).doOnError(new Action
5656
public void call(Throwable v) {
5757
r.set(v);
5858
}
59-
}).toBlockingObservable().single();
59+
}).toBlocking().single();
6060
fail("expected exception, not a return value");
6161
} catch (Throwable e) {
6262
t = e;
@@ -75,7 +75,7 @@ public void testDoOnCompleted() {
7575
public void call() {
7676
r.set(true);
7777
}
78-
}).toBlockingObservable().single();
78+
}).toBlocking().single();
7979

8080
assertEquals("one", output);
8181
assertTrue(r.get());

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ public void before() {
7474
@Test
7575
public void fromArray() {
7676
String[] items = new String[] { "one", "two", "three" };
77-
assertEquals(new Integer(3), Observable.from(items).count().toBlockingObservable().single());
78-
assertEquals("two", Observable.from(items).skip(1).take(1).toBlockingObservable().single());
79-
assertEquals("three", Observable.from(items).takeLast(1).toBlockingObservable().single());
77+
assertEquals(new Integer(3), Observable.from(items).count().toBlocking().single());
78+
assertEquals("two", Observable.from(items).skip(1).take(1).toBlocking().single());
79+
assertEquals("three", Observable.from(items).takeLast(1).toBlocking().single());
8080
}
8181

8282
@Test
@@ -86,26 +86,26 @@ public void fromIterable() {
8686
items.add("two");
8787
items.add("three");
8888

89-
assertEquals(new Integer(3), Observable.from(items).count().toBlockingObservable().single());
90-
assertEquals("two", Observable.from(items).skip(1).take(1).toBlockingObservable().single());
91-
assertEquals("three", Observable.from(items).takeLast(1).toBlockingObservable().single());
89+
assertEquals(new Integer(3), Observable.from(items).count().toBlocking().single());
90+
assertEquals("two", Observable.from(items).skip(1).take(1).toBlocking().single());
91+
assertEquals("three", Observable.from(items).takeLast(1).toBlocking().single());
9292
}
9393

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

98-
assertEquals(new Integer(3), items.count().toBlockingObservable().single());
99-
assertEquals("two", items.skip(1).take(1).toBlockingObservable().single());
100-
assertEquals("three", items.takeLast(1).toBlockingObservable().single());
98+
assertEquals(new Integer(3), items.count().toBlocking().single());
99+
assertEquals("two", items.skip(1).take(1).toBlocking().single());
100+
assertEquals("three", items.takeLast(1).toBlocking().single());
101101
}
102102

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

107-
assertEquals(new Integer(1), items.count().toBlockingObservable().single());
108-
assertEquals("one", items.takeLast(1).toBlockingObservable().single());
107+
assertEquals(new Integer(1), items.count().toBlocking().single());
108+
assertEquals("one", items.takeLast(1).toBlocking().single());
109109
}
110110

111111
@Test
@@ -253,7 +253,7 @@ public Integer call(Integer t1, Integer t2) {
253253
return t1 + t2;
254254
}
255255

256-
}).toBlockingObservable().forEach(new Action1<Integer>() {
256+
}).toBlocking().forEach(new Action1<Integer>() {
257257

258258
@Override
259259
public void call(Integer t1) {
@@ -279,7 +279,7 @@ public Integer call(Integer t1, Integer t2) {
279279
return t1 + t2;
280280
}
281281

282-
}).toBlockingObservable().last();
282+
}).toBlocking().last();
283283

284284
assertEquals(1, value);
285285
}
@@ -970,7 +970,7 @@ public void testCollectToList() {
970970
public void call(List<Integer> list, Integer v) {
971971
list.add(v);
972972
}
973-
}).toBlockingObservable().last();
973+
}).toBlocking().last();
974974

975975
assertEquals(3, list.size());
976976
assertEquals(1, list.get(0).intValue());
@@ -989,7 +989,7 @@ public void call(StringBuilder sb, Integer v) {
989989
}
990990
sb.append(v);
991991
}
992-
}).toBlockingObservable().last().toString();
992+
}).toBlocking().last().toString();
993993

994994
assertEquals("1-2-3", value);
995995
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public void testWindow() {
3737
public Observable<List<Integer>> call(Observable<Integer> xs) {
3838
return xs.toList();
3939
}
40-
})).toBlockingObservable().forEach(new Action1<List<Integer>>() {
40+
})).toBlocking().forEach(new Action1<List<Integer>>() {
4141

4242
@Override
4343
public void call(List<Integer> xs) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public void reduceInts() {
3434
public Integer call(Integer t1, Integer t2) {
3535
return t1 + t2;
3636
}
37-
}).toBlockingObservable().single();
37+
}).toBlocking().single();
3838

3939
assertEquals(6, value);
4040
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public Map<String, String> call(Map<String, String> accum, Event perInstanceEven
4040

4141
})
4242
.take(10)
43-
.toBlockingObservable().forEach(new Action1<Map<String, String>>() {
43+
.toBlocking().forEach(new Action1<Map<String, String>>() {
4444

4545
@Override
4646
public void call(Map<String, String> v) {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public class StartWithTests {
2626

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

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

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

5555
assertEquals("alpha", values.get(0));
5656
assertEquals("beta", values.get(1));

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public Map<String, String> call(Map<String, String> accum, Event perInstanceEven
6969
}
7070
})
7171
.take(10)
72-
.toBlockingObservable().forEach(new Action1<Map<String, String>>() {
72+
.toBlocking().forEach(new Action1<Map<String, String>>() {
7373

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

92-
Observable.<Movie, CoolRating, Result> zip(horrors, ratings, combine).toBlockingObservable().forEach(action);
93-
Observable.<Movie, CoolRating, Result> zip(horrors, ratings, combine).toBlockingObservable().forEach(action);
94-
Observable.<Media, Rating, ExtendedResult> zip(horrors, ratings, combine).toBlockingObservable().forEach(extendedAction);
95-
Observable.<Media, Rating, Result> zip(horrors, ratings, combine).toBlockingObservable().forEach(action);
96-
Observable.<Media, Rating, ExtendedResult> zip(horrors, ratings, combine).toBlockingObservable().forEach(action);
92+
Observable.<Movie, CoolRating, Result> zip(horrors, ratings, combine).toBlocking().forEach(action);
93+
Observable.<Movie, CoolRating, Result> zip(horrors, ratings, combine).toBlocking().forEach(action);
94+
Observable.<Media, Rating, ExtendedResult> zip(horrors, ratings, combine).toBlocking().forEach(extendedAction);
95+
Observable.<Media, Rating, Result> zip(horrors, ratings, combine).toBlocking().forEach(action);
96+
Observable.<Media, Rating, ExtendedResult> zip(horrors, ratings, combine).toBlocking().forEach(action);
9797

9898
Observable.<Movie, CoolRating, Result> zip(horrors, ratings, combine);
9999
}
@@ -120,7 +120,7 @@ public Object call(final Object... args) {
120120
}
121121
});
122122

123-
assertSame(invoked, result.toBlockingObservable().last());
123+
assertSame(invoked, result.toBlocking().last());
124124
}
125125

126126
Func2<Media, Rating, ExtendedResult> combine = new Func2<Media, Rating, ExtendedResult>() {

0 commit comments

Comments
 (0)