ARTEMIS-2320 Fix MathAbsoluteRandom errorprone warning

Math.abs does not always give a positive result. Please consider other methods for positive random numbers.
apache · Apr 29, 2019 · 7820011 · 7820011
1 parent f7a3630
commit 7820011
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/...rc/test/java/org/apache/activemq/artemis/utils/collections/ConcurrentLongHashSetTest.java b/...rc/test/java/org/apache/activemq/artemis/utils/collections/ConcurrentLongHashSetTest.java
@@ -25,10 +25,10 @@
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Random;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
+import java.util.concurrent.ThreadLocalRandom;
 
 import org.junit.Test;
 
@@ -131,10 +131,10 @@ public void concurrentInsertions() throws Throwable {
          final int threadIdx = i;
 
          futures.add(executor.submit(() -> {
-            Random random = new Random();
+            final ThreadLocalRandom random = ThreadLocalRandom.current();
 
             for (int j = 0; j < N; j++) {
-               long key = Math.abs(random.nextLong());
+               long key = random.nextLong(Long.MAX_VALUE);
                // Ensure keys are unique
                key -= key % (threadIdx + 1);
 
@@ -165,10 +165,10 @@ public void concurrentInsertionsAndReads() throws Throwable {
          final int threadIdx = i;
 
          futures.add(executor.submit(() -> {
-            Random random = new Random();
+            final ThreadLocalRandom random = ThreadLocalRandom.current();
 
             for (int j = 0; j < N; j++) {
-               long key = Math.abs(random.nextLong());
+               long key = random.nextLong(Long.MAX_VALUE);
                // Ensure keys are unique
                key -= key % (threadIdx + 1);
 

diff --git a/...s/src/test/java/org/apache/activemq/artemis/utils/collections/PriorityCollectionTest.java b/...s/src/test/java/org/apache/activemq/artemis/utils/collections/PriorityCollectionTest.java
@@ -27,11 +27,11 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
-import java.util.Random;
 import java.util.concurrent.CopyOnWriteArraySet;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
+import java.util.concurrent.ThreadLocalRandom;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -94,10 +94,10 @@ public void concurrentInsertions() throws Throwable {
          final int threadIdx = i;
 
          futures.add(executor.submit(() -> {
-            Random random = new Random();
+            final ThreadLocalRandom random = ThreadLocalRandom.current();
 
             for (int j = 0; j < N; j++) {
-               long key = Math.abs(random.nextLong());
+               long key = random.nextLong(Long.MAX_VALUE);
                // Ensure keys are unique
                key -= key % (threadIdx + 1);
 
@@ -128,10 +128,10 @@ public void concurrentInsertionsAndReads() throws Throwable {
          final int threadIdx = i;
 
          futures.add(executor.submit(() -> {
-            Random random = new Random();
+            ThreadLocalRandom random = ThreadLocalRandom.current();
 
             for (int j = 0; j < N; j++) {
-               long key = Math.abs(random.nextLong());
+               long key = random.nextLong(Long.MAX_VALUE);
                // Ensure keys are unique
                key -= key % (threadIdx + 1);