From 3164f9089195c2fc8ea1b871bdf8064a439f4622 Mon Sep 17 00:00:00 2001
From: akarnokd <akarnokd@gmail.com>
Date: Mon, 13 Jan 2020 11:28:41 +0100
Subject: [PATCH] 3.x: Rename to combineLatestArrayDelayError
---
.../java/io/reactivex/rxjava3/core/Flowable.java | 10 +++++-----
.../java/io/reactivex/rxjava3/core/Observable.java | 10 +++++-----
.../flowable/FlowableCombineLatestTest.java | 12 ++++++------
.../observable/ObservableCombineLatestTest.java | 10 +++++-----
.../tck/CombineLatestArrayDelayErrorTckTest.java | 2 +-
5 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index 699baef2e8..56fa2e63f2 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -461,7 +461,7 @@ public static <T, R> Flowable<R> combineLatest(@NonNull Iterable<? extends Publi
* are requested in a bounded manner, however, their backpressure is not enforced (the operator won't signal
* {@link MissingBackpressureException}) and may lead to {@link OutOfMemoryError} due to internal buffer bloat.</dd>
* <dt><b>Scheduler:</b></dt>
- * <dd>{@code combineLatestDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
+ * <dd>{@code combineLatestArrayDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
* </dl>
*
* @param <T>
@@ -481,9 +481,9 @@ public static <T, R> Flowable<R> combineLatest(@NonNull Iterable<? extends Publi
@CheckReturnValue
@BackpressureSupport(BackpressureKind.FULL)
@NonNull
- public static <T, @NonNull R> Flowable<R> combineLatestDelayError(@NonNull Publisher<? extends T>[] sources,
+ public static <T, @NonNull R> Flowable<R> combineLatestArrayDelayError(@NonNull Publisher<? extends T>[] sources,
@NonNull Function<? super Object[], ? extends R> combiner) {
- return combineLatestDelayError(sources, combiner, bufferSize());
+ return combineLatestArrayDelayError(sources, combiner, bufferSize());
}
/**
@@ -509,7 +509,7 @@ public static <T, R> Flowable<R> combineLatest(@NonNull Iterable<? extends Publi
* are requested in a bounded manner, however, their backpressure is not enforced (the operator won't signal
* {@link MissingBackpressureException}) and may lead to {@link OutOfMemoryError} due to internal buffer bloat.</dd>
* <dt><b>Scheduler:</b></dt>
- * <dd>{@code combineLatestDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
+ * <dd>{@code combineLatestArrayDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
* </dl>
*
* @param <T>
@@ -532,7 +532,7 @@ public static <T, R> Flowable<R> combineLatest(@NonNull Iterable<? extends Publi
@CheckReturnValue
@NonNull
@BackpressureSupport(BackpressureKind.FULL)
- public static <T, @NonNull R> Flowable<R> combineLatestDelayError(@NonNull Publisher<? extends T>[] sources,
+ public static <T, @NonNull R> Flowable<R> combineLatestArrayDelayError(@NonNull Publisher<? extends T>[] sources,
@NonNull Function<? super Object[], ? extends R> combiner, int bufferSize) {
Objects.requireNonNull(sources, "sources is null");
Objects.requireNonNull(combiner, "combiner is null");
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index b226ae8994..38ac1a5946 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -868,7 +868,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Observable<R> combineLates
*
* <dl>
* <dt><b>Scheduler:</b></dt>
- * <dd>{@code combineLatestDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
+ * <dd>{@code combineLatestArrayDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
* </dl>
*
* @param <T>
@@ -887,10 +887,10 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Observable<R> combineLates
@CheckReturnValue
@SchedulerSupport(SchedulerSupport.NONE)
@NonNull
- public static <T, R> Observable<R> combineLatestDelayError(
+ public static <T, R> Observable<R> combineLatestArrayDelayError(
@NonNull ObservableSource<? extends T>[] sources,
@NonNull Function<? super Object[], ? extends R> combiner) {
- return combineLatestDelayError(sources, combiner, bufferSize());
+ return combineLatestArrayDelayError(sources, combiner, bufferSize());
}
/**
@@ -914,7 +914,7 @@ public static <T, R> Observable<R> combineLatestDelayError(
* <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatestDelayError.png" alt="">
* <dl>
* <dt><b>Scheduler:</b></dt>
- * <dd>{@code combineLatestDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
+ * <dd>{@code combineLatestArrayDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
* </dl>
*
* @param <T>
@@ -936,7 +936,7 @@ public static <T, R> Observable<R> combineLatestDelayError(
@CheckReturnValue
@NonNull
@SchedulerSupport(SchedulerSupport.NONE)
- public static <T, R> Observable<R> combineLatestDelayError(@NonNull ObservableSource<? extends T>[] sources,
+ public static <T, R> Observable<R> combineLatestArrayDelayError(@NonNull ObservableSource<? extends T>[] sources,
@NonNull Function<? super Object[], ? extends R> combiner, int bufferSize) {
Objects.requireNonNull(sources, "sources is null");
Objects.requireNonNull(combiner, "combiner is null");
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatestTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatestTest.java
index 6829c99986..302ae3757b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatestTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatestTest.java
@@ -1073,7 +1073,7 @@ public List<Object> apply(Object[] t) throws Exception {
.test()
.assertResult(expected);
- Flowable.combineLatestDelayError(sources, new Function<Object[], List<Object>>() {
+ Flowable.combineLatestArrayDelayError(sources, new Function<Object[], List<Object>>() {
@Override
public List<Object> apply(Object[] t) throws Exception {
return Arrays.asList(t);
@@ -1104,7 +1104,7 @@ public Object apply(Object[] a) throws Exception {
@SuppressWarnings("unchecked")
public void combineLatestDelayErrorArrayOfSources() {
- Flowable.combineLatestDelayError(new Flowable[] {
+ Flowable.combineLatestArrayDelayError(new Flowable[] {
Flowable.just(1), Flowable.just(2)
}, new Function<Object[], Object>() {
@Override
@@ -1120,7 +1120,7 @@ public Object apply(Object[] a) throws Exception {
@SuppressWarnings("unchecked")
public void combineLatestDelayErrorArrayOfSourcesWithError() {
- Flowable.combineLatestDelayError(new Flowable[] {
+ Flowable.combineLatestArrayDelayError(new Flowable[] {
Flowable.just(1), Flowable.just(2).concatWith(Flowable.<Integer>error(new TestException()))
}, new Function<Object[], Object>() {
@Override
@@ -1171,7 +1171,7 @@ public void combineLatestArrayEmpty() {
@SuppressWarnings("unchecked")
@Test
public void combineLatestDelayErrorEmpty() {
- assertSame(Flowable.empty(), Flowable.combineLatestDelayError(new Flowable[0], Functions.<Object[]>identity(), 16));
+ assertSame(Flowable.empty(), Flowable.combineLatestArrayDelayError(new Flowable[0], Functions.<Object[]>identity(), 16));
}
@Test
@@ -1295,7 +1295,7 @@ public Object apply(Object a, Object b) throws Exception {
@SuppressWarnings("unchecked")
@Test
public void errorDelayed() {
- Flowable.combineLatestDelayError(
+ Flowable.combineLatestArrayDelayError(
new Publisher[] { Flowable.error(new TestException()), Flowable.just(1) },
new Function<Object[], Object>() {
@Override
@@ -1312,7 +1312,7 @@ public Object apply(Object[] a) throws Exception {
@SuppressWarnings("unchecked")
@Test
public void errorDelayed2() {
- Flowable.combineLatestDelayError(
+ Flowable.combineLatestArrayDelayError(
new Publisher[] { Flowable.error(new TestException()).startWithItem(1), Flowable.empty() },
new Function<Object[], Object>() {
@Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatestTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatestTest.java
index 3096cdabd7..e304a27a33 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatestTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatestTest.java
@@ -789,7 +789,7 @@ public Object apply(Object[] a) throws Exception {
@SuppressWarnings("unchecked")
public void combineLatestDelayErrorArrayOfSources() {
- Observable.combineLatestDelayError(new ObservableSource[] {
+ Observable.combineLatestArrayDelayError(new ObservableSource[] {
Observable.just(1), Observable.just(2)
}, new Function<Object[], Object>() {
@Override
@@ -805,7 +805,7 @@ public Object apply(Object[] a) throws Exception {
@SuppressWarnings("unchecked")
public void combineLatestDelayErrorArrayOfSourcesWithError() {
- Observable.combineLatestDelayError(new ObservableSource[] {
+ Observable.combineLatestArrayDelayError(new ObservableSource[] {
Observable.just(1), Observable.just(2).concatWith(Observable.<Integer>error(new TestException()))
}, new Function<Object[], Object>() {
@Override
@@ -856,7 +856,7 @@ public void combineLatestArrayEmpty() {
@SuppressWarnings("unchecked")
@Test
public void combineLatestDelayErrorEmpty() {
- assertSame(Observable.empty(), Observable.combineLatestDelayError(new ObservableSource[0], Functions.<Object[]>identity(), 16));
+ assertSame(Observable.empty(), Observable.combineLatestArrayDelayError(new ObservableSource[0], Functions.<Object[]>identity(), 16));
}
@Test
@@ -923,7 +923,7 @@ public Object apply(Object a, Object b) throws Exception {
@SuppressWarnings("unchecked")
@Test
public void errorDelayed() {
- Observable.combineLatestDelayError(
+ Observable.combineLatestArrayDelayError(
new ObservableSource[] { Observable.error(new TestException()), Observable.just(1) },
new Function<Object[], Object>() {
@Override
@@ -940,7 +940,7 @@ public Object apply(Object[] a) throws Exception {
@SuppressWarnings("unchecked")
@Test
public void errorDelayed2() {
- Observable.combineLatestDelayError(
+ Observable.combineLatestArrayDelayError(
new ObservableSource[] { Observable.error(new TestException()).startWithItem(1), Observable.empty() },
new Function<Object[], Object>() {
@Override
diff --git a/src/test/java/io/reactivex/rxjava3/tck/CombineLatestArrayDelayErrorTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/CombineLatestArrayDelayErrorTckTest.java
index dcb5a94fe6..ec7005ea41 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/CombineLatestArrayDelayErrorTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/CombineLatestArrayDelayErrorTckTest.java
@@ -26,7 +26,7 @@ public class CombineLatestArrayDelayErrorTckTest extends BaseTck<Long> {
@Override
public Publisher<Long> createPublisher(long elements) {
return
- Flowable.combineLatestDelayError(
+ Flowable.combineLatestArrayDelayError(
new Publisher[] { Flowable.just(1L), Flowable.fromIterable(iterate(elements)) },
new Function<Object[], Long>() {
@Override