diff --git a/src/main/java/io/reactivex/rxjava4/core/Streamable.java b/src/main/java/io/reactivex/rxjava4/core/Streamable.java index 2212f85e67..dc4092940b 100644 --- a/src/main/java/io/reactivex/rxjava4/core/Streamable.java +++ b/src/main/java/io/reactivex/rxjava4/core/Streamable.java @@ -482,6 +482,229 @@ static Streamable intervalRange(long start, long count, return RxJavaPlugins.onAssembly(new StreamableJust<>(item)); } + /** + * Returns a {@code Streamable} that produces the given two items in order and completes. + * @param the element type + * @param item1 the first item to produce + * @param item2 the second item to produce + * @return the {@code Streamable} instance + * @throws NullPointerException if {@code item1} or {@code item2} is {@code null} + */ + @CheckReturnValue + @NonNull + static <@NonNull T> Streamable just(@NonNull T item1, @NonNull T item2) { + Objects.requireNonNull(item1, "item1 is null"); + Objects.requireNonNull(item2, "item2 is null"); + return fromArray(item1, item2); + } + + /** + * Returns a {@code Streamable} that produces the given three items in order and completes. + * @param the element type + * @param item1 the first item to produce + * @param item2 the second item to produce + * @param item3 the third item to produce + * @return the {@code Streamable} instance + * @throws NullPointerException if {@code item1}, {@code item2} or {@code item3} is {@code null} + */ + @CheckReturnValue + @NonNull + static <@NonNull T> Streamable just(@NonNull T item1, @NonNull T item2, @NonNull T item3) { + Objects.requireNonNull(item1, "item1 is null"); + Objects.requireNonNull(item2, "item2 is null"); + Objects.requireNonNull(item3, "item3 is null"); + return fromArray(item1, item2, item3); + } + + /** + * Returns a {@code Streamable} that produces the given four items in order and completes. + * @param the element type + * @param item1 the first item to produce + * @param item2 the second item to produce + * @param item3 the third item to produce + * @param item4 the fourth item to produce + * @return the {@code Streamable} instance + * @throws NullPointerException if {@code item1}, {@code item2}, {@code item3} or {@code item4} is {@code null} + */ + @CheckReturnValue + @NonNull + static <@NonNull T> Streamable just(@NonNull T item1, @NonNull T item2, @NonNull T item3, @NonNull T item4) { + Objects.requireNonNull(item1, "item1 is null"); + Objects.requireNonNull(item2, "item2 is null"); + Objects.requireNonNull(item3, "item3 is null"); + Objects.requireNonNull(item4, "item4 is null"); + return fromArray(item1, item2, item3, item4); + } + + /** + * Returns a {@code Streamable} that produces the given five items in order and completes. + * @param the element type + * @param item1 the first item to produce + * @param item2 the second item to produce + * @param item3 the third item to produce + * @param item4 the fourth item to produce + * @param item5 the fifth item to produce + * @return the {@code Streamable} instance + * @throws NullPointerException if {@code item1}, {@code item2}, {@code item3}, {@code item4} or {@code item5} is {@code null} + */ + @CheckReturnValue + @NonNull + static <@NonNull T> Streamable just(@NonNull T item1, @NonNull T item2, @NonNull T item3, @NonNull T item4, @NonNull T item5) { + Objects.requireNonNull(item1, "item1 is null"); + Objects.requireNonNull(item2, "item2 is null"); + Objects.requireNonNull(item3, "item3 is null"); + Objects.requireNonNull(item4, "item4 is null"); + Objects.requireNonNull(item5, "item5 is null"); + return fromArray(item1, item2, item3, item4, item5); + } + + /** + * Returns a {@code Streamable} that produces the given six items in order and completes. + * @param the element type + * @param item1 the first item to produce + * @param item2 the second item to produce + * @param item3 the third item to produce + * @param item4 the fourth item to produce + * @param item5 the fifth item to produce + * @param item6 the sixth item to produce + * @return the {@code Streamable} instance + * @throws NullPointerException if {@code item1}, {@code item2}, {@code item3}, {@code item4}, {@code item5} or {@code item6} is {@code null} + */ + @CheckReturnValue + @NonNull + static <@NonNull T> Streamable just(@NonNull T item1, @NonNull T item2, @NonNull T item3, @NonNull T item4, @NonNull T item5, @NonNull T item6) { + Objects.requireNonNull(item1, "item1 is null"); + Objects.requireNonNull(item2, "item2 is null"); + Objects.requireNonNull(item3, "item3 is null"); + Objects.requireNonNull(item4, "item4 is null"); + Objects.requireNonNull(item5, "item5 is null"); + Objects.requireNonNull(item6, "item6 is null"); + return fromArray(item1, item2, item3, item4, item5, item6); + } + + /** + * Returns a {@code Streamable} that produces the given seven items in order and completes. + * @param the element type + * @param item1 the first item to produce + * @param item2 the second item to produce + * @param item3 the third item to produce + * @param item4 the fourth item to produce + * @param item5 the fifth item to produce + * @param item6 the sixth item to produce + * @param item7 the seventh item to produce + * @return the {@code Streamable} instance + * @throws NullPointerException if {@code item1}, {@code item2}, {@code item3}, {@code item4}, + * {@code item5}, {@code item6} or {@code item7} is {@code null} + */ + @CheckReturnValue + @NonNull + static <@NonNull T> Streamable just(@NonNull T item1, @NonNull T item2, @NonNull T item3, @NonNull T item4, @NonNull T item5, @NonNull T item6, @NonNull T item7) { + Objects.requireNonNull(item1, "item1 is null"); + Objects.requireNonNull(item2, "item2 is null"); + Objects.requireNonNull(item3, "item3 is null"); + Objects.requireNonNull(item4, "item4 is null"); + Objects.requireNonNull(item5, "item5 is null"); + Objects.requireNonNull(item6, "item6 is null"); + Objects.requireNonNull(item7, "item7 is null"); + return fromArray(item1, item2, item3, item4, item5, item6, item7); + } + + /** + * Returns a {@code Streamable} that produces the given eight items in order and completes. + * @param the element type + * @param item1 the first item to produce + * @param item2 the second item to produce + * @param item3 the third item to produce + * @param item4 the fourth item to produce + * @param item5 the fifth item to produce + * @param item6 the sixth item to produce + * @param item7 the seventh item to produce + * @param item8 the eighth item to produce + * @return the {@code Streamable} instance + * @throws NullPointerException if {@code item1}, {@code item2}, {@code item3}, {@code item4}, + * {@code item5}, {@code item6}, {@code item7} or {@code item8} is {@code null} + */ + @CheckReturnValue + @NonNull + static <@NonNull T> Streamable just(@NonNull T item1, @NonNull T item2, @NonNull T item3, @NonNull T item4, + @NonNull T item5, @NonNull T item6, @NonNull T item7, @NonNull T item8) { + Objects.requireNonNull(item1, "item1 is null"); + Objects.requireNonNull(item2, "item2 is null"); + Objects.requireNonNull(item3, "item3 is null"); + Objects.requireNonNull(item4, "item4 is null"); + Objects.requireNonNull(item5, "item5 is null"); + Objects.requireNonNull(item6, "item6 is null"); + Objects.requireNonNull(item7, "item7 is null"); + Objects.requireNonNull(item8, "item8 is null"); + return fromArray(item1, item2, item3, item4, item5, item6, item7, item8); + } + + /** + * Returns a {@code Streamable} that produces the given nine items in order and completes. + * @param the element type + * @param item1 the first item to produce + * @param item2 the second item to produce + * @param item3 the third item to produce + * @param item4 the fourth item to produce + * @param item5 the fifth item to produce + * @param item6 the sixth item to produce + * @param item7 the seventh item to produce + * @param item8 the eighth item to produce + * @param item9 the ninth item to produce + * @return the {@code Streamable} instance + * @throws NullPointerException if {@code item1}, {@code item2}, {@code item3}, {@code item4}, + * {@code item5}, {@code item6}, {@code item7}, {@code item8} or {@code item9} is {@code null} + */ + @CheckReturnValue + @NonNull + static <@NonNull T> Streamable just(@NonNull T item1, @NonNull T item2, @NonNull T item3, @NonNull T item4, + @NonNull T item5, @NonNull T item6, @NonNull T item7, @NonNull T item8, @NonNull T item9) { + Objects.requireNonNull(item1, "item1 is null"); + Objects.requireNonNull(item2, "item2 is null"); + Objects.requireNonNull(item3, "item3 is null"); + Objects.requireNonNull(item4, "item4 is null"); + Objects.requireNonNull(item5, "item5 is null"); + Objects.requireNonNull(item6, "item6 is null"); + Objects.requireNonNull(item7, "item7 is null"); + Objects.requireNonNull(item8, "item8 is null"); + Objects.requireNonNull(item9, "item9 is null"); + return fromArray(item1, item2, item3, item4, item5, item6, item7, item8, item9); + } + + /** + * Returns a {@code Streamable} that produces the given ten items in order and completes. + * @param the element type + * @param item1 the first item to produce + * @param item2 the second item to produce + * @param item3 the third item to produce + * @param item4 the fourth item to produce + * @param item5 the fifth item to produce + * @param item6 the sixth item to produce + * @param item7 the seventh item to produce + * @param item8 the eighth item to produce + * @param item9 the ninth item to produce + * @param item10 the tenth item to produce + * @return the {@code Streamable} instance + * @throws NullPointerException if {@code item1}, {@code item2}, {@code item3}, {@code item4}, {@code item5}, + * {@code item6}, {@code item7}, {@code item8}, {@code item9} or {@code item10} is {@code null} + */ + @CheckReturnValue + @NonNull + static <@NonNull T> Streamable just(@NonNull T item1, @NonNull T item2, @NonNull T item3, @NonNull T item4, + @NonNull T item5, @NonNull T item6, @NonNull T item7, @NonNull T item8, @NonNull T item9, @NonNull T item10) { + Objects.requireNonNull(item1, "item1 is null"); + Objects.requireNonNull(item2, "item2 is null"); + Objects.requireNonNull(item3, "item3 is null"); + Objects.requireNonNull(item4, "item4 is null"); + Objects.requireNonNull(item5, "item5 is null"); + Objects.requireNonNull(item6, "item6 is null"); + Objects.requireNonNull(item7, "item7 is null"); + Objects.requireNonNull(item8, "item8 is null"); + Objects.requireNonNull(item9, "item9 is null"); + Objects.requireNonNull(item10, "item10 is null"); + return fromArray(item1, item2, item3, item4, item5, item6, item7, item8, item9, item10); + } + /** * Returns an {@code Streamable} that never produces an item and never terminates. * @param the element type diff --git a/src/test/java/io/reactivex/rxjava4/internal/operators/streamable/StreamableJustTest.java b/src/test/java/io/reactivex/rxjava4/internal/operators/streamable/StreamableJustTest.java index b3086983b0..94494bf0e6 100644 --- a/src/test/java/io/reactivex/rxjava4/internal/operators/streamable/StreamableJustTest.java +++ b/src/test/java/io/reactivex/rxjava4/internal/operators/streamable/StreamableJustTest.java @@ -13,6 +13,8 @@ package io.reactivex.rxjava4.internal.operators.streamable; +import static org.junit.jupiter.api.Assertions.assertThrows; + import java.util.List; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; @@ -50,4 +52,30 @@ public void collectEnumerator() throws Throwable { .assertResult(List.of(1)); } + @Test + public void multipleItems() throws Throwable { + Streamable.just(1, 2).test().awaitDone(5, TimeUnit.SECONDS).assertResult(1, 2); + Streamable.just(1, 2, 3).test().awaitDone(5, TimeUnit.SECONDS).assertResult(1, 2, 3); + Streamable.just(1, 2, 3, 4).test().awaitDone(5, TimeUnit.SECONDS).assertResult(1, 2, 3, 4); + Streamable.just(1, 2, 3, 4, 5).test().awaitDone(5, TimeUnit.SECONDS).assertResult(1, 2, 3, 4, 5); + Streamable.just(1, 2, 3, 4, 5, 6).test().awaitDone(5, TimeUnit.SECONDS).assertResult(1, 2, 3, 4, 5, 6); + Streamable.just(1, 2, 3, 4, 5, 6, 7).test().awaitDone(5, TimeUnit.SECONDS).assertResult(1, 2, 3, 4, 5, 6, 7); + Streamable.just(1, 2, 3, 4, 5, 6, 7, 8).test().awaitDone(5, TimeUnit.SECONDS).assertResult(1, 2, 3, 4, 5, 6, 7, 8); + Streamable.just(1, 2, 3, 4, 5, 6, 7, 8, 9).test().awaitDone(5, TimeUnit.SECONDS).assertResult(1, 2, 3, 4, 5, 6, 7, 8, 9); + Streamable.just(1, 2, 3, 4, 5, 6, 7, 8, 9, 10).test().awaitDone(5, TimeUnit.SECONDS).assertResult(1, 2, 3, 4, 5, 6, 7, 8, 9, 10); + } + + @Test + public void multipleItemsRejectNull() { + assertThrows(NullPointerException.class, () -> Streamable.just(1, null)); + assertThrows(NullPointerException.class, () -> Streamable.just(1, 2, null)); + assertThrows(NullPointerException.class, () -> Streamable.just(1, 2, 3, null)); + assertThrows(NullPointerException.class, () -> Streamable.just(1, 2, 3, 4, null)); + assertThrows(NullPointerException.class, () -> Streamable.just(1, 2, 3, 4, 5, null)); + assertThrows(NullPointerException.class, () -> Streamable.just(1, 2, 3, 4, 5, 6, null)); + assertThrows(NullPointerException.class, () -> Streamable.just(1, 2, 3, 4, 5, 6, 7, null)); + assertThrows(NullPointerException.class, () -> Streamable.just(1, 2, 3, 4, 5, 6, 7, 8, null)); + assertThrows(NullPointerException.class, () -> Streamable.just(1, 2, 3, 4, 5, 6, 7, 8, 9, null)); + } + }