Skip to content

Commit 4dd4a65

Browse files
akarnokdakarnokd
authored
3.x: Rename to combineLatestArrayDelayError (#6838)
1 parent 479a7a2 commit 4dd4a65

File tree

5 files changed

+22
-22
lines changed

5 files changed

+22
-22
lines changed

‎src/main/java/io/reactivex/rxjava3/core/Flowable.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ public static <T, R> Flowable<R> combineLatest(@NonNull Iterable<? extends Publi
461461
* are requested in a bounded manner, however, their backpressure is not enforced (the operator won't signal
462462
* {@link MissingBackpressureException}) and may lead to {@link OutOfMemoryError} due to internal buffer bloat.</dd>
463463
* <dt><b>Scheduler:</b></dt>
464-
* <dd>{@code combineLatestDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
464+
* <dd>{@code combineLatestArrayDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
465465
* </dl>
466466
*
467467
* @param <T>
@@ -481,9 +481,9 @@ public static <T, R> Flowable<R> combineLatest(@NonNull Iterable<? extends Publi
481481
@CheckReturnValue
482482
@BackpressureSupport(BackpressureKind.FULL)
483483
@NonNull
484-
public static <T, @NonNull R> Flowable<R> combineLatestDelayError(@NonNull Publisher<? extends T>[] sources,
484+
public static <T, @NonNull R> Flowable<R> combineLatestArrayDelayError(@NonNull Publisher<? extends T>[] sources,
485485
@NonNull Function<? super Object[], ? extends R> combiner) {
486-
return combineLatestDelayError(sources, combiner, bufferSize());
486+
return combineLatestArrayDelayError(sources, combiner, bufferSize());
487487
}
488488

489489
/**
@@ -509,7 +509,7 @@ public static <T, R> Flowable<R> combineLatest(@NonNull Iterable<? extends Publi
509509
* are requested in a bounded manner, however, their backpressure is not enforced (the operator won't signal
510510
* {@link MissingBackpressureException}) and may lead to {@link OutOfMemoryError} due to internal buffer bloat.</dd>
511511
* <dt><b>Scheduler:</b></dt>
512-
* <dd>{@code combineLatestDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
512+
* <dd>{@code combineLatestArrayDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
513513
* </dl>
514514
*
515515
* @param <T>
@@ -532,7 +532,7 @@ public static <T, R> Flowable<R> combineLatest(@NonNull Iterable<? extends Publi
532532
@CheckReturnValue
533533
@NonNull
534534
@BackpressureSupport(BackpressureKind.FULL)
535-
public static <T, @NonNull R> Flowable<R> combineLatestDelayError(@NonNull Publisher<? extends T>[] sources,
535+
public static <T, @NonNull R> Flowable<R> combineLatestArrayDelayError(@NonNull Publisher<? extends T>[] sources,
536536
@NonNull Function<? super Object[], ? extends R> combiner, int bufferSize) {
537537
Objects.requireNonNull(sources, "sources is null");
538538
Objects.requireNonNull(combiner, "combiner is null");

‎src/main/java/io/reactivex/rxjava3/core/Observable.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -868,7 +868,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Observable<R> combineLates
868868
*
869869
* <dl>
870870
* <dt><b>Scheduler:</b></dt>
871-
* <dd>{@code combineLatestDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
871+
* <dd>{@code combineLatestArrayDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
872872
* </dl>
873873
*
874874
* @param <T>
@@ -887,10 +887,10 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Observable<R> combineLates
887887
@CheckReturnValue
888888
@SchedulerSupport(SchedulerSupport.NONE)
889889
@NonNull
890-
public static <T, R> Observable<R> combineLatestDelayError(
890+
public static <T, R> Observable<R> combineLatestArrayDelayError(
891891
@NonNull ObservableSource<? extends T>[] sources,
892892
@NonNull Function<? super Object[], ? extends R> combiner) {
893-
return combineLatestDelayError(sources, combiner, bufferSize());
893+
return combineLatestArrayDelayError(sources, combiner, bufferSize());
894894
}
895895

896896
/**
@@ -914,7 +914,7 @@ public static <T, R> Observable<R> combineLatestDelayError(
914914
* <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatestDelayError.png" alt="">
915915
* <dl>
916916
* <dt><b>Scheduler:</b></dt>
917-
* <dd>{@code combineLatestDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
917+
* <dd>{@code combineLatestArrayDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
918918
* </dl>
919919
*
920920
* @param <T>
@@ -936,7 +936,7 @@ public static <T, R> Observable<R> combineLatestDelayError(
936936
@CheckReturnValue
937937
@NonNull
938938
@SchedulerSupport(SchedulerSupport.NONE)
939-
public static <T, R> Observable<R> combineLatestDelayError(@NonNull ObservableSource<? extends T>[] sources,
939+
public static <T, R> Observable<R> combineLatestArrayDelayError(@NonNull ObservableSource<? extends T>[] sources,
940940
@NonNull Function<? super Object[], ? extends R> combiner, int bufferSize) {
941941
Objects.requireNonNull(sources, "sources is null");
942942
Objects.requireNonNull(combiner, "combiner is null");

‎src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatestTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1073,7 +1073,7 @@ public List<Object> apply(Object[] t) throws Exception {
10731073
.test()
10741074
.assertResult(expected);
10751075

1076-
Flowable.combineLatestDelayError(sources, new Function<Object[], List<Object>>() {
1076+
Flowable.combineLatestArrayDelayError(sources, new Function<Object[], List<Object>>() {
10771077
@Override
10781078
public List<Object> apply(Object[] t) throws Exception {
10791079
return Arrays.asList(t);
@@ -1104,7 +1104,7 @@ public Object apply(Object[] a) throws Exception {
11041104
@SuppressWarnings("unchecked")
11051105
public void combineLatestDelayErrorArrayOfSources() {
11061106

1107-
Flowable.combineLatestDelayError(new Flowable[] {
1107+
Flowable.combineLatestArrayDelayError(new Flowable[] {
11081108
Flowable.just(1), Flowable.just(2)
11091109
}, new Function<Object[], Object>() {
11101110
@Override
@@ -1120,7 +1120,7 @@ public Object apply(Object[] a) throws Exception {
11201120
@SuppressWarnings("unchecked")
11211121
public void combineLatestDelayErrorArrayOfSourcesWithError() {
11221122

1123-
Flowable.combineLatestDelayError(new Flowable[] {
1123+
Flowable.combineLatestArrayDelayError(new Flowable[] {
11241124
Flowable.just(1), Flowable.just(2).concatWith(Flowable.<Integer>error(new TestException()))
11251125
}, new Function<Object[], Object>() {
11261126
@Override
@@ -1171,7 +1171,7 @@ public void combineLatestArrayEmpty() {
11711171
@SuppressWarnings("unchecked")
11721172
@Test
11731173
public void combineLatestDelayErrorEmpty() {
1174-
assertSame(Flowable.empty(), Flowable.combineLatestDelayError(new Flowable[0], Functions.<Object[]>identity(), 16));
1174+
assertSame(Flowable.empty(), Flowable.combineLatestArrayDelayError(new Flowable[0], Functions.<Object[]>identity(), 16));
11751175
}
11761176

11771177
@Test
@@ -1295,7 +1295,7 @@ public Object apply(Object a, Object b) throws Exception {
12951295
@SuppressWarnings("unchecked")
12961296
@Test
12971297
public void errorDelayed() {
1298-
Flowable.combineLatestDelayError(
1298+
Flowable.combineLatestArrayDelayError(
12991299
new Publisher[] { Flowable.error(new TestException()), Flowable.just(1) },
13001300
new Function<Object[], Object>() {
13011301
@Override
@@ -1312,7 +1312,7 @@ public Object apply(Object[] a) throws Exception {
13121312
@SuppressWarnings("unchecked")
13131313
@Test
13141314
public void errorDelayed2() {
1315-
Flowable.combineLatestDelayError(
1315+
Flowable.combineLatestArrayDelayError(
13161316
new Publisher[] { Flowable.error(new TestException()).startWithItem(1), Flowable.empty() },
13171317
new Function<Object[], Object>() {
13181318
@Override

‎src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatestTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -789,7 +789,7 @@ public Object apply(Object[] a) throws Exception {
789789
@SuppressWarnings("unchecked")
790790
public void combineLatestDelayErrorArrayOfSources() {
791791

792-
Observable.combineLatestDelayError(new ObservableSource[] {
792+
Observable.combineLatestArrayDelayError(new ObservableSource[] {
793793
Observable.just(1), Observable.just(2)
794794
}, new Function<Object[], Object>() {
795795
@Override
@@ -805,7 +805,7 @@ public Object apply(Object[] a) throws Exception {
805805
@SuppressWarnings("unchecked")
806806
public void combineLatestDelayErrorArrayOfSourcesWithError() {
807807

808-
Observable.combineLatestDelayError(new ObservableSource[] {
808+
Observable.combineLatestArrayDelayError(new ObservableSource[] {
809809
Observable.just(1), Observable.just(2).concatWith(Observable.<Integer>error(new TestException()))
810810
}, new Function<Object[], Object>() {
811811
@Override
@@ -856,7 +856,7 @@ public void combineLatestArrayEmpty() {
856856
@SuppressWarnings("unchecked")
857857
@Test
858858
public void combineLatestDelayErrorEmpty() {
859-
assertSame(Observable.empty(), Observable.combineLatestDelayError(new ObservableSource[0], Functions.<Object[]>identity(), 16));
859+
assertSame(Observable.empty(), Observable.combineLatestArrayDelayError(new ObservableSource[0], Functions.<Object[]>identity(), 16));
860860
}
861861

862862
@Test
@@ -923,7 +923,7 @@ public Object apply(Object a, Object b) throws Exception {
923923
@SuppressWarnings("unchecked")
924924
@Test
925925
public void errorDelayed() {
926-
Observable.combineLatestDelayError(
926+
Observable.combineLatestArrayDelayError(
927927
new ObservableSource[] { Observable.error(new TestException()), Observable.just(1) },
928928
new Function<Object[], Object>() {
929929
@Override
@@ -940,7 +940,7 @@ public Object apply(Object[] a) throws Exception {
940940
@SuppressWarnings("unchecked")
941941
@Test
942942
public void errorDelayed2() {
943-
Observable.combineLatestDelayError(
943+
Observable.combineLatestArrayDelayError(
944944
new ObservableSource[] { Observable.error(new TestException()).startWithItem(1), Observable.empty() },
945945
new Function<Object[], Object>() {
946946
@Override

‎src/test/java/io/reactivex/rxjava3/tck/CombineLatestArrayDelayErrorTckTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public class CombineLatestArrayDelayErrorTckTest extends BaseTck<Long> {
2626
@Override
2727
public Publisher<Long> createPublisher(long elements) {
2828
return
29-
Flowable.combineLatestDelayError(
29+
Flowable.combineLatestArrayDelayError(
3030
new Publisher[] { Flowable.just(1L), Flowable.fromIterable(iterate(elements)) },
3131
new Function<Object[], Long>() {
3232
@Override

0 commit comments

Comments
 (0)