Replace MathUtils.compareInt() by Integer.compare()

h2/src/main/org/h2/index/BaseIndex.java

@@ -21,7 +21,6 @@ import org.h2.table.Column;
 import org.h2.table.IndexColumn;
 import org.h2.table.Table;
 import org.h2.table.TableFilter;
-import org.h2.util.MathUtils;
 import org.h2.util.StatementBuilder;
 import org.h2.util.StringUtils;
 import org.h2.value.Value;
@@ -348,7 +347,7 @@ public abstract class BaseIndex extends SchemaObjectBase implements Index {
             if (isMultiVersion) {
                 int v1 = rowData.getVersion();
                 int v2 = compare.getVersion();
-                return MathUtils.compareInt(v2, v1);
+                return Integer.compare(v2, v1);
             }
             return 0;
         }

h2/src/main/org/h2/index/MultiVersionCursor.java

@@ -10,7 +10,6 @@ import org.h2.engine.SysProperties;
 import org.h2.message.DbException;
 import org.h2.result.Row;
 import org.h2.result.SearchRow;
-import org.h2.util.MathUtils;
 
 /**
  * The cursor implementation for the multi-version index.

h2/src/main/org/h2/server/web/ConnectionInfo.java

@@ -5,7 +5,6 @@
  */
 package org.h2.server.web;
 
-import org.h2.util.MathUtils;
 import org.h2.util.StringUtils;
 
 /**
@@ -61,7 +60,7 @@ public class ConnectionInfo implements Comparable<ConnectionInfo> {
 
     @Override
     public int compareTo(ConnectionInfo o) {
-        return -MathUtils.compareInt(lastAccess, o.lastAccess);
+        return -Integer.compare(lastAccess, o.lastAccess);
     }
 
 }

h2/src/main/org/h2/tools/ConvertTraceFile.java

@@ -16,7 +16,6 @@ import java.util.StringTokenizer;
 import org.h2.message.DbException;
 import org.h2.store.fs.FileUtils;
 import org.h2.util.IOUtils;
-import org.h2.util.MathUtils;
 import org.h2.util.New;
 import org.h2.util.StringUtils;
 import org.h2.util.Tool;
@@ -48,7 +47,7 @@ public class ConvertTraceFile extends Tool {
             }
             int c = Long.compare(other.time, time);
             if (c == 0) {
-                c = MathUtils.compareInt(other.executeCount, executeCount);
+                c = Integer.compare(other.executeCount, executeCount);
                 if (c == 0) {
                     c = sql.compareTo(other.sql);
                 }

h2/src/main/org/h2/util/CacheObject.java

@@ -77,7 +77,7 @@ public abstract class CacheObject implements Comparable<CacheObject> {
 
     @Override
     public int compareTo(CacheObject other) {
-        return MathUtils.compareInt(getPos(), other.getPos());
+        return Integer.compare(getPos(), other.getPos());
     }
 
     public boolean isStream() {

h2/src/main/org/h2/util/MathUtils.java

@@ -279,18 +279,6 @@ public class MathUtils {
         }
     }
 
-    /**
-     * Compare two values. Returns -1 if the first value is smaller, 1 if
-     * bigger, and 0 if equal.
-     *
-     * @param a the first value
-     * @param b the second value
-     * @return the result
-     */
-    public static int compareInt(int a, int b) {
-        return a == b ? 0 : a < b ? -1 : 1;
-    }
-
     /**
      * Get a cryptographically secure pseudo random long value.
      *

h2/src/main/org/h2/value/ValueByte.java

@@ -10,7 +10,6 @@ import java.sql.SQLException;
 
 import org.h2.api.ErrorCode;
 import org.h2.message.DbException;
-import org.h2.util.MathUtils;
 
 /**
  * Implementation of the BYTE data type.
@@ -106,7 +105,7 @@ public class ValueByte extends Value {
     @Override
     protected int compareSecure(Value o, CompareMode mode) {
         ValueByte v = (ValueByte) o;
-        return MathUtils.compareInt(value, v.value);
+        return Integer.compare(value, v.value);
     }
 
     @Override

h2/src/main/org/h2/value/ValueEnum.java

@@ -8,7 +8,6 @@ package org.h2.value;
 import java.util.Locale;
 import org.h2.api.ErrorCode;
 import org.h2.message.DbException;
-import org.h2.util.MathUtils;
 
 public class ValueEnum extends ValueEnumBase {
     private static enum Validation {
@@ -57,7 +56,7 @@ public class ValueEnum extends ValueEnumBase {
 
     @Override
     protected int compareSecure(final Value v, final CompareMode mode) {
-        return MathUtils.compareInt(getInt(), v.getInt());
+        return Integer.compare(getInt(), v.getInt());
     }
 
     /**

h2/src/main/org/h2/value/ValueEnumBase.java

@@ -7,7 +7,6 @@ package org.h2.value;
 
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
-import org.h2.util.MathUtils;
 
 /**
  * Base implementation of the ENUM data type.
@@ -35,7 +34,7 @@ public class ValueEnumBase extends Value {
 
     @Override
     protected int compareSecure(final Value v, final CompareMode mode) {
-        return MathUtils.compareInt(getInt(), v.getInt());
+        return Integer.compare(getInt(), v.getInt());
     }
 
     @Override

h2/src/main/org/h2/value/ValueInt.java

@@ -10,7 +10,6 @@ import java.sql.SQLException;
 
 import org.h2.api.ErrorCode;
 import org.h2.message.DbException;
-import org.h2.util.MathUtils;
 
 /**
  * Implementation of the INT data type.
@@ -140,7 +139,7 @@ public class ValueInt extends Value {
     @Override
     protected int compareSecure(Value o, CompareMode mode) {
         ValueInt v = (ValueInt) o;
-        return MathUtils.compareInt(value, v.value);
+        return Integer.compare(value, v.value);
     }
 
     @Override

h2/src/main/org/h2/value/ValueShort.java

@@ -10,7 +10,6 @@ import java.sql.SQLException;
 
 import org.h2.api.ErrorCode;
 import org.h2.message.DbException;
-import org.h2.util.MathUtils;
 
 /**
  * Implementation of the SMALLINT data type.
@@ -106,7 +105,7 @@ public class ValueShort extends Value {
     @Override
     protected int compareSecure(Value o, CompareMode mode) {
         ValueShort v = (ValueShort) o;
-        return MathUtils.compareInt(value, v.value);
+        return Integer.compare(value, v.value);
     }
 
     @Override