Skip to content

Commit

Permalink
ARTEMIS-4594 upgrade Error Prone to 2.24.1
Browse files Browse the repository at this point in the history
This commit also fixes any new problems found with the new version.
  • Loading branch information
jbertram committed Jan 31, 2024
1 parent efe4502 commit e2e4a26
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 24 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
<sevntu.checks.version>1.44.1</sevntu.checks.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -360,18 +360,6 @@ public void testSimple_TwoNodes() throws Exception {

}

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());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -26,7 +28,6 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.lang.invoke.MethodHandles;

/**
* A SymmetricClusterTest
Expand Down Expand Up @@ -1389,7 +1390,8 @@ public void testNoLocalQueueLoadBalancedQueues() throws Exception {
verifyReceiveRoundRobinInSomeOrder(10, 1, 2, 3, 4);
}

public void _testStartStopServers() throws Exception {
@Test
public void testStartStopServers() throws Exception {
doTestStartStopServers(1, 3000);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,8 @@ public void testMixtureLoadBalancedAndNonLoadBalancedQueuesAddQueuesAndConsumers
}

@Override
public void _testStartStopServers() throws Exception {
@Test
public void testStartStopServers() throws Exception {
setupCluster();

startServers();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

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 {

Expand Down Expand Up @@ -61,8 +62,8 @@ protected void setupServers() throws Exception {
* 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);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,8 @@ public void setUp() throws Exception {
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;
Expand Down

0 comments on commit e2e4a26

Please sign in to comment.