From e25be7c048f874814e1f940fa5dcd62724cc95bd Mon Sep 17 00:00:00 2001 From: David Karnok Date: Fri, 24 Nov 2017 08:37:46 +0100 Subject: [PATCH] 2.x: marbles for Observable all, fromPublisher, zipArray (#5740) --- src/main/java/io/reactivex/Observable.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/io/reactivex/Observable.java b/src/main/java/io/reactivex/Observable.java index bfa3a19e4e..f6f1082a92 100644 --- a/src/main/java/io/reactivex/Observable.java +++ b/src/main/java/io/reactivex/Observable.java @@ -1898,6 +1898,8 @@ public static Observable fromIterable(Iterable source) { /** * Converts an arbitrary Reactive-Streams Publisher into an Observable. *

+ * + *

* The {@link Publisher} must follow the * Reactive-Streams specification. * Violating the specification may result in undefined behavior. @@ -4628,7 +4630,7 @@ public static Observable zip( * {@code Function} passed to the method would trigger a {@code ClassCastException}. * *

- * + * *

*
Scheduler:
*
{@code zipArray} does not operate by default on a particular {@link Scheduler}.
@@ -4729,7 +4731,7 @@ public static Observable zipIterable(Iterable - * + * *
*
Scheduler:
*
{@code all} does not operate by default on a particular {@link Scheduler}.