[Java] Improvements after merge of PR #198.

real-logic · Jan 15, 2020 · 9159c47 · 9159c47
1 parent b5987ad
commit 9159c47
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 24 deletions.
diff --git a/agrona/src/main/java/org/agrona/collections/MutableInteger.java b/agrona/src/main/java/org/agrona/collections/MutableInteger.java
@@ -61,7 +61,7 @@ public int intValue()
 
     public long longValue()
     {
-        return (long)value;
+        return value;
     }
 
     public float floatValue()
@@ -71,7 +71,7 @@ public float floatValue()
 
     public double doubleValue()
     {
-        return (double)value;
+        return value;
     }
 
     public void increment()
@@ -81,15 +81,12 @@ public void increment()
 
     public int incrementAndGet()
     {
-        increment();
-        return get();
+        return ++value;
     }
 
     public int getAndIncrement()
     {
-        final int result = get();
-        increment();
-        return result;
+        return value++;
     }
 
     public void decrement()
@@ -99,15 +96,12 @@ public void decrement()
 
     public int decrementAndGet()
     {
-        decrement();
-        return get();
+        return --value;
     }
 
     public int getAndDecrement()
     {
-        final int result = get();
-        decrement();
-        return result;
+        return value--;
     }
 
     public boolean equals(final Object o)
@@ -144,6 +138,6 @@ public int compareTo(final MutableInteger that)
 
     public static int compare(final int lhs, final int rhs)
     {
-        return lhs < rhs ? -1 : (lhs == rhs ? 0 : 1);
+        return Integer.compare(lhs, rhs);
     }
 }
diff --git a/agrona/src/main/java/org/agrona/collections/MutableLong.java b/agrona/src/main/java/org/agrona/collections/MutableLong.java
@@ -81,15 +81,12 @@ public void increment()
 
     public long incrementAndGet()
     {
-        increment();
-        return get();
+        return ++value;
     }
 
     public long getAndIncrement()
     {
-        final long result = get();
-        increment();
-        return result;
+        return value++;
     }
 
     public void decrement()
@@ -99,15 +96,12 @@ public void decrement()
 
     public long decrementAndGet()
     {
-        decrement();
-        return get();
+        return --value;
     }
 
     public long getAndDecrement()
     {
-        final long result = get();
-        decrement();
-        return result;
+        return value--;
     }
 
     public boolean equals(final Object o)
@@ -144,6 +138,6 @@ public int compareTo(final MutableLong that)
 
     public static int compare(final long lhs, final long rhs)
     {
-        return lhs < rhs ? -1 : (lhs == rhs ? 0 : 1);
+        return Long.compare(lhs, rhs);
     }
 }