#1738 - Refactor simplify switch and various

This commit is contained in:
rob bygrave committed 2019-06-28 23:48:03 +12:00
1 parent e6c9f151c1
commit 8bfae9deef
17 files changed
+40 -79

No files matched your search

@@ -303,9 +303,7 @@ public class DefaultExampleExpression implements SpiExpression, ExampleExpressio
*/
private boolean isZero(Object value) {
if (value instanceof Number) {
Number num = (Number) value;
double doubleValue = num.doubleValue();
if (doubleValue == 0) {
if (((Number) value).doubleValue() == 0) {
return true;
}
}
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.expression;
import java.util.Collection;
import java.util.Iterator;
import java.util.Objects;
/**
* Utility to help isSame methods.
@@ -12,14 +13,14 @@ public class Same {
* Return true if both values are null or both an not null.
*/
public static boolean sameByNull(Object v1, Object v2) {
return v1 == null ? v2 == null : v2 != null;
return (v1 == null) == (v2 == null);
}
/**
* Null safe equals check.
*/
public static boolean sameByValue(Object v1, Object v2) {
return v1 == null ? v2 == null : v1.equals(v2);
return Objects.equals(v1, v2);
}
/**