diff --git a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/DivertQueueMirrorTest.java b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/DivertQueueMirrorTest.java index e7c86a6b65f..e966980aeca 100644 --- a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/DivertQueueMirrorTest.java +++ b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/DivertQueueMirrorTest.java @@ -75,7 +75,7 @@ public class DivertQueueMirrorTest extends SmokeTestBase { private static void createServer(String serverName, String connectionName, String mirrorURI, - int porOffset) throws Exception { + int portOffset) throws Exception { File serverLocation = getFileServerLocation(serverName); deleteDirectory(serverLocation); @@ -87,7 +87,7 @@ private static void createServer(String serverName, cliCreateServer.setArgs("--no-stomp-acceptor", "--no-hornetq-acceptor", "--no-mqtt-acceptor", "--no-amqp-acceptor", "--max-hops", "1", "--name", DC1_NODE_A); cliCreateServer.addArgs("--queues", CREATE_QUEUE); cliCreateServer.addArgs("--java-memory", "512M"); - cliCreateServer.setPortOffset(porOffset); + cliCreateServer.setPortOffset(portOffset); cliCreateServer.createServer(); Properties brokerProperties = new Properties(); diff --git a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/MirrorInfiniteRetryReplicaTest.java b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/MirrorInfiniteRetryReplicaTest.java index ddc2256a5ad..a8b827ca8bd 100644 --- a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/MirrorInfiniteRetryReplicaTest.java +++ b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/MirrorInfiniteRetryReplicaTest.java @@ -97,7 +97,7 @@ private static String uriWithAlternate(String ip, String alternate) { private static void createMirroredServer(String serverName, String connectionName, String mirrorURI, - int porOffset, + int portOffset, boolean replicated, String clusterStatic) throws Exception { File serverLocation = getFileServerLocation(serverName); @@ -108,7 +108,7 @@ private static void createMirroredServer(String serverName, cliCreateServer.setNoWeb(true); cliCreateServer.setArgs("--no-stomp-acceptor", "--no-hornetq-acceptor", "--no-mqtt-acceptor", "--no-amqp-acceptor", "--max-hops", "1", "--name", DC1_NODE); cliCreateServer.addArgs("--queues", QUEUE_NAME); - cliCreateServer.setPortOffset(porOffset); + cliCreateServer.setPortOffset(portOffset); if (replicated) { cliCreateServer.setReplicated(true); cliCreateServer.setStaticCluster(clusterStatic); @@ -162,7 +162,7 @@ private static void replaceLogs(File serverLocation) throws Exception { } private static void createMirroredBackupServer(String serverName, - int porOffset, + int portOffset, String clusterStatic, String mirrorURI) throws Exception { File serverLocation = getFileServerLocation(serverName); @@ -173,7 +173,7 @@ private static void createMirroredBackupServer(String serverName, cliCreateServer.setMessageLoadBalancing("ON_DEMAND"); cliCreateServer.setNoWeb(true); cliCreateServer.setArgs("--no-stomp-acceptor", "--no-hornetq-acceptor", "--no-mqtt-acceptor", "--no-amqp-acceptor", "--max-hops", "1", "--name", DC1_NODE); - cliCreateServer.setPortOffset(porOffset); + cliCreateServer.setPortOffset(portOffset); cliCreateServer.setClustered(true); cliCreateServer.setReplicated(true); cliCreateServer.setBackup(true); diff --git a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/AccumulatedInPageSoakTest.java b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/AccumulatedInPageSoakTest.java index 568c25df28c..f856a043fec 100644 --- a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/AccumulatedInPageSoakTest.java +++ b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/AccumulatedInPageSoakTest.java @@ -81,7 +81,7 @@ public class AccumulatedInPageSoakTest extends SoakTestBase { private static void createServer(String serverName, String connectionName, String mirrorURI, - int porOffset) throws Exception { + int portOffset) throws Exception { File serverLocation = getFileServerLocation(serverName); deleteDirectory(serverLocation); @@ -93,7 +93,7 @@ private static void createServer(String serverName, cliCreateServer.setArgs("--no-stomp-acceptor", "--no-hornetq-acceptor", "--no-mqtt-acceptor", "--no-amqp-acceptor", "--max-hops", "1", "--name", DC1_NODE_A); cliCreateServer.addArgs("--queues", QUEUE_NAME); cliCreateServer.addArgs("--java-memory", "512M"); - cliCreateServer.setPortOffset(porOffset); + cliCreateServer.setPortOffset(portOffset); cliCreateServer.createServer(); Properties brokerProperties = new Properties(); diff --git a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ClusteredMirrorSoakTest.java b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ClusteredMirrorSoakTest.java index ad4191fe288..9f605a3f2d1 100644 --- a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ClusteredMirrorSoakTest.java +++ b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ClusteredMirrorSoakTest.java @@ -93,7 +93,7 @@ public class ClusteredMirrorSoakTest extends SoakTestBase { private static String DC2_NODEA_URI = "tcp://localhost:61618"; private static String DC2_NODEB_URI = "tcp://localhost:61619"; - private static void createServer(String serverName, String connectionName, String clusterURI, String mirrorURI, int porOffset, boolean paging) throws Exception { + private static void createServer(String serverName, String connectionName, String clusterURI, String mirrorURI, int portOffset, boolean paging) throws Exception { File serverLocation = getFileServerLocation(serverName); deleteDirectory(serverLocation); @@ -106,7 +106,7 @@ private static void createServer(String serverName, String connectionName, Strin cliCreateServer.setArgs("--no-stomp-acceptor", "--no-hornetq-acceptor", "--no-mqtt-acceptor", "--no-amqp-acceptor", "--max-hops", "1", "--name", DC1_NODE_A); cliCreateServer.addArgs("--addresses", "order"); cliCreateServer.addArgs("--queues", "myQueue"); - cliCreateServer.setPortOffset(porOffset); + cliCreateServer.setPortOffset(portOffset); cliCreateServer.createServer(); Properties brokerProperties = new Properties(); diff --git a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/IdempotentACKTest.java b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/IdempotentACKTest.java index 6369d63cb29..20745e4257b 100644 --- a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/IdempotentACKTest.java +++ b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/IdempotentACKTest.java @@ -81,7 +81,7 @@ public class IdempotentACKTest extends SoakTestBase { private static void createServer(String serverName, String connectionName, String mirrorURI, - int porOffset) throws Exception { + int portOffset) throws Exception { File serverLocation = getFileServerLocation(serverName); deleteDirectory(serverLocation); @@ -92,7 +92,7 @@ private static void createServer(String serverName, cliCreateServer.setNoWeb(true); cliCreateServer.setArgs("--no-stomp-acceptor", "--no-hornetq-acceptor", "--no-mqtt-acceptor", "--no-amqp-acceptor", "--max-hops", "1", "--name", DC1_NODE_A); cliCreateServer.addArgs("--queues", QUEUE_NAME); - cliCreateServer.setPortOffset(porOffset); + cliCreateServer.setPortOffset(portOffset); cliCreateServer.createServer(); Properties brokerProperties = new Properties(); diff --git a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/InterruptedLargeMessageTest.java b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/InterruptedLargeMessageTest.java index 47f67afe474..e32c9ed610e 100644 --- a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/InterruptedLargeMessageTest.java +++ b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/InterruptedLargeMessageTest.java @@ -85,7 +85,7 @@ public class InterruptedLargeMessageTest extends SoakTestBase { private static void createServer(String serverName, String connectionName, String mirrorURI, - int porOffset) throws Exception { + int portOffset) throws Exception { File serverLocation = getFileServerLocation(serverName); deleteDirectory(serverLocation); @@ -96,7 +96,7 @@ private static void createServer(String serverName, cliCreateServer.setNoWeb(true); cliCreateServer.setArgs("--no-stomp-acceptor", "--no-hornetq-acceptor", "--no-mqtt-acceptor", "--no-amqp-acceptor", "--max-hops", "1", "--name", DC1_NODE_A); cliCreateServer.addArgs("--queues", QUEUE_NAME); - cliCreateServer.setPortOffset(porOffset); + cliCreateServer.setPortOffset(portOffset); cliCreateServer.createServer(); Properties brokerProperties = new Properties(); diff --git a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/MultiMirrorSoakTest.java b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/MultiMirrorSoakTest.java index 7930ea8fd6e..521cc92210c 100644 --- a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/MultiMirrorSoakTest.java +++ b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/MultiMirrorSoakTest.java @@ -74,7 +74,7 @@ public class MultiMirrorSoakTest extends SoakTestBase { private static String DC3_NODEA_URI = "tcp://localhost:61618"; private static void createServer(String serverName, - int porOffset, + int portOffset, boolean paging, String... mirrorTo) throws Exception { File serverLocation = getFileServerLocation(serverName); @@ -88,7 +88,7 @@ private static void createServer(String serverName, cliCreateServer.setArgs("--no-stomp-acceptor", "--no-hornetq-acceptor", "--no-mqtt-acceptor", "--no-amqp-acceptor", "--max-hops", "1", "--name", DC1_NODE_A); cliCreateServer.addArgs("--addresses", "order"); cliCreateServer.addArgs("--queues", "myQueue"); - cliCreateServer.setPortOffset(porOffset); + cliCreateServer.setPortOffset(portOffset); cliCreateServer.createServer(); Properties brokerProperties = new Properties(); diff --git a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/PagedSNFSoakTest.java b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/PagedSNFSoakTest.java index 306924dfb15..d8ccda5db77 100644 --- a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/PagedSNFSoakTest.java +++ b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/PagedSNFSoakTest.java @@ -80,7 +80,7 @@ public class PagedSNFSoakTest extends SoakTestBase { private static void createServer(String serverName, String connectionName, String mirrorURI, - int porOffset) throws Exception { + int portOffset) throws Exception { File serverLocation = getFileServerLocation(serverName); deleteDirectory(serverLocation); @@ -92,7 +92,7 @@ private static void createServer(String serverName, cliCreateServer.setArgs("--no-stomp-acceptor", "--no-hornetq-acceptor", "--no-mqtt-acceptor", "--no-amqp-acceptor", "--max-hops", "1", "--name", DC1_NODE_A); cliCreateServer.addArgs("--queues", QUEUE_NAME); cliCreateServer.addArgs("--java-memory", "512M"); - cliCreateServer.setPortOffset(porOffset); + cliCreateServer.setPortOffset(portOffset); cliCreateServer.createServer(); Properties brokerProperties = new Properties(); diff --git a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/QuickAckMirrorTest.java b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/QuickAckMirrorTest.java index 8c5a9b4a82c..3f80246df63 100644 --- a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/QuickAckMirrorTest.java +++ b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/QuickAckMirrorTest.java @@ -62,7 +62,7 @@ public class QuickAckMirrorTest extends SoakTestBase { private static void createServer(String serverName, String connectionName, String mirrorURI, - int porOffset) throws Exception { + int portOffset) throws Exception { File serverLocation = getFileServerLocation(serverName); deleteDirectory(serverLocation); @@ -73,7 +73,7 @@ private static void createServer(String serverName, cliCreateServer.setNoWeb(true); cliCreateServer.setArgs("--no-stomp-acceptor", "--no-hornetq-acceptor", "--no-mqtt-acceptor", "--no-amqp-acceptor", "--max-hops", "1", "--name", DC1_NODE_A); cliCreateServer.addArgs("--queues", QUEUE_NAME); - cliCreateServer.setPortOffset(porOffset); + cliCreateServer.setPortOffset(portOffset); cliCreateServer.createServer(); Properties brokerProperties = new Properties(); diff --git a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ReplicatedBothNodesMirrorTest.java b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ReplicatedBothNodesMirrorTest.java index 17ef670aabf..8f4b4ebefe4 100644 --- a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ReplicatedBothNodesMirrorTest.java +++ b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ReplicatedBothNodesMirrorTest.java @@ -151,7 +151,7 @@ private void startDC1(SimpleManagement managementDC1) throws Exception { private static void createMirroredServer(String serverName, String connectionName, String mirrorURI, - int porOffset, + int portOffset, boolean replicated, String clusterStatic) throws Exception { File serverLocation = getFileServerLocation(serverName); @@ -166,7 +166,7 @@ private static void createMirroredServer(String serverName, cliCreateServer.setNoWeb(true); cliCreateServer.setArgs("--no-stomp-acceptor", "--no-hornetq-acceptor", "--no-mqtt-acceptor", "--no-amqp-acceptor", "--max-hops", "1", "--name", DC1_NODE); cliCreateServer.addArgs("--queues", QUEUE_NAME); - cliCreateServer.setPortOffset(porOffset); + cliCreateServer.setPortOffset(portOffset); if (replicated) { cliCreateServer.setReplicated(true); cliCreateServer.setStaticCluster(clusterStatic); @@ -221,7 +221,7 @@ private static void replaceLogs(File serverLocation) throws Exception { } - private static void createMirroredBackupServer(String serverName, int porOffset, String clusterStatic, String mirrorURI) throws Exception { + private static void createMirroredBackupServer(String serverName, int portOffset, String clusterStatic, String mirrorURI) throws Exception { File serverLocation = getFileServerLocation(serverName); if (REUSE_SERVERS && serverLocation.exists()) { deleteDirectory(new File(serverLocation, "data")); @@ -234,7 +234,7 @@ private static void createMirroredBackupServer(String serverName, int porOffset, cliCreateServer.setMessageLoadBalancing("ON_DEMAND"); cliCreateServer.setNoWeb(true); cliCreateServer.setArgs("--no-stomp-acceptor", "--no-hornetq-acceptor", "--no-mqtt-acceptor", "--no-amqp-acceptor", "--max-hops", "1", "--name", DC1_NODE); - cliCreateServer.setPortOffset(porOffset); + cliCreateServer.setPortOffset(portOffset); cliCreateServer.setClustered(true); cliCreateServer.setReplicated(true); cliCreateServer.setBackup(true); diff --git a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ReplicatedMirrorTargetTest.java b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ReplicatedMirrorTargetTest.java index 94f0bf680fa..05a26d2aa9e 100644 --- a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ReplicatedMirrorTargetTest.java +++ b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ReplicatedMirrorTargetTest.java @@ -133,7 +133,7 @@ public void destroyServers() throws Exception { private static void createServer(String serverName, String connectionName, String mirrorURI, - int porOffset, + int portOffset, boolean paging, boolean replicated, String clusterStatic) throws Exception { @@ -145,7 +145,7 @@ private static void createServer(String serverName, cliCreateServer.setNoWeb(false); cliCreateServer.setArgs("--no-stomp-acceptor", "--no-hornetq-acceptor", "--no-mqtt-acceptor", "--no-amqp-acceptor", "--max-hops", "1", "--name", DC1_NODE); cliCreateServer.addArgs("--addresses", TOPIC_NAME); - cliCreateServer.setPortOffset(porOffset); + cliCreateServer.setPortOffset(portOffset); if (replicated) { cliCreateServer.setReplicated(true); cliCreateServer.setStaticCluster(clusterStatic); @@ -195,7 +195,7 @@ private static void replaceLogs(File serverLocation) throws Exception { } private static void createBackupServer(String serverName, - int porOffset, + int portOffset, String clusterStatic) throws Exception { File serverLocation = getFileServerLocation(serverName); deleteDirectory(serverLocation); @@ -206,7 +206,7 @@ private static void createBackupServer(String serverName, cliCreateServer.setNoWeb(false); cliCreateServer.setArgs("--no-stomp-acceptor", "--no-hornetq-acceptor", "--no-mqtt-acceptor", "--no-amqp-acceptor", "--max-hops", "1", "--name", DC1_NODE); cliCreateServer.addArgs("--addresses", TOPIC_NAME); - cliCreateServer.setPortOffset(porOffset); + cliCreateServer.setPortOffset(portOffset); cliCreateServer.setClustered(true); cliCreateServer.setReplicated(true); cliCreateServer.setBackup(true); diff --git a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/SingleMirrorSoakTest.java b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/SingleMirrorSoakTest.java index ff7edbc2380..654b3686502 100644 --- a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/SingleMirrorSoakTest.java +++ b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/SingleMirrorSoakTest.java @@ -124,7 +124,7 @@ public void destroyServers() throws Exception { private static void createServer(String serverName, String connectionName, String mirrorURI, - int porOffset, + int portOffset, boolean paging) throws Exception { File serverLocation = getFileServerLocation(serverName); deleteDirectory(serverLocation); @@ -136,7 +136,7 @@ private static void createServer(String serverName, cliCreateServer.setNoWeb(false); cliCreateServer.setArgs("--no-stomp-acceptor", "--no-hornetq-acceptor", "--no-mqtt-acceptor", "--no-amqp-acceptor", "--max-hops", "1", "--name", DC1_NODE); cliCreateServer.addArgs("--addresses", TOPIC_NAME); - cliCreateServer.setPortOffset(porOffset); + cliCreateServer.setPortOffset(portOffset); cliCreateServer.createServer(); Properties brokerProperties = new Properties(); diff --git a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/sender/SenderSoakTest.java b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/sender/SenderSoakTest.java index aebbc384960..805067d4892 100644 --- a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/sender/SenderSoakTest.java +++ b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/sender/SenderSoakTest.java @@ -64,7 +64,7 @@ public class SenderSoakTest extends SoakTestBase { private static String DC1_NODEA_URI = "tcp://localhost:61616"; private static String DC2_NODEA_URI = "tcp://localhost:61618"; - private static void createServer(String serverName, int porOffset) throws Exception { + private static void createServer(String serverName, int portOffset) throws Exception { File serverLocation = getFileServerLocation(serverName); deleteDirectory(serverLocation); @@ -76,7 +76,7 @@ private static void createServer(String serverName, int porOffset) throws Except cliCreateServer.setArgs("--no-stomp-acceptor", "--no-hornetq-acceptor", "--no-mqtt-acceptor", "--no-amqp-acceptor", "--max-hops", "1", "--name", DC1_NODE_A); cliCreateServer.addArgs("--addresses", "order"); cliCreateServer.addArgs("--queues", "myQueue"); - cliCreateServer.setPortOffset(porOffset); + cliCreateServer.setPortOffset(portOffset); cliCreateServer.createServer(); }