runtime-field: Fix #473 compareTo-method in Comparators

speedment · Jun 1, 2017 · c1183f5 · c1183f5
1 parent 8cba8b6
commit c1183f5
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/...rc/main/java/com/speedment/runtime/field/internal/comparator/ByteFieldComparatorImpl.java b/...rc/main/java/com/speedment/runtime/field/internal/comparator/ByteFieldComparatorImpl.java
@@ -71,7 +71,7 @@ public int compare(ENTITY first, ENTITY second) {
         requireNonNulls(first, second);
         final byte a = field.getAsByte(first);
         final byte b = field.getAsByte(second);
-        return applyReversed(a - b);
+        return applyReversed(Byte.compare(a, b));
     }
 
     @Override

diff --git a/...rc/main/java/com/speedment/runtime/field/internal/comparator/CharFieldComparatorImpl.java b/...rc/main/java/com/speedment/runtime/field/internal/comparator/CharFieldComparatorImpl.java
@@ -71,7 +71,7 @@ public int compare(ENTITY first, ENTITY second) {
         requireNonNulls(first, second);
         final char a = field.getAsChar(first);
         final char b = field.getAsChar(second);
-        return applyReversed(a - b);
+        return applyReversed(Character.compare(a, b));
     }
 
     @Override

diff --git a/.../main/java/com/speedment/runtime/field/internal/comparator/DoubleFieldComparatorImpl.java b/.../main/java/com/speedment/runtime/field/internal/comparator/DoubleFieldComparatorImpl.java
@@ -71,7 +71,7 @@ public int compare(ENTITY first, ENTITY second) {
         requireNonNulls(first, second);
         final double a = field.getAsDouble(first);
         final double b = field.getAsDouble(second);
-        return applyReversed(a - b);
+        return applyReversed(Double.compare(a, b));
     }
 
     @Override

diff --git a/...c/main/java/com/speedment/runtime/field/internal/comparator/FloatFieldComparatorImpl.java b/...c/main/java/com/speedment/runtime/field/internal/comparator/FloatFieldComparatorImpl.java
@@ -71,7 +71,7 @@ public int compare(ENTITY first, ENTITY second) {
         requireNonNulls(first, second);
         final float a = field.getAsFloat(first);
         final float b = field.getAsFloat(second);
-        return applyReversed(a - b);
+        return applyReversed(Float.compare(a, b));
     }
 
     @Override

diff --git a/...src/main/java/com/speedment/runtime/field/internal/comparator/IntFieldComparatorImpl.java b/...src/main/java/com/speedment/runtime/field/internal/comparator/IntFieldComparatorImpl.java
@@ -71,7 +71,7 @@ public int compare(ENTITY first, ENTITY second) {
         requireNonNulls(first, second);
         final int a = field.getAsInt(first);
         final int b = field.getAsInt(second);
-        return applyReversed(a - b);
+        return applyReversed(Integer.compare(a, b));
     }
 
     @Override

diff --git a/...rc/main/java/com/speedment/runtime/field/internal/comparator/LongFieldComparatorImpl.java b/...rc/main/java/com/speedment/runtime/field/internal/comparator/LongFieldComparatorImpl.java
@@ -71,7 +71,7 @@ public int compare(ENTITY first, ENTITY second) {
         requireNonNulls(first, second);
         final long a = field.getAsLong(first);
         final long b = field.getAsLong(second);
-        return applyReversed(a - b);
+        return applyReversed(Long.compare(a, b));
     }
 
     @Override

diff --git a/...c/main/java/com/speedment/runtime/field/internal/comparator/ShortFieldComparatorImpl.java b/...c/main/java/com/speedment/runtime/field/internal/comparator/ShortFieldComparatorImpl.java
@@ -71,7 +71,7 @@ public int compare(ENTITY first, ENTITY second) {
         requireNonNulls(first, second);
         final short a = field.getAsShort(first);
         final short b = field.getAsShort(second);
-        return applyReversed(a - b);
+        return applyReversed(Short.compare(a, b));
     }
 
     @Override