This is an automated email from the ASF dual-hosted git repository.
jbertram pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new b863bc4ede ARTEMIS-4594 upgrade Error Prone to 2.24.1
b863bc4ede is described below
commit b863bc4ede1a681636188387c2dba8d05ae0d2ed
Author: Justin Bertram <[email protected]>
AuthorDate: Tue Jan 30 15:23:03 2024 -0600
ARTEMIS-4594 upgrade Error Prone to 2.24.1
This commit also fixes any new problems found with the new version.
---
pom.xml | 2 +-
.../cluster/distribution/SimpleSymmetricClusterTest.java | 12 ------------
.../cluster/distribution/SymmetricClusterTest.java | 6 ++++--
.../cluster/distribution/SymmetricClusterWithBackupTest.java | 3 ++-
.../distribution/SymmetricClusterWithDiscoveryTest.java | 5 +++--
.../artemis/tests/integration/jms/FloodServerTest.java | 7 +------
6 files changed, 11 insertions(+), 24 deletions(-)
diff --git a/pom.xml b/pom.xml
index d3d2cc0ec5..663a7fa358 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,7 +104,7 @@
<jetty.version>10.0.16</jetty.version>
<jetty-servlet-api.version>4.0.6</jetty-servlet-api.version>
<jgroups.version>5.3.0.Final</jgroups.version>
- <errorprone.version>2.20.0</errorprone.version>
+ <errorprone.version>2.24.1</errorprone.version>
<maven.bundle.plugin.version>5.1.9</maven.bundle.plugin.version>
<jib.maven.plugin.version>3.3.2</jib.maven.plugin.version>
<versions.maven.plugin.version>2.16.1</versions.maven.plugin.version>
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SimpleSymmetricClusterTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SimpleSymmetricClusterTest.java
index 3bda1796a8..15c7af3ebf 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SimpleSymmetricClusterTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SimpleSymmetricClusterTest.java
@@ -360,18 +360,6 @@ public class SimpleSymmetricClusterTest extends
ClusterTestBase {
}
- static int loopNumber;
-
- public void _testLoop() throws Throwable {
- for (int i = 0; i < 10; i++) {
- loopNumber = i;
- logger.debug("#test {}", i);
- testSimple();
- tearDown();
- setUp();
- }
- }
-
@Test
public void testSimple2() throws Exception {
setupServer(0, true, isNetty());
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SymmetricClusterTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SymmetricClusterTest.java
index a3e5898625..1b33db9660 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SymmetricClusterTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SymmetricClusterTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.activemq.artemis.tests.integration.cluster.distribution;
+import java.lang.invoke.MethodHandles;
+
import org.apache.activemq.artemis.api.core.RoutingType;
import org.apache.activemq.artemis.api.core.SimpleString;
import
org.apache.activemq.artemis.core.server.cluster.impl.MessageLoadBalancingType;
@@ -26,7 +28,6 @@ import org.junit.Before;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.lang.invoke.MethodHandles;
/**
* A SymmetricClusterTest
@@ -1389,7 +1390,8 @@ public class SymmetricClusterTest extends ClusterTestBase
{
verifyReceiveRoundRobinInSomeOrder(10, 1, 2, 3, 4);
}
- public void _testStartStopServers() throws Exception {
+ @Test
+ public void testStartStopServers() throws Exception {
doTestStartStopServers(1, 3000);
}
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SymmetricClusterWithBackupTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SymmetricClusterWithBackupTest.java
index d808e62d37..91be092ddc 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SymmetricClusterWithBackupTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SymmetricClusterWithBackupTest.java
@@ -234,7 +234,8 @@ public class SymmetricClusterWithBackupTest extends
SymmetricClusterTest {
}
@Override
- public void _testStartStopServers() throws Exception {
+ @Test
+ public void testStartStopServers() throws Exception {
setupCluster();
startServers();
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SymmetricClusterWithDiscoveryTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SymmetricClusterWithDiscoveryTest.java
index 80909dcdf1..37bc44c59b 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SymmetricClusterWithDiscoveryTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SymmetricClusterWithDiscoveryTest.java
@@ -18,6 +18,7 @@ package
org.apache.activemq.artemis.tests.integration.cluster.distribution;
import
org.apache.activemq.artemis.core.server.cluster.impl.MessageLoadBalancingType;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
+import org.junit.Test;
public class SymmetricClusterWithDiscoveryTest extends SymmetricClusterTest {
@@ -61,8 +62,8 @@ public class SymmetricClusterWithDiscoveryTest extends
SymmetricClusterTest {
* This is like testStopStartServers but we make sure we pause longer than
discovery group timeout
* before restarting (5 seconds)
*/
- public void _testStartStopServersWithPauseBeforeRestarting() throws
Exception {
+ @Test
+ public void testStartStopServersWithPauseBeforeRestarting() throws
Exception {
doTestStartStopServers(10000, 3000);
}
-
}
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/FloodServerTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/FloodServerTest.java
index 1fd88b1880..91fe94d8f3 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/FloodServerTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/FloodServerTest.java
@@ -55,13 +55,8 @@ public class FloodServerTest extends ActiveMQTestBase {
server.start();
}
-
-
@Test
- public void testFoo() {
- }
-
- public void _testFlood() throws Exception {
+ public void testFlood() throws Exception {
ConnectionFactory cf =
ActiveMQJMSClient.createConnectionFactory("tcp://127.0.0.1:61616?retryInterval=1000&retryIntervalMultiplier=1.0&reconnectAttempts=-1&callTimeout=30000&clientFailureCheckPeriod=1000&maxRetryInterval=1000&blockOnDurableSend=false&blockOnAcknowledge=false",
"cf");
final int numProducers = 20;
