[ISSUE #10817] Upgrade SpotBugs for JDK 21 compatibility (#10818)

This commit is contained in:
fuyou001
2026-08-06 19:22:52 +08:00
committed by GitHub
parent 69f108316d
commit 51f9fcc493
7 changed files with 13 additions and 17 deletions
@@ -20,10 +20,10 @@ import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import java.util.Random;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.LongAdder;
@@ -322,7 +322,7 @@ public class BatchProducer {
msg.getProperties().clear();
}
int startValue = (new Random(System.currentTimeMillis())).nextInt(100);
int startValue = ThreadLocalRandom.current().nextInt(100);
int size = 0;
for (int i = 0; ; i++) {
String prop1 = "prop" + i, prop1V = "hello" + startValue;
@@ -449,4 +449,4 @@ class StatsBenchmarkBatchProducer {
public void shutdown() {
executorService.shutdown();
}
}
}
@@ -43,13 +43,13 @@ import org.apache.rocketmq.srvutil.ServerUtil;
import java.util.Arrays;
import java.util.LinkedList;
import java.util.Random;
import java.util.TimerTask;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.atomic.AtomicLong;
public class Producer {
@@ -197,7 +197,7 @@ public class Producer {
msg.getProperties().clear();
}
int i = 0;
int startValue = (new Random(System.currentTimeMillis())).nextInt(100);
int startValue = ThreadLocalRandom.current().nextInt(100);
int size = 0;
while (true) {
String prop1 = "prop" + i, prop1V = "hello" + startValue;
+1 -2
View File
@@ -170,7 +170,7 @@
<jacoco-maven-plugin.version>0.8.5</jacoco-maven-plugin.version>
<maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
<sonar-maven-plugin.version>3.0.2</sonar-maven-plugin.version>
<spotbugs-plugin.version>4.2.2</spotbugs-plugin.version>
<spotbugs-plugin.version>4.8.6.8</spotbugs-plugin.version>
<maven-assembly-plugin.version>3.4.2</maven-assembly-plugin.version>
<maven-javadoc-plugin.version>2.10.4</maven-javadoc-plugin.version>
<maven-failsafe-plugin.version>2.19.1</maven-failsafe-plugin.version>
@@ -451,7 +451,6 @@
<configuration>
<failOnError>true</failOnError>
<fork>false</fork>
<spotbugsXmlOutput>true</spotbugsXmlOutput>
<excludeFilterFile>${project.root}/style/spotbugs-suppressions.xml</excludeFilterFile>
<threshold>High</threshold>
<effort>Max</effort>
@@ -24,9 +24,9 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Random;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import org.apache.commons.collections.CollectionUtils;
@@ -67,9 +67,8 @@ public class MessageQueueSelector {
this.queues.addAll(buildWrite(topicRouteWrapper));
}
buildBrokerActingQueues(topicRouteWrapper.getTopicName(), this.queues);
Random random = new Random();
this.queueIndex = new AtomicInteger(random.nextInt());
this.brokerIndex = new AtomicInteger(random.nextInt());
this.queueIndex = new AtomicInteger(ThreadLocalRandom.current().nextInt());
this.brokerIndex = new AtomicInteger(ThreadLocalRandom.current().nextInt());
if (priorityProvider == null) {
priorityProvider = new DefaultMessageQueuePriorityProvider();
@@ -78,7 +78,6 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.Set;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.CompletableFuture;
@@ -86,6 +85,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
@@ -180,8 +180,7 @@ public class NettyRemotingClient extends NettyRemotingAbstract implements Remoti
}
private static int initValueIndex() {
Random r = new Random();
return r.nextInt(999);
return ThreadLocalRandom.current().nextInt(999);
}
private void loadSocksProxyJson() {
@@ -25,9 +25,9 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.Random;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.TimeUnit;
import org.apache.rocketmq.common.ThreadFactoryImpl;
import org.apache.rocketmq.common.TopicConfig;
@@ -149,7 +149,7 @@ public class CompactionStore {
try {
v = new CompactionLog(defaultMessageStore, this, topic, queueId);
v.load(true);
int randomDelay = 1000 + new Random(System.currentTimeMillis()).nextInt(compactionInterval);
int randomDelay = 1000 + ThreadLocalRandom.current().nextInt(compactionInterval);
compactionSchedule.scheduleWithFixedDelay(v::doCompaction, compactionInterval + randomDelay, compactionInterval + randomDelay, TimeUnit.MILLISECONDS);
} catch (IOException e) {
log.error("create compactionLog exception: ", e);
@@ -262,7 +262,6 @@ public final class RandomUtil {
}
int[] result = new int[n];
Random rd = new Random();
int index = 0;
for (int i = 0; i < result.length; i++) {
index = rd.nextInt(len--);