From 3c88479994644aef93662d303fa682f150fd46b9 Mon Sep 17 00:00:00 2001 From: slisaasquatch Date: Tue, 21 Jan 2020 11:44:54 -0800 Subject: [PATCH 1/3] Rename Single.equals to Single.sequenceEqual --- src/main/java/io/reactivex/rxjava3/core/Single.java | 4 ++-- .../rxjava3/internal/operators/single/SingleEqualsTest.java | 2 +- .../rxjava3/internal/operators/single/SingleMiscTest.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/io/reactivex/rxjava3/core/Single.java b/src/main/java/io/reactivex/rxjava3/core/Single.java index 0541ce8657..3c4721de75 100644 --- a/src/main/java/io/reactivex/rxjava3/core/Single.java +++ b/src/main/java/io/reactivex/rxjava3/core/Single.java @@ -1387,7 +1387,7 @@ public static Single timer(long delay, @NonNull TimeUnit unit, @NonNull Sc * *
*
Scheduler:
- *
{@code equals} does not operate by default on a particular {@link Scheduler}.
+ *
{@code sequenceEqual} does not operate by default on a particular {@link Scheduler}.
*
* @param the common value type * @param first the first {@code SingleSource} instance @@ -1399,7 +1399,7 @@ public static Single timer(long delay, @NonNull TimeUnit unit, @NonNull Sc @CheckReturnValue @NonNull @SchedulerSupport(SchedulerSupport.NONE) - public static Single equals(@NonNull SingleSource first, @NonNull SingleSource second) { // NOPMD + public static Single sequenceEqual(@NonNull SingleSource first, @NonNull SingleSource second) { // NOPMD Objects.requireNonNull(first, "first is null"); Objects.requireNonNull(second, "second is null"); return RxJavaPlugins.onAssembly(new SingleEquals<>(first, second)); diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleEqualsTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleEqualsTest.java index c664784869..6c1bf14f30 100644 --- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleEqualsTest.java +++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleEqualsTest.java @@ -28,7 +28,7 @@ public class SingleEqualsTest extends RxJavaTest { public void bothError() { List errors = TestHelper.trackPluginErrors(); try { - Single.equals(Single.error(new TestException("One")), Single.error(new TestException("Two"))) + Single.sequenceEqual(Single.error(new TestException("One")), Single.error(new TestException("Two"))) .to(TestHelper.testConsumer()) .assertFailureAndMessage(TestException.class, "One"); diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMiscTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMiscTest.java index ca2ccacdc2..dad1322b22 100644 --- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMiscTest.java +++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMiscTest.java @@ -280,11 +280,11 @@ public void toObservable() { @Test public void equals() { - Single.equals(Single.just(1), Single.just(1).hide()) + Single.sequenceEqual(Single.just(1), Single.just(1).hide()) .test() .assertResult(true); - Single.equals(Single.just(1), Single.just(2)) + Single.sequenceEqual(Single.just(1), Single.just(2)) .test() .assertResult(false); } From 73c8de40b4999a1504cb11731fac515271e739c2 Mon Sep 17 00:00:00 2001 From: slisaasquatch Date: Tue, 21 Jan 2020 11:53:21 -0800 Subject: [PATCH 2/3] Rename Single.sequenceEqual arguments --- src/main/java/io/reactivex/rxjava3/core/Single.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/io/reactivex/rxjava3/core/Single.java b/src/main/java/io/reactivex/rxjava3/core/Single.java index 3c4721de75..2d05a6917b 100644 --- a/src/main/java/io/reactivex/rxjava3/core/Single.java +++ b/src/main/java/io/reactivex/rxjava3/core/Single.java @@ -1390,8 +1390,8 @@ public static Single timer(long delay, @NonNull TimeUnit unit, @NonNull Sc *
{@code sequenceEqual} does not operate by default on a particular {@link Scheduler}.
* * @param the common value type - * @param first the first {@code SingleSource} instance - * @param second the second {@code SingleSource} instance + * @param source1 the first {@code SingleSource} instance + * @param source2 the second {@code SingleSource} instance * @return the new {@code Single} instance * @throws NullPointerException if {@code first} or {@code second} is {@code null} * @since 2.0 @@ -1399,10 +1399,10 @@ public static Single timer(long delay, @NonNull TimeUnit unit, @NonNull Sc @CheckReturnValue @NonNull @SchedulerSupport(SchedulerSupport.NONE) - public static Single sequenceEqual(@NonNull SingleSource first, @NonNull SingleSource second) { // NOPMD - Objects.requireNonNull(first, "first is null"); - Objects.requireNonNull(second, "second is null"); - return RxJavaPlugins.onAssembly(new SingleEquals<>(first, second)); + public static Single sequenceEqual(@NonNull SingleSource source1, @NonNull SingleSource source2) { // NOPMD + Objects.requireNonNull(source1, "source1 is null"); + Objects.requireNonNull(source2, "source2 is null"); + return RxJavaPlugins.onAssembly(new SingleEquals<>(source1, source2)); } /** From 12ce7511ab180cabbda59dc9483e149668d4e047 Mon Sep 17 00:00:00 2001 From: slisaasquatch Date: Tue, 21 Jan 2020 13:02:04 -0800 Subject: [PATCH 3/3] Update mentions of renamed parameters --- src/main/java/io/reactivex/rxjava3/core/Single.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/io/reactivex/rxjava3/core/Single.java b/src/main/java/io/reactivex/rxjava3/core/Single.java index 2d05a6917b..f915bdc5b2 100644 --- a/src/main/java/io/reactivex/rxjava3/core/Single.java +++ b/src/main/java/io/reactivex/rxjava3/core/Single.java @@ -1393,7 +1393,7 @@ public static Single timer(long delay, @NonNull TimeUnit unit, @NonNull Sc * @param source1 the first {@code SingleSource} instance * @param source2 the second {@code SingleSource} instance * @return the new {@code Single} instance - * @throws NullPointerException if {@code first} or {@code second} is {@code null} + * @throws NullPointerException if {@code source1} or {@code source2} is {@code null} * @since 2.0 */ @CheckReturnValue