diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index 00a58d5717..622bab5bb0 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -255,7 +255,7 @@ public static int bufferSize() {
* are requested in a bounded manner, however, their backpressure is not enforced (the operator won't signal
* {@code MissingBackpressureException}) and may lead to {@code OutOfMemoryError} due to internal buffer bloat.
*
Scheduler:
- * {@code combineLatest} does not operate by default on a particular {@link Scheduler}.
+ * {@code combineLatestArray} does not operate by default on a particular {@link Scheduler}.
*
*
* @param
@@ -273,8 +273,8 @@ public static int bufferSize() {
@SchedulerSupport(SchedulerSupport.NONE)
@CheckReturnValue
@BackpressureSupport(BackpressureKind.FULL)
- public static Flowable combineLatest(Publisher extends T>[] sources, Function super Object[], ? extends R> combiner) {
- return combineLatest(sources, combiner, bufferSize());
+ public static Flowable combineLatestArray(Publisher extends T>[] sources, Function super Object[], ? extends R> combiner) {
+ return combineLatestArray(sources, combiner, bufferSize());
}
/**
@@ -299,7 +299,7 @@ public static Flowable combineLatest(Publisher extends T>[] sources,
* are requested in a bounded manner, however, their backpressure is not enforced (the operator won't signal
* {@code MissingBackpressureException}) and may lead to {@code OutOfMemoryError} due to internal buffer bloat.
* Scheduler:
- * {@code combineLatest} does not operate by default on a particular {@link Scheduler}.
+ * {@code combineLatestArray} does not operate by default on a particular {@link Scheduler}.
*
*
* @param
@@ -320,7 +320,7 @@ public static Flowable combineLatest(Publisher extends T>[] sources,
@CheckReturnValue
@NonNull
@BackpressureSupport(BackpressureKind.FULL)
- public static Flowable combineLatest(Publisher extends T>[] sources, Function super Object[], ? extends R> combiner, int bufferSize) {
+ public static Flowable combineLatestArray(Publisher extends T>[] sources, Function super Object[], ? extends R> combiner, int bufferSize) {
ObjectHelper.requireNonNull(sources, "sources is null");
if (sources.length == 0) {
return empty();
@@ -664,7 +664,7 @@ public static Flowable combineLatest(
BiFunction super T1, ? super T2, ? extends R> combiner) {
ObjectHelper.requireNonNull(source1, "source1 is null");
ObjectHelper.requireNonNull(source2, "source2 is null");
- return combineLatest(new Publisher[] { source1, source2 }, Functions.toFunction(combiner), bufferSize());
+ return combineLatestArray(new Publisher[] { source1, source2 }, Functions.toFunction(combiner), bufferSize());
}
/**
@@ -714,7 +714,7 @@ public static Flowable combineLatest(
ObjectHelper.requireNonNull(source1, "source1 is null");
ObjectHelper.requireNonNull(source2, "source2 is null");
ObjectHelper.requireNonNull(source3, "source3 is null");
- return combineLatest(new Publisher[] { source1, source2, source3 }, Functions.toFunction(combiner), bufferSize());
+ return combineLatestArray(new Publisher[] { source1, source2, source3 }, Functions.toFunction(combiner), bufferSize());
}
/**
@@ -768,7 +768,7 @@ public static Flowable combineLatest(
ObjectHelper.requireNonNull(source2, "source2 is null");
ObjectHelper.requireNonNull(source3, "source3 is null");
ObjectHelper.requireNonNull(source4, "source4 is null");
- return combineLatest(new Publisher[] { source1, source2, source3, source4 }, Functions.toFunction(combiner), bufferSize());
+ return combineLatestArray(new Publisher[] { source1, source2, source3, source4 }, Functions.toFunction(combiner), bufferSize());
}
/**
@@ -827,7 +827,7 @@ public static Flowable combineLatest(
ObjectHelper.requireNonNull(source3, "source3 is null");
ObjectHelper.requireNonNull(source4, "source4 is null");
ObjectHelper.requireNonNull(source5, "source5 is null");
- return combineLatest(new Publisher[] { source1, source2, source3, source4, source5 }, Functions.toFunction(combiner), bufferSize());
+ return combineLatestArray(new Publisher[] { source1, source2, source3, source4, source5 }, Functions.toFunction(combiner), bufferSize());
}
/**
@@ -890,7 +890,7 @@ public static Flowable combineLatest(
ObjectHelper.requireNonNull(source4, "source4 is null");
ObjectHelper.requireNonNull(source5, "source5 is null");
ObjectHelper.requireNonNull(source6, "source6 is null");
- return combineLatest(new Publisher[] { source1, source2, source3, source4, source5, source6 }, Functions.toFunction(combiner), bufferSize());
+ return combineLatestArray(new Publisher[] { source1, source2, source3, source4, source5, source6 }, Functions.toFunction(combiner), bufferSize());
}
/**
@@ -958,7 +958,7 @@ public static Flowable combineLatest(
ObjectHelper.requireNonNull(source5, "source5 is null");
ObjectHelper.requireNonNull(source6, "source6 is null");
ObjectHelper.requireNonNull(source7, "source7 is null");
- return combineLatest(new Publisher[] { source1, source2, source3, source4, source5, source6, source7 }, Functions.toFunction(combiner), bufferSize());
+ return combineLatestArray(new Publisher[] { source1, source2, source3, source4, source5, source6, source7 }, Functions.toFunction(combiner), bufferSize());
}
/**
@@ -1030,7 +1030,7 @@ public static Flowable combineLatest(
ObjectHelper.requireNonNull(source6, "source6 is null");
ObjectHelper.requireNonNull(source7, "source7 is null");
ObjectHelper.requireNonNull(source8, "source8 is null");
- return combineLatest(new Publisher[] { source1, source2, source3, source4, source5, source6, source7, source8 }, Functions.toFunction(combiner), bufferSize());
+ return combineLatestArray(new Publisher[] { source1, source2, source3, source4, source5, source6, source7, source8 }, Functions.toFunction(combiner), bufferSize());
}
/**
@@ -1107,7 +1107,7 @@ public static Flowable combineLatest(
ObjectHelper.requireNonNull(source7, "source7 is null");
ObjectHelper.requireNonNull(source8, "source8 is null");
ObjectHelper.requireNonNull(source9, "source9 is null");
- return combineLatest(new Publisher[] { source1, source2, source3, source4, source5, source6, source7, source8, source9 }, Functions.toFunction(combiner), bufferSize());
+ return combineLatestArray(new Publisher[] { source1, source2, source3, source4, source5, source6, source7, source8, source9 }, Functions.toFunction(combiner), bufferSize());
}
/**
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index a676d3a489..a56aa97695 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -281,7 +281,7 @@ public static Observable combineLatest(Iterable extends ObservableSo
*
*
* Scheduler:
- * {@code combineLatest} does not operate by default on a particular {@link Scheduler}.
+ * {@code combineLatestArray} does not operate by default on a particular {@link Scheduler}.
*
*
* @param
@@ -298,9 +298,9 @@ public static Observable combineLatest(Iterable extends ObservableSo
*/
@CheckReturnValue
@SchedulerSupport(SchedulerSupport.NONE)
- public static Observable combineLatest(ObservableSource extends T>[] sources,
+ public static Observable combineLatestArray(ObservableSource extends T>[] sources,
Function super Object[], ? extends R> combiner) {
- return combineLatest(sources, combiner, bufferSize());
+ return combineLatestArray(sources, combiner, bufferSize());
}
/**
@@ -323,7 +323,7 @@ public static Observable combineLatest(ObservableSource extends T>[]
*
*
* Scheduler:
- * {@code combineLatest} does not operate by default on a particular {@link Scheduler}.
+ * {@code combineLatestArray} does not operate by default on a particular {@link Scheduler}.
*
*
* @param
@@ -343,7 +343,7 @@ public static Observable combineLatest(ObservableSource extends T>[]
@CheckReturnValue
@NonNull
@SchedulerSupport(SchedulerSupport.NONE)
- public static Observable combineLatest(ObservableSource extends T>[] sources,
+ public static Observable combineLatestArray(ObservableSource extends T>[] sources,
Function super Object[], ? extends R> combiner, int bufferSize) {
ObjectHelper.requireNonNull(sources, "sources is null");
if (sources.length == 0) {
@@ -394,7 +394,7 @@ public static Observable combineLatest(
BiFunction super T1, ? super T2, ? extends R> combiner) {
ObjectHelper.requireNonNull(source1, "source1 is null");
ObjectHelper.requireNonNull(source2, "source2 is null");
- return combineLatest(new ObservableSource[] { source1, source2 }, Functions.toFunction(combiner), bufferSize());
+ return combineLatestArray(new ObservableSource[] { source1, source2 }, Functions.toFunction(combiner), bufferSize());
}
/**
@@ -439,7 +439,7 @@ public static Observable combineLatest(
ObjectHelper.requireNonNull(source1, "source1 is null");
ObjectHelper.requireNonNull(source2, "source2 is null");
ObjectHelper.requireNonNull(source3, "source3 is null");
- return combineLatest(new ObservableSource[] { source1, source2, source3 }, Functions.toFunction(combiner), bufferSize());
+ return combineLatestArray(new ObservableSource[] { source1, source2, source3 }, Functions.toFunction(combiner), bufferSize());
}
/**
@@ -488,7 +488,7 @@ public static Observable combineLatest(
ObjectHelper.requireNonNull(source2, "source2 is null");
ObjectHelper.requireNonNull(source3, "source3 is null");
ObjectHelper.requireNonNull(source4, "source4 is null");
- return combineLatest(new ObservableSource[] { source1, source2, source3, source4 }, Functions.toFunction(combiner), bufferSize());
+ return combineLatestArray(new ObservableSource[] { source1, source2, source3, source4 }, Functions.toFunction(combiner), bufferSize());
}
/**
@@ -542,7 +542,7 @@ public static Observable combineLatest(
ObjectHelper.requireNonNull(source3, "source3 is null");
ObjectHelper.requireNonNull(source4, "source4 is null");
ObjectHelper.requireNonNull(source5, "source5 is null");
- return combineLatest(new ObservableSource[] { source1, source2, source3, source4, source5 }, Functions.toFunction(combiner), bufferSize());
+ return combineLatestArray(new ObservableSource[] { source1, source2, source3, source4, source5 }, Functions.toFunction(combiner), bufferSize());
}
/**
@@ -600,7 +600,7 @@ public static Observable combineLatest(
ObjectHelper.requireNonNull(source4, "source4 is null");
ObjectHelper.requireNonNull(source5, "source5 is null");
ObjectHelper.requireNonNull(source6, "source6 is null");
- return combineLatest(new ObservableSource[] { source1, source2, source3, source4, source5, source6 }, Functions.toFunction(combiner), bufferSize());
+ return combineLatestArray(new ObservableSource[] { source1, source2, source3, source4, source5, source6 }, Functions.toFunction(combiner), bufferSize());
}
/**
@@ -663,7 +663,7 @@ public static Observable combineLatest(
ObjectHelper.requireNonNull(source5, "source5 is null");
ObjectHelper.requireNonNull(source6, "source6 is null");
ObjectHelper.requireNonNull(source7, "source7 is null");
- return combineLatest(new ObservableSource[] { source1, source2, source3, source4, source5, source6, source7 }, Functions.toFunction(combiner), bufferSize());
+ return combineLatestArray(new ObservableSource[] { source1, source2, source3, source4, source5, source6, source7 }, Functions.toFunction(combiner), bufferSize());
}
/**
@@ -730,7 +730,7 @@ public static Observable combineLatest(
ObjectHelper.requireNonNull(source6, "source6 is null");
ObjectHelper.requireNonNull(source7, "source7 is null");
ObjectHelper.requireNonNull(source8, "source8 is null");
- return combineLatest(new ObservableSource[] { source1, source2, source3, source4, source5, source6, source7, source8 }, Functions.toFunction(combiner), bufferSize());
+ return combineLatestArray(new ObservableSource[] { source1, source2, source3, source4, source5, source6, source7, source8 }, Functions.toFunction(combiner), bufferSize());
}
/**
@@ -802,7 +802,7 @@ public static Observable combineLates
ObjectHelper.requireNonNull(source7, "source7 is null");
ObjectHelper.requireNonNull(source8, "source8 is null");
ObjectHelper.requireNonNull(source9, "source9 is null");
- return combineLatest(new ObservableSource[] { source1, source2, source3, source4, source5, source6, source7, source8, source9 }, Functions.toFunction(combiner), bufferSize());
+ return combineLatestArray(new ObservableSource[] { source1, source2, source3, source4, source5, source6, source7, source8, source9 }, Functions.toFunction(combiner), bufferSize());
}
/**
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 0a07b99d81..53f26254d8 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
@@ -1062,7 +1062,7 @@ public void combineLatestNArguments() throws Exception {
@SuppressWarnings("unchecked")
@Test
- public void combineLatestNSources() {
+ public void combineLatestArrayNSources() {
for (int i = 1; i < 100; i++) {
Flowable[] sources = new Flowable[i];
Arrays.fill(sources, Flowable.just(1));
@@ -1071,7 +1071,7 @@ public void combineLatestNSources() {
expected.add(1);
}
- Flowable.combineLatest(sources, new Function>() {
+ Flowable.combineLatestArray(sources, new Function>() {
@Override
public List apply(Object[] t) throws Exception {
return Arrays.asList(t);
@@ -1095,7 +1095,7 @@ public List apply(Object[] t) throws Exception {
@Test
public void combineLatestArrayOfSources() {
- Flowable.combineLatest(new Flowable[] {
+ Flowable.combineLatestArray(new Flowable[] {
Flowable.just(1), Flowable.just(2)
}, new Function() {
@Override
@@ -1173,8 +1173,8 @@ public Object apply(Object[] a) throws Exception {
@SuppressWarnings("unchecked")
@Test
- public void combineLatestEmpty() {
- assertSame(Flowable.empty(), Flowable.combineLatest(new Flowable[0], Functions.identity(), 16));
+ public void combineLatestArrayEmpty() {
+ assertSame(Flowable.empty(), Flowable.combineLatestArray(new Flowable[0], Functions.identity(), 16));
}
@SuppressWarnings("unchecked")
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 e20e96892d..3086e3941d 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
@@ -773,7 +773,7 @@ public Long apply(Long t1, Integer t2) {
@Test
public void combineLatestArrayOfSources() {
- Observable.combineLatest(new ObservableSource[] {
+ Observable.combineLatestArray(new ObservableSource[] {
Observable.just(1), Observable.just(2)
}, new Function() {
@Override
@@ -851,8 +851,8 @@ public Object apply(Object[] a) throws Exception {
@SuppressWarnings("unchecked")
@Test
- public void combineLatestEmpty() {
- assertSame(Observable.empty(), Observable.combineLatest(new ObservableSource[0], Functions.identity(), 16));
+ public void combineLatestArrayEmpty() {
+ assertSame(Observable.empty(), Observable.combineLatestArray(new ObservableSource[0], Functions.identity(), 16));
}
@SuppressWarnings("unchecked")
diff --git a/src/test/java/io/reactivex/rxjava3/tck/CombineLatestArrayTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/CombineLatestArrayTckTest.java
index a776e28e71..2cebfe655b 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/CombineLatestArrayTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/CombineLatestArrayTckTest.java
@@ -26,7 +26,7 @@ public class CombineLatestArrayTckTest extends BaseTck {
@Override
public Publisher createPublisher(long elements) {
return
- Flowable.combineLatest(
+ Flowable.combineLatestArray(
new Publisher[] { Flowable.just(1L), Flowable.fromIterable(iterate(elements)) },
new Function() {
@Override