Replace some ObjecsHelpers methods with Java 8 APIs (#6770)

JakeWharton · akarnokd · commit 652f2a1e54bb · 2019-12-17T18:20:06.000+01:00
diff --git a/src/main/java/io/reactivex/rxjava3/core/Notification.java b/src/main/java/io/reactivex/rxjava3/core/Notification.java
@@ -16,6 +16,7 @@
 import io.reactivex.rxjava3.annotations.*;
 import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.util.NotificationLite;
+import java.util.Objects;
 
 /**
  * Represents the reactive signal types: onNext, onError and onComplete and
@@ -95,7 +96,7 @@ public Throwable getError() {
     public boolean equals(Object obj) {
         if (obj instanceof Notification) {
             Notification<?> n = (Notification<?>) obj;
-            return ObjectHelper.equals(value, n.value);
+            return Objects.equals(value, n.value);
         }
         return false;
     }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/functions/Functions.java b/src/main/java/io/reactivex/rxjava3/internal/functions/Functions.java
@@ -275,7 +275,7 @@ static final class EqualsPredicate<T> implements Predicate<T> {
 
         @Override
         public boolean test(T t) throws Exception {
-            return ObjectHelper.equals(t, value);
+            return Objects.equals(t, value);
         }
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/functions/ObjectHelper.java b/src/main/java/io/reactivex/rxjava3/internal/functions/ObjectHelper.java
@@ -13,6 +13,7 @@
 package io.reactivex.rxjava3.internal.functions;
 
 import io.reactivex.rxjava3.functions.BiPredicate;
+import java.util.Objects;
 
 /**
  * Utility methods containing the backport of Java 7's Objects utility class.
@@ -41,45 +42,6 @@ public static <T> T requireNonNull(T object, String message) {
         return object;
     }
 
-    /**
-     * Compares two potentially null objects with each other using Object.equals.
-     * @param o1 the first object
-     * @param o2 the second object
-     * @return the comparison result
-     */
-    public static boolean equals(Object o1, Object o2) { // NOPMD
-        return o1 == o2 || (o1 != null && o1.equals(o2));
-    }
-
-    /**
-     * Returns the hashCode of a non-null object or zero for a null object.
-     * @param o the object to get the hashCode for.
-     * @return the hashCode
-     */
-    public static int hashCode(Object o) {
-        return o != null ? o.hashCode() : 0;
-    }
-
-    /**
-     * Compares two integer values similar to Integer.compare.
-     * @param v1 the first value
-     * @param v2 the second value
-     * @return the comparison result
-     */
-    public static int compare(int v1, int v2) {
-        return v1 < v2 ? -1 : (v1 > v2 ? 1 : 0);
-    }
-
-    /**
-     * Compares two long values similar to Long.compare.
-     * @param v1 the first value
-     * @param v2 the second value
-     * @return the comparison result
-     */
-    public static int compare(long v1, long v2) {
-        return v1 < v2 ? -1 : (v1 > v2 ? 1 : 0);
-    }
-
     static final BiPredicate<Object, Object> EQUALS = new BiObjectPredicate();
 
     /**
@@ -125,7 +87,7 @@ public static long verifyPositive(long value, String paramName) {
     static final class BiObjectPredicate implements BiPredicate<Object, Object> {
         @Override
         public boolean test(Object o1, Object o2) {
-            return ObjectHelper.equals(o1, o2);
+            return Objects.equals(o1, o2);
         }
     }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeContains.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeContains.java
@@ -16,8 +16,8 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.fuseable.HasUpstreamMaybeSource;
+import java.util.Objects;
 
 /**
  * Signals true if the source signals a value that is object-equals with the provided
@@ -81,7 +81,7 @@ public void onSubscribe(Disposable d) {
         @Override
         public void onSuccess(Object value) {
             upstream = DisposableHelper.DISPOSED;
-            downstream.onSuccess(ObjectHelper.equals(value, this.value));
+            downstream.onSuccess(Objects.equals(value, this.value));
         }
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleEquals.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleEquals.java
@@ -13,11 +13,11 @@
 
 package io.reactivex.rxjava3.internal.operators.single;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.disposables.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 public final class SingleEquals<T> extends Single<Boolean> {
@@ -68,7 +68,7 @@ public void onSuccess(T value) {
             values[index] = value;
 
             if (count.incrementAndGet() == 2) {
-                downstream.onSuccess(ObjectHelper.equals(values[0], values[1]));
+                downstream.onSuccess(Objects.equals(values[0], values[1]));
             }
         }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/TrampolineScheduler.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/TrampolineScheduler.java
@@ -23,7 +23,6 @@
 import io.reactivex.rxjava3.core.Scheduler;
 import io.reactivex.rxjava3.disposables.*;
 import io.reactivex.rxjava3.internal.disposables.EmptyDisposable;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
@@ -165,9 +164,9 @@ static final class TimedRunnable implements Comparable<TimedRunnable> {
 
         @Override
         public int compareTo(TimedRunnable that) {
-            int result = ObjectHelper.compare(execTime, that.execTime);
+            int result = Long.compare(execTime, that.execTime);
             if (result == 0) {
-                return ObjectHelper.compare(count, that.count);
+                return Integer.compare(count, that.count);
             }
             return result;
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/util/NotificationLite.java b/src/main/java/io/reactivex/rxjava3/internal/util/NotificationLite.java
@@ -14,11 +14,11 @@
 
 import java.io.Serializable;
 
+import java.util.Objects;
 import org.reactivestreams.*;
 
 import io.reactivex.rxjava3.core.Observer;
 import io.reactivex.rxjava3.disposables.Disposable;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 
 /**
  * Lightweight notification handling utility class.
@@ -52,7 +52,7 @@ public int hashCode() {
         public boolean equals(Object obj) {
             if (obj instanceof ErrorNotification) {
                 ErrorNotification n = (ErrorNotification) obj;
-                return ObjectHelper.equals(e, n.e);
+                return Objects.equals(e, n.e);
             }
             return false;
         }
diff --git a/src/main/java/io/reactivex/rxjava3/observers/BaseTestConsumer.java b/src/main/java/io/reactivex/rxjava3/observers/BaseTestConsumer.java
@@ -284,7 +284,7 @@ public final U assertValue(T value) {
             throw fail("expected: " + valueAndClass(value) + " but was: " + values);
         }
         T v = values.get(0);
-        if (!ObjectHelper.equals(value, v)) {
+        if (!Objects.equals(value, v)) {
             throw fail("expected: " + valueAndClass(value) + " but was: " + valueAndClass(v));
         }
         return (U)this;
@@ -330,7 +330,7 @@ public final U assertValueAt(int index, T value) {
         }
 
         T v = values.get(index);
-        if (!ObjectHelper.equals(value, v)) {
+        if (!Objects.equals(value, v)) {
             throw fail("expected: " + valueAndClass(value) + " but was: " + valueAndClass(v));
         }
         return (U)this;
@@ -421,7 +421,7 @@ public final U assertValues(T... values) {
         for (int i = 0; i < s; i++) {
             T v = this.values.get(i);
             T u = values[i];
-            if (!ObjectHelper.equals(u, v)) {
+            if (!Objects.equals(u, v)) {
                 throw fail("Values at position " + i + " differ; expected: " + valueAndClass(u) + " but was: " + valueAndClass(v));
             }
         }
@@ -466,7 +466,7 @@ public final U assertValueSequence(Iterable<? extends T> sequence) {
             T u = expectedIterator.next();
             T v = actualIterator.next();
 
-            if (!ObjectHelper.equals(u, v)) {
+            if (!Objects.equals(u, v)) {
                 throw fail("Values at position " + i + " differ; expected: " + valueAndClass(u) + " but was: " + valueAndClass(v));
             }
             i++;
diff --git a/src/main/java/io/reactivex/rxjava3/schedulers/TestScheduler.java b/src/main/java/io/reactivex/rxjava3/schedulers/TestScheduler.java
@@ -20,7 +20,6 @@
 import io.reactivex.rxjava3.core.Scheduler;
 import io.reactivex.rxjava3.disposables.*;
 import io.reactivex.rxjava3.internal.disposables.EmptyDisposable;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 
 /**
  * A special, non thread-safe scheduler for testing operators that require
@@ -76,9 +75,9 @@ public String toString() {
         @Override
         public int compareTo(TimedRunnable o) {
             if (time == o.time) {
-                return ObjectHelper.compare(count, o.count);
+                return Long.compare(count, o.count);
             }
-            return ObjectHelper.compare(time, o.time);
+            return Long.compare(time, o.time);
         }
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/schedulers/Timed.java b/src/main/java/io/reactivex/rxjava3/schedulers/Timed.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.schedulers;
 
+import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
 import io.reactivex.rxjava3.annotations.NonNull;
@@ -80,9 +81,9 @@ public long time(@NonNull TimeUnit unit) {
     public boolean equals(Object other) {
         if (other instanceof Timed) {
             Timed<?> o = (Timed<?>) other;
-            return ObjectHelper.equals(value, o.value)
+            return Objects.equals(value, o.value)
                     && time == o.time
-                    && ObjectHelper.equals(unit, o.unit);
+                    && Objects.equals(unit, o.unit);
         }
         return false;
     }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/functions/ObjectHelperTest.java b/src/test/java/io/reactivex/rxjava3/internal/functions/ObjectHelperTest.java
@@ -27,13 +27,6 @@ public void utilityClass() {
         TestHelper.checkUtilityClass(ObjectHelper.class);
     }
 
-    @Test
-    public void hashCodeOf() {
-        assertEquals(0, ObjectHelper.hashCode(null));
-
-        assertEquals(((Integer)1).hashCode(), ObjectHelper.hashCode(1));
-    }
-
     @Test
     public void verifyPositiveInt() throws Exception {
         assertEquals(1, ObjectHelper.verifyPositive(1, "param"));
@@ -53,18 +46,4 @@ public void verifyPositiveIntFail() throws Exception {
     public void verifyPositiveLongFail() throws Exception {
         assertEquals(-1L, ObjectHelper.verifyPositive(-1L, "param"));
     }
-
-    @Test
-    public void compare() {
-        assertEquals(-1, ObjectHelper.compare(0, 2));
-        assertEquals(0, ObjectHelper.compare(0, 0));
-        assertEquals(1, ObjectHelper.compare(2, 0));
-    }
-
-    @Test
-    public void compareLong() {
-        assertEquals(-1, ObjectHelper.compare(0L, 2L));
-        assertEquals(0, ObjectHelper.compare(0L, 0L));
-        assertEquals(1, ObjectHelper.compare(2L, 0L));
-    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/BaseTestConsumerEx.java b/src/test/java/io/reactivex/rxjava3/testsupport/BaseTestConsumerEx.java
@@ -16,10 +16,10 @@
 import java.util.List;
 
 import io.reactivex.rxjava3.functions.Predicate;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
 import io.reactivex.rxjava3.internal.util.ExceptionHelper;
 import io.reactivex.rxjava3.observers.BaseTestConsumer;
+import java.util.Objects;
 
 /**
  * Base class with shared infrastructure to support TestSubscriber and TestObserver.
@@ -74,7 +74,7 @@ public final U assertNever(T value) {
 
         for (int i = 0; i < s; i++) {
             T v = this.values.get(i);
-            if (ObjectHelper.equals(v, value)) {
+            if (Objects.equals(v, value)) {
                 throw fail("Value at position " + i + " is equal to " + valueAndClass(value) + "; Expected them to be different");
             }
         }
@@ -158,7 +158,7 @@ public final U assertErrorMessage(String message) {
         if (s == 1) {
             Throwable e = errors.get(0);
             String errorMessage = e.getMessage();
-            if (!ObjectHelper.equals(message, errorMessage)) {
+            if (!Objects.equals(message, errorMessage)) {
                 throw fail("Error message differs; exptected: " + message + " but was: " + errorMessage);
             }
         } else {
diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java b/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
@@ -36,7 +36,6 @@
 import io.reactivex.rxjava3.disposables.*;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.operators.completable.CompletableToFlowable;
 import io.reactivex.rxjava3.internal.operators.maybe.MaybeToFlowable;
@@ -196,7 +195,7 @@ public static void assertError(List<Throwable> list, int index, Class<? extends
             err.initCause(ex);
             throw err;
         }
-        if (!ObjectHelper.equals(message, ex.getMessage())) {
+        if (!Objects.equals(message, ex.getMessage())) {
             AssertionError err = new AssertionError("Message " + message + " expected but got " + ex.getMessage());
             err.initCause(ex);
             throw err;
@@ -216,7 +215,7 @@ public static void assertUndeliverable(List<Throwable> list, int index, Class<?
             err.initCause(list.get(index));
             throw err;
         }
-        if (!ObjectHelper.equals(message, ex.getMessage())) {
+        if (!Objects.equals(message, ex.getMessage())) {
             AssertionError err = new AssertionError("Message " + message + " expected but got " + ex.getMessage());
             err.initCause(ex);
             throw err;

Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,7 @@ static final class EqualsPredicate<T> implements Predicate<T> {`
`275`	`275`
`276`	`276`	`@Override`
`277`	`277`	`public boolean test(T t) throws Exception {`
`278`		`- return ObjectHelper.equals(t, value);`
	`278`	`+ return Objects.equals(t, value);`
`279`	`279`	`}`
`280`	`280`	`}`
`281`	`281`
Original file line number	Diff line number	Diff line change
`@@ -284,7 +284,7 @@ public final U assertValue(T value) {`
`284`	`284`	`throw fail("expected: " + valueAndClass(value) + " but was: " + values);`
`285`	`285`	`}`
`286`	`286`	`T v = values.get(0);`
`287`		`- if (!ObjectHelper.equals(value, v)) {`
	`287`	`+ if (!Objects.equals(value, v)) {`
`288`	`288`	`throw fail("expected: " + valueAndClass(value) + " but was: " + valueAndClass(v));`
`289`	`289`	`}`
`290`	`290`	`return (U)this;`
`@@ -330,7 +330,7 @@ public final U assertValueAt(int index, T value) {`
`330`	`330`	`}`
`331`	`331`
`332`	`332`	`T v = values.get(index);`
`333`		`- if (!ObjectHelper.equals(value, v)) {`
	`333`	`+ if (!Objects.equals(value, v)) {`
`334`	`334`	`throw fail("expected: " + valueAndClass(value) + " but was: " + valueAndClass(v));`
`335`	`335`	`}`
`336`	`336`	`return (U)this;`
`@@ -421,7 +421,7 @@ public final U assertValues(T... values) {`
`421`	`421`	`for (int i = 0; i < s; i++) {`
`422`	`422`	`T v = this.values.get(i);`
`423`	`423`	`T u = values[i];`
`424`		`- if (!ObjectHelper.equals(u, v)) {`
	`424`	`+ if (!Objects.equals(u, v)) {`
`425`	`425`	`throw fail("Values at position " + i + " differ; expected: " + valueAndClass(u) + " but was: " + valueAndClass(v));`
`426`	`426`	`}`
`427`	`427`	`}`
`@@ -466,7 +466,7 @@ public final U assertValueSequence(Iterable<? extends T> sequence) {`
`466`	`466`	`T u = expectedIterator.next();`
`467`	`467`	`T v = actualIterator.next();`
`468`	`468`
`469`		`- if (!ObjectHelper.equals(u, v)) {`
	`469`	`+ if (!Objects.equals(u, v)) {`
`470`	`470`	`throw fail("Values at position " + i + " differ; expected: " + valueAndClass(u) + " but was: " + valueAndClass(v));`
`471`	`471`	`}`
`472`	`472`	`i++;`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@`
`20`	`20`	`import io.reactivex.rxjava3.core.Scheduler;`
`21`	`21`	`import io.reactivex.rxjava3.disposables.*;`
`22`	`22`	`import io.reactivex.rxjava3.internal.disposables.EmptyDisposable;`
`23`		`-import io.reactivex.rxjava3.internal.functions.ObjectHelper;`
`24`	`23`
`25`	`24`	`/**`
`26`	`25`	`* A special, non thread-safe scheduler for testing operators that require`
`@@ -76,9 +75,9 @@ public String toString() {`
`76`	`75`	`@Override`
`77`	`76`	`public int compareTo(TimedRunnable o) {`
`78`	`77`	`if (time == o.time) {`
`79`		`- return ObjectHelper.compare(count, o.count);`
	`78`	`+ return Long.compare(count, o.count);`
`80`	`79`	`}`
`81`		`- return ObjectHelper.compare(time, o.time);`
	`80`	`+ return Long.compare(time, o.time);`
`82`	`81`	`}`
`83`	`82`	`}`
`84`	`83`