This is an automated email from the ASF dual-hosted git repository. robbie pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 3d7970d717c84998d34698165515f7281acc4386 Author: Justin Bertram <[email protected]> AuthorDate: Mon Feb 3 22:32:21 2025 -0600 ARTEMIS-5294 use String.repeat() where possible --- .../activemq/artemis/cli/commands/Create.java | 10 ++----- .../apache/activemq/artemis/utils/TableOut.java | 11 ++------ .../artemis/jdbc/store/drivers/JDBCUtils.java | 4 +-- .../artemis/tests/util/ActiveMQTestBase.java | 6 +--- .../isolated/web/WebServerComponentTest.java | 6 +--- .../integration/amqp/AmqpIngressTimestampTest.java | 11 +------- .../integration/amqp/AmqpLargeMessageTest.java | 33 +++------------------- .../amqp/AmqpReferenceDeliveryAnnotationTest.java | 11 +------- .../integration/amqp/connect/AMQPBridgeTest.java | 16 +++-------- .../amqp/connect/AMQPSyncMirrorTest.java | 18 ++---------- .../integration/amqp/connect/PagedMirrorTest.java | 9 +----- .../amqp/connect/SNFPagedMirrorTest.java | 9 +----- .../amqp/paging/AmqpMaxReadPagingTest.java | 7 +---- .../integration/amqp/paging/AmqpPagingTest.java | 14 ++------- .../integration/client/ConsumerFilterTest.java | 4 +-- .../integration/client/IngressTimestampTest.java | 11 +------- .../crossprotocol/LargeHeadersClusterTest.java | 4 +-- .../ProtocolsMessageLoadBalancingTest.java | 12 ++------ .../jms/cluster/LargeMessageOverBridgeTest.java | 20 ++++--------- .../integration/management/QueueControlTest.java | 9 ++---- .../mqtt5/spec/controlpackets/ConnAckTests.java | 7 +---- .../openwire/OpenWireFlowControlFailTest.java | 11 +++----- .../openwire/interop/CompressedInteropTest.java | 9 ++---- .../paging/AnonymousProducerPageTest.java | 7 +---- .../paging/IndividualAckPagingTest.java | 9 +----- .../paging/MessagesExpiredPagingTest.java | 10 +------ .../persistence/XmlImportExportTest.java | 18 ++++-------- .../tests/integration/retention/ReplayTest.java | 11 ++------ .../artemis/tests/integration/stomp/StompTest.java | 20 +++++++++---- .../stomp/StompWithLargeMessagesTest.java | 7 +---- .../tests/integration/stomp/v11/StompV11Test.java | 10 +++---- .../tests/integration/stomp/v12/StompV12Test.java | 10 +++---- .../brokerConnection/PagedMirrorSmokeTest.java | 9 +----- .../artemis/tests/smoke/retention/ReplayTest.java | 9 +----- .../soak/retention/LargeMessageRetentionTest.java | 9 +----- 35 files changed, 85 insertions(+), 296 deletions(-) diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java index 061b26bceb..08a6f1ce20 100644 --- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java +++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java @@ -964,16 +964,12 @@ public class Create extends InstallAbstract { } private void printStar(String message) { - int size = Math.min(message.length(), 80); - StringBuffer buffer = new StringBuffer(size); - for (int i = 0; i < size; i++) { - buffer.append("*"); - } - getActionContext().out.println(buffer.toString()); + String separator = "*".repeat(Math.min(message.length(), 80)); + getActionContext().out.println(separator); getActionContext().out.println(); getActionContext().out.println(message); getActionContext().out.println(); - getActionContext().out.println(buffer.toString()); + getActionContext().out.println(separator); } private void setupJournalType() { diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/TableOut.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/TableOut.java index 38d3bbf4b3..bb51cf3964 100644 --- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/TableOut.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/TableOut.java @@ -34,11 +34,7 @@ public class TableOut { this.indentation = indentation; // building the indentation String to be reused - StringBuilder indentBuilder = new StringBuilder(); - for (int i = 0; i < indentation; i++) { - indentBuilder.append(' '); - } - indentationString = indentBuilder.toString(); + indentationString = " ".repeat(indentation); } public void print(PrintStream stream, String[] columns) { @@ -76,10 +72,7 @@ public class TableOut { } if (centralize != null && centralize[column] && !cellString.isEmpty()) { - int centralAdd = (columnSizes[column] - cellString.length()) / 2; - for (int i = 0; i < centralAdd; i++) { - cell.append(' '); - } + cell.append(" ".repeat((columnSizes[column] - cellString.length()) / 2)); } cell.append(cellString); diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/JDBCUtils.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/JDBCUtils.java index ff42e2b131..c511553c60 100644 --- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/JDBCUtils.java +++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/JDBCUtils.java @@ -88,9 +88,7 @@ public class JDBCUtils { int level = 0; do { errorMessage.append('\n'); - for (int i = 0; i < level; i++) { - errorMessage.append(' '); - } + errorMessage.append(" ".repeat(level)); formatSqlException(errorMessage, nextEx); nextEx = nextEx.getNextException(); level++; diff --git a/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java index d4a07567d0..28d83c30f8 100644 --- a/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java +++ b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java @@ -2214,11 +2214,7 @@ public abstract class ActiveMQTestBase extends ArtemisTestCase { 0, System.currentTimeMillis(), (byte)4); - StringBuilder builder = new StringBuilder(); - for (int i = 0; i < numChars; i++) { - builder.append('a'); - } - message.getBodyBuffer().writeString(builder.toString()); + message.getBodyBuffer().writeString("a".repeat(numChars)); return message; } diff --git a/tests/integration-tests-isolated/src/test/java/org/apache/activemq/artemis/tests/integration/isolated/web/WebServerComponentTest.java b/tests/integration-tests-isolated/src/test/java/org/apache/activemq/artemis/tests/integration/isolated/web/WebServerComponentTest.java index f5b4010a77..ca744335c4 100644 --- a/tests/integration-tests-isolated/src/test/java/org/apache/activemq/artemis/tests/integration/isolated/web/WebServerComponentTest.java +++ b/tests/integration-tests-isolated/src/test/java/org/apache/activemq/artemis/tests/integration/isolated/web/WebServerComponentTest.java @@ -181,11 +181,7 @@ public class WebServerComponentTest { // Prepare the HTTP request. HttpRequest request = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.GET, uri.getRawPath()); request.headers().set(HttpHeaderNames.HOST, "localhost"); - StringBuilder foo = new StringBuilder(); - for (int i = 0; i < defaultRequestHeaderSize + 1; i++) { - foo.append("a"); - } - request.headers().set("foo", foo.toString()); + request.headers().set("foo", "a".repeat(defaultRequestHeaderSize + 1)); // Send the HTTP request. ch.writeAndFlush(request); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpIngressTimestampTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpIngressTimestampTest.java index 52d3fb3f47..dfc834b793 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpIngressTimestampTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpIngressTimestampTest.java @@ -155,15 +155,6 @@ public class AmqpIngressTimestampTest extends AmqpClientTestSupport { } private byte[] getMessagePayload() { - StringBuilder result = new StringBuilder(); - if (large) { - for (int i = 0; i < ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE * 20; i++) { - result.append("AB"); - } - } else { - result.append("AB"); - } - - return result.toString().getBytes(); + return large ? "AB".repeat(ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE * 20).getBytes() : "AB".getBytes(); } } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpLargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpLargeMessageTest.java index b4afc8ab1d..eb2e34703d 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpLargeMessageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpLargeMessageTest.java @@ -523,11 +523,7 @@ public class AmqpLargeMessageTest extends AmqpClientTestSupport { AmqpSender sender = session.createSender(testQueueName); AmqpMessage message = createAmqpMessage((byte) 'A', expectedSize); - StringBuffer buffer = new StringBuffer(); - for (int i = 0; i < strLength; i++) { - buffer.append(" "); - } - message.setApplicationProperty("str", buffer.toString()); + message.setApplicationProperty("str", " ".repeat(strLength)); message.setDurable(true); try { @@ -1198,14 +1194,7 @@ public class AmqpLargeMessageTest extends AmqpClientTestSupport { Queue queue = session.createQueue(testQueueName); MessageProducer producer = session.createProducer(queue); ObjectMessage msg = session.createObjectMessage(); - - StringBuilder builder = new StringBuilder(); - for (int i = 0; i < payload; ++i) { - builder.append("A"); - } - - msg.setObject(builder.toString()); - + msg.setObject("A".repeat(payload)); for (int i = 0; i < nMsgs; ++i) { msg.setIntProperty("i", (Integer) i); producer.send(msg); @@ -1219,14 +1208,7 @@ public class AmqpLargeMessageTest extends AmqpClientTestSupport { Queue queue = session.createQueue(testQueueName); MessageProducer producer = session.createProducer(queue); TextMessage msg = session.createTextMessage(); - - StringBuilder builder = new StringBuilder(); - for (int i = 0; i < payload; ++i) { - builder.append("A"); - } - - msg.setText(builder.toString()); - + msg.setText("A".repeat(payload)); for (int i = 0; i < nMsgs; ++i) { msg.setIntProperty("i", (Integer) i); producer.send(msg); @@ -1240,14 +1222,7 @@ public class AmqpLargeMessageTest extends AmqpClientTestSupport { Queue queue = session.createQueue(testQueueName); MessageProducer producer = session.createProducer(queue); BytesMessage msg = session.createBytesMessage(); - - StringBuilder builder = new StringBuilder(); - for (int i = 0; i < payload; ++i) { - builder.append("A"); - } - - msg.writeBytes(builder.toString().getBytes(StandardCharsets.UTF_8)); - + msg.writeBytes("A".repeat(payload).getBytes(StandardCharsets.UTF_8)); for (int i = 0; i < nMsgs; ++i) { msg.setIntProperty("i", (Integer) i); producer.send(msg); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpReferenceDeliveryAnnotationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpReferenceDeliveryAnnotationTest.java index bc7f015ca3..4cb9aaa60e 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpReferenceDeliveryAnnotationTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpReferenceDeliveryAnnotationTest.java @@ -92,16 +92,7 @@ public class AmqpReferenceDeliveryAnnotationTest extends AmqpClientTestSupport { AmqpMessage message = new AmqpMessage(); - String body; - if (largeMessage) { - StringBuffer buffer = new StringBuffer(); - for (int i = 0; i < 1024 * 1024; i++) { - buffer.append("*"); - } - body = buffer.toString(); - } else { - body = "test-message"; - } + String body = largeMessage ? "*".repeat(1024 * 1024) : "test-message"; message.setMessageId("msg" + 1); message.setText(body); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPBridgeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPBridgeTest.java index f9ff8831c1..4196f866f7 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPBridgeTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPBridgeTest.java @@ -125,12 +125,8 @@ public class AMQPBridgeTest extends AmqpClientTestSupport { String largeMessageBody = null; for (int i = 0; i < 30; i++) { if (i == 0) { - StringBuffer buffer = new StringBuffer(); - for (int s = 0; s < 10024; s++) { - buffer.append("*******************************************************************************************************************************"); - } - largeMessageBody = buffer.toString(); - TextMessage message = session.createTextMessage(buffer.toString()); + largeMessageBody = "*******************************************************************************************************************************".repeat(10024); + TextMessage message = session.createTextMessage(largeMessageBody); producer.send(message); } else { producer.send(session.createMessage()); @@ -208,12 +204,8 @@ public class AMQPBridgeTest extends AmqpClientTestSupport { String largeMessageBody = null; for (int i = 0; i < 30; i++) { if (i == 0) { - StringBuffer buffer = new StringBuffer(); - for (int s = 0; s < 10024; s++) { - buffer.append("*******************************************************************************************************************************"); - } - largeMessageBody = buffer.toString(); - TextMessage message = session.createTextMessage(buffer.toString()); + largeMessageBody = "*******************************************************************************************************************************".repeat(10024); + TextMessage message = session.createTextMessage(largeMessageBody); producer.send(message); } else { producer.send(session.createMessage()); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPSyncMirrorTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPSyncMirrorTest.java index 2c060c3e94..50abcfb5fc 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPSyncMirrorTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPSyncMirrorTest.java @@ -232,14 +232,7 @@ public class AMQPSyncMirrorTest extends AmqpClientTestSupport { producer.setDeliveryMode(DeliveryMode.PERSISTENT); - final String bodyMessage; - { - StringBuffer buffer = new StringBuffer(); - for (int i = 0; i < messageSize; i++) { - buffer.append("large Buffer..."); - } - bodyMessage = buffer.toString(); - } + final String bodyMessage = "large Buffer...".repeat(messageSize); for (int i = 0; i < NUMBER_OF_MESSAGES; i++) { logger.debug("===>>> send message {}", i); @@ -570,14 +563,7 @@ public class AMQPSyncMirrorTest extends AmqpClientTestSupport { producer.setDeliveryMode(DeliveryMode.PERSISTENT); - final String bodyMessage; - { - StringBuffer buffer = new StringBuffer(); - for (int i = 0; i < messageSize; i++) { - buffer.append("large Buffer..."); - } - bodyMessage = buffer.toString(); - } + final String bodyMessage = "large Buffer...".repeat(messageSize); for (int i = 0; i < NUMBER_OF_MESSAGES; i++) { int theI = i; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/PagedMirrorTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/PagedMirrorTest.java index 451dc2ab4c..0ac69d9d7d 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/PagedMirrorTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/PagedMirrorTest.java @@ -98,14 +98,7 @@ public class PagedMirrorTest extends ActiveMQTestBase { ConnectionFactory consumeCF = CFUtil.createConnectionFactory(protocol, consumeURI); ConnectionFactory secondConsumeCF = CFUtil.createConnectionFactory(protocol, secondConsumeURI); - String bodyBuffer; - { - StringBuffer buffer = new StringBuffer(); - for (int i = 0; i < 1024; i++) { - buffer.append("*"); - } - bodyBuffer = buffer.toString(); - } + String bodyBuffer = "*".repeat(1024); int NUMBER_OF_MESSAGES = 200; int ACK_I = 77; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/SNFPagedMirrorTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/SNFPagedMirrorTest.java index da27f43940..6dc6c6aee0 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/SNFPagedMirrorTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/SNFPagedMirrorTest.java @@ -205,14 +205,7 @@ public class SNFPagedMirrorTest extends ActiveMQTestBase { ConnectionFactory server1CF = CFUtil.createConnectionFactory(protocol, sendURI); ConnectionFactory server2CF = CFUtil.createConnectionFactory(protocol, consumerURI); - String bodyBuffer; - { - StringBuffer buffer = new StringBuffer(); - for (int i = 0; i < messageSize; i++) { - buffer.append("*"); - } - bodyBuffer = buffer.toString(); - } + String bodyBuffer = "*".repeat(messageSize); int NUMBER_OF_MESSAGES = 200; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/paging/AmqpMaxReadPagingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/paging/AmqpMaxReadPagingTest.java index 369ce4bd81..84c1b65fcf 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/paging/AmqpMaxReadPagingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/paging/AmqpMaxReadPagingTest.java @@ -63,12 +63,7 @@ public class AmqpMaxReadPagingTest extends AmqpClientTestSupport { @Test @Timeout(60) public void testMaxReadPage() throws Exception { - final int MSG_SIZE = 1000; - final StringBuilder builder = new StringBuilder(); - for (int i = 0; i < MSG_SIZE; i++) { - builder.append('0'); - } - final String data = builder.toString(); + final String data = "0".repeat(1000); final int MSG_COUNT = 100; AmqpClient client = createAmqpClient(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/paging/AmqpPagingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/paging/AmqpPagingTest.java index 9a41b04b62..7ccee55f7d 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/paging/AmqpPagingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/paging/AmqpPagingTest.java @@ -75,12 +75,7 @@ public class AmqpPagingTest extends AmqpClientTestSupport { @TestTemplate @Timeout(60) public void testPaging() throws Exception { - final int MSG_SIZE = 1000; - final StringBuilder builder = new StringBuilder(); - for (int i = 0; i < MSG_SIZE; i++) { - builder.append('0'); - } - final String data = builder.toString(); + final String data = "0".repeat(1000); final int MSG_COUNT = 1_000; AmqpClient client = createAmqpClient(); @@ -125,12 +120,7 @@ public class AmqpPagingTest extends AmqpClientTestSupport { @TestTemplate @Timeout(60) public void testSizeCalculationsForApplicationProperties() throws Exception { - final int MSG_SIZE = 1000; - final StringBuilder builder = new StringBuilder(); - for (int i = 0; i < MSG_SIZE; i++) { - builder.append('0'); - } - final String data = builder.toString(); + final String data = "0".repeat(1000); final int MSG_COUNT = 1; AmqpClient client = createAmqpClient(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerFilterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerFilterTest.java index 13ce28c860..c5cf13f7c1 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerFilterTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerFilterTest.java @@ -73,9 +73,7 @@ public class ConsumerFilterTest extends ActiveMQTestBase { StringBuffer token = new StringBuffer(); token.append("'"); - for (int i = 0; i < 5000; i++) { - token.append("a"); - } + token.append("a".repeat(5000)); token.append("'"); // The server would fail to create this consumer if HORNETQ-545 wasn't solved diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/IngressTimestampTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/IngressTimestampTest.java index 66770b7f09..2563f3c841 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/IngressTimestampTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/IngressTimestampTest.java @@ -185,16 +185,7 @@ public class IngressTimestampTest extends ActiveMQTestBase { } private String getMessagePayload() { - StringBuilder result = new StringBuilder(); - if (large) { - for (int i = 0; i < ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE * 20; i++) { - result.append("AB"); - } - } else { - result.append("AB"); - } - - return result.toString(); + return large ? "AB".repeat(ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE * 20) : "AB"; } private ConnectionFactory createFactory(Protocol protocol) { diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/crossprotocol/LargeHeadersClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/crossprotocol/LargeHeadersClusterTest.java index 968c77fff8..38fc9eabf7 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/crossprotocol/LargeHeadersClusterTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/crossprotocol/LargeHeadersClusterTest.java @@ -129,9 +129,7 @@ public class LargeHeadersClusterTest extends ClusterTestBase { MessageProducer pd = sn.createProducer(sn.createQueue(queueName.toString())); StringBuffer bufferString = new StringBuffer(); - for (int i = 0; i < 9_500; i++) { - bufferString.append("-"); - } + bufferString.append("-".repeat(9_500)); int i = 0; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/crossprotocol/ProtocolsMessageLoadBalancingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/crossprotocol/ProtocolsMessageLoadBalancingTest.java index 188b0b6857..42af8a192c 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/crossprotocol/ProtocolsMessageLoadBalancingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/crossprotocol/ProtocolsMessageLoadBalancingTest.java @@ -430,17 +430,11 @@ public class ProtocolsMessageLoadBalancingTest extends ClusterTestBase { ClientSessionFactory coreFactory = locator.createSessionFactory(); ClientSession clientSession = coreFactory.createSession(); ClientProducer producer = clientSession.createProducer(queueName); + String largeBody = " ".repeat(10 * 1024); for (int i = 0; i < NUMBER_OF_MESSAGES; i++) { ClientMessage message = clientSession.createMessage((byte)0, true); - StringBuffer stringbuffer = new StringBuffer(); - stringbuffer.append("hello"); - if (i % 3 == 0) { - // making 1/3 of the messages to be large message - for (int j = 0; j < 10 * 1024; j++) { - stringbuffer.append(" "); - } - } - message.getBodyBuffer().writeUTF(stringbuffer.toString()); + // making 1/3 of the messages to be large + message.getBodyBuffer().writeUTF(i % 3 == 0 ? largeBody : "hello"); producer.send(message); } coreFactory.close(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/LargeMessageOverBridgeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/LargeMessageOverBridgeTest.java index 3b05f6cf62..4d345176df 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/LargeMessageOverBridgeTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/LargeMessageOverBridgeTest.java @@ -93,21 +93,17 @@ public class LargeMessageOverBridgeTest extends JMSClusteredTestBase { MessageConsumer cons2 = session2.createConsumer(queue); conn2.start(); - StringBuffer buffer = new StringBuffer(); - - for (int i = 0; i < 51180; i++) { - buffer.append('a'); - } + final String text = "a".repeat(51180); for (int i = 0; i < 10; i++) { - TextMessage msg = session1.createTextMessage(buffer.toString()); + TextMessage msg = session1.createTextMessage(text); prod1.send(msg); } TextMessage msg2 = (TextMessage) cons2.receive(5000); assertNotNull(msg2); - assertEquals(buffer.toString(), msg2.getText()); + assertEquals(text, msg2.getText()); conn1.close(); conn2.close(); @@ -133,24 +129,20 @@ public class LargeMessageOverBridgeTest extends JMSClusteredTestBase { MessageConsumer cons2 = session2.createConsumer(queue); conn2.start(); - StringBuffer buffer = new StringBuffer(); - - for (int i = 0; i < 3810002; i++) { - buffer.append('a'); - } + final String body = "a".repeat(3810002); final int NUMBER_OF_MESSAGES = 1; for (int i = 0; i < NUMBER_OF_MESSAGES; i++) { MapMessage msg = session1.createMapMessage(); - msg.setString("str", buffer.toString()); + msg.setString("str", body); msg.setIntProperty("i", i); prod1.send(msg); } for (int i = 0; i < NUMBER_OF_MESSAGES; i++) { MapMessage msg = (MapMessage) cons2.receive(5000); - assertEquals(buffer.toString(), msg.getString("str")); + assertEquals(body, msg.getString("str")); } assertNull(cons2.receiveNoWait()); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java index 30b890c4a0..e1b1471924 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java @@ -4529,10 +4529,7 @@ public class QueueControlTest extends ManagementTestBase { QueueControl queueControl = createManagementControl(address, queue, RoutingType.ANYCAST); - StringBuffer bufferLarge = new StringBuffer(); - for (int i = 0; i < 100 * 1024; i++) { - bufferLarge.append("*-"); - } + final String text = "*-".repeat(100 * 1024); { // a namespace ConnectionFactory factory = CFUtil.createConnectionFactory("amqp", "tcp://localhost:61616"); @@ -4540,7 +4537,7 @@ public class QueueControlTest extends ManagementTestBase { Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); MessageProducer producer = session.createProducer(session.createQueue(address.toString())); producer.setDeliveryMode(DeliveryMode.PERSISTENT); - TextMessage message = session.createTextMessage(bufferLarge.toString()); + TextMessage message = session.createTextMessage(text); message.setStringProperty("protocolUsed", "amqp"); producer.send(message); } @@ -4552,7 +4549,7 @@ public class QueueControlTest extends ManagementTestBase { Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); MessageProducer producer = session.createProducer(session.createQueue(address.toString())); producer.setDeliveryMode(DeliveryMode.PERSISTENT); - TextMessage message = session.createTextMessage(bufferLarge.toString()); + TextMessage message = session.createTextMessage(text); message.setStringProperty("protocolUsed", "core"); producer.send(message); } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/ConnAckTests.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/ConnAckTests.java index 5cad0603bb..ecaba7f7fa 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/ConnAckTests.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt5/spec/controlpackets/ConnAckTests.java @@ -340,12 +340,7 @@ public class ConnAckTests extends MQTT5TestSupport { setAcceptorProperty("maximumPacketSize=" + SIZE); final String TOPIC = RandomUtil.randomString(); final CountDownLatch latch = new CountDownLatch(1); - StringBuilder builder = new StringBuilder(SIZE * 2); - - for (int i = 0; i < SIZE * 2; i++) { - builder.append("="); - } - byte[] bytes = builder.toString().getBytes(StandardCharsets.UTF_8); + byte[] bytes = "=".repeat(SIZE * 2).getBytes(StandardCharsets.UTF_8); MqttClient producer = createPahoClient(RandomUtil.randomString()); producer.connect(); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/OpenWireFlowControlFailTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/OpenWireFlowControlFailTest.java index ed2ec9c7c4..7125009c38 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/OpenWireFlowControlFailTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/OpenWireFlowControlFailTest.java @@ -62,10 +62,7 @@ public class OpenWireFlowControlFailTest extends OpenWireTestBase { server.addAddressInfo(addressInfo); server.createQueue(QueueConfiguration.of(addressInfo.getName()).setRoutingType(RoutingType.ANYCAST)); - StringBuffer textBody = new StringBuffer(); - for (int i = 0; i < 10; i++) { - textBody.append(" "); - } + String textBody = " ".repeat(10); ConnectionFactory factory = new ActiveMQConnectionFactory(urlString); int numberOfMessage = 0; try (Connection connection = factory.createConnection()) { @@ -75,7 +72,7 @@ public class OpenWireFlowControlFailTest extends OpenWireTestBase { boolean failed = false; try { for (int i = 0; i < 1000; i++) { - TextMessage message = session.createTextMessage(textBody.toString()); + TextMessage message = session.createTextMessage(textBody); message.setIntProperty("i", i); producer.send(message); @@ -85,7 +82,7 @@ public class OpenWireFlowControlFailTest extends OpenWireTestBase { e.printStackTrace(System.out); failed = true; try { - producer.send(session.createTextMessage(textBody.toString())); + producer.send(session.createTextMessage(textBody)); fail("Exception expected"); } catch (JMSException expected) { expected.printStackTrace(); @@ -105,7 +102,7 @@ public class OpenWireFlowControlFailTest extends OpenWireTestBase { for (int i = 0; i < numberOfMessage; i++) { TextMessage message = (TextMessage) consumer.receive(5000); assertNotNull(message); - assertEquals(textBody.toString(), message.getText()); + assertEquals(textBody, message.getText()); } TextMessage msg = (TextMessage)consumer.receive(500); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/interop/CompressedInteropTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/interop/CompressedInteropTest.java index 6f86c3495f..4cae9c51ee 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/interop/CompressedInteropTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/interop/CompressedInteropTest.java @@ -44,13 +44,8 @@ public class CompressedInteropTest extends BasicOpenWireTest { private static final String LARGE_TEXT; static { - StringBuilder builder = new StringBuilder(); - - for (int i = 0; i < 20; i++) { - builder.append("The quick red fox jumped over the lazy brown dog. "); - } - TEXT = builder.toString(); - LARGE_TEXT = TEXT + TEXT + TEXT + TEXT + TEXT; + TEXT = "The quick red fox jumped over the lazy brown dog. ".repeat(20); + LARGE_TEXT = TEXT.repeat(5); } @BeforeEach diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/AnonymousProducerPageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/AnonymousProducerPageTest.java index 1f940b35a2..3ea5a3c3f1 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/AnonymousProducerPageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/AnonymousProducerPageTest.java @@ -112,12 +112,7 @@ public class AnonymousProducerPageTest extends ActiveMQTestBase { @TestTemplate @Timeout(60) public void testNotBlockOnGlobalMaxSizeWithAnonymousProduce() throws Exception { - final int MSG_SIZE = 1000; - final StringBuilder builder = new StringBuilder(); - for (int i = 0; i < MSG_SIZE; i++) { - builder.append('0'); - } - final String data = builder.toString(); + final String data = "0".repeat(1000); final int MSG_COUNT = 3_000; // sending size to explode max size diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/IndividualAckPagingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/IndividualAckPagingTest.java index f9dca289dd..8cbc8136cf 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/IndividualAckPagingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/IndividualAckPagingTest.java @@ -113,14 +113,7 @@ public class IndividualAckPagingTest extends ActiveMQTestBase { public void testIndividualAck(String protocol, int bodySize) throws Exception { ConnectionFactory factory = CFUtil.createConnectionFactory(protocol, "tcp://localhost:61616"); - String extraBody; - { - StringBuffer buffer = new StringBuffer(); - for (int i = 0; i < bodySize; i++) { - buffer.append("*"); - } - extraBody = buffer.toString(); - } + String extraBody = "*".repeat(bodySize); Queue queue = server.locateQueue(ADDRESS); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/MessagesExpiredPagingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/MessagesExpiredPagingTest.java index 0e9b35f51f..7951cdfa71 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/MessagesExpiredPagingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/MessagesExpiredPagingTest.java @@ -151,15 +151,7 @@ public class MessagesExpiredPagingTest extends ActiveMQTestBase { public void testSendReceive(String protocol, int numberOfMessages, int numberOfMessageSecondWave, int pagingInterval, int bodySize) throws Exception { ConnectionFactory factory = CFUtil.createConnectionFactory(protocol, "tcp://localhost:61616"); - String extraBody; - { - StringBuffer buffer = new StringBuffer(); - for (int i = 0; i < bodySize; i++) { - buffer.append("*"); - } - extraBody = buffer.toString(); - } - + String extraBody = "*".repeat(bodySize); Consumer[] consumers = new Consumer[NUMBER_OF_QUEUES]; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/XmlImportExportTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/XmlImportExportTest.java index 236b6f56c8..d20918274f 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/XmlImportExportTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/XmlImportExportTest.java @@ -282,10 +282,7 @@ public class XmlImportExportTest extends ActiveMQTestBase { @Test public void testTextMessage() throws Exception { - StringBuilder data = new StringBuilder(); - for (int i = 0; i < 2608; i++) { - data.append("X"); - } + String data = "X".repeat(2608); ClientSession session = basicSetUp(); @@ -293,7 +290,7 @@ public class XmlImportExportTest extends ActiveMQTestBase { ClientProducer producer = session.createProducer(QUEUE_NAME); ClientMessage msg = session.createMessage(Message.TEXT_TYPE, true); - msg.getBodyBuffer().writeString(data.toString()); + msg.getBodyBuffer().writeString(data); producer.send(msg); session.close(); @@ -324,15 +321,12 @@ public class XmlImportExportTest extends ActiveMQTestBase { msg = consumer.receive(CONSUMER_TIMEOUT); assertEquals(Message.TEXT_TYPE, msg.getType()); - assertEquals(data.toString(), msg.getBodyBuffer().readString()); + assertEquals(data, msg.getBodyBuffer().readString()); } @Test public void testBytesMessage() throws Exception { - StringBuilder data = new StringBuilder(); - for (int i = 0; i < 2610; i++) { - data.append("X"); - } + String data = "X".repeat(2610); ClientSession session = basicSetUp(); @@ -340,7 +334,7 @@ public class XmlImportExportTest extends ActiveMQTestBase { ClientProducer producer = session.createProducer(QUEUE_NAME); ClientMessage msg = session.createMessage(Message.BYTES_TYPE, true); - msg.getBodyBuffer().writeBytes(data.toString().getBytes()); + msg.getBodyBuffer().writeBytes(data.getBytes()); producer.send(msg); session.close(); @@ -373,7 +367,7 @@ public class XmlImportExportTest extends ActiveMQTestBase { assertEquals(Message.BYTES_TYPE, msg.getType()); byte[] result = new byte[msg.getBodySize()]; msg.getBodyBuffer().readBytes(result); - assertEquals(data.toString().getBytes().length, result.length); + assertEquals(data.getBytes().length, result.length); } @Test diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/retention/ReplayTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/retention/ReplayTest.java index 51fa2b1c5f..32382fbf05 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/retention/ReplayTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/retention/ReplayTest.java @@ -71,12 +71,7 @@ public class ReplayTest extends ActiveMQTestBase { } protected void testReplay(String protocol, int size, boolean paging) throws Exception { - - StringBuffer buffer = new StringBuffer(); - buffer.append(RandomUtil.randomString()); - for (int i = 0; i < size; i++) { - buffer.append("*"); - } + String buffer = RandomUtil.randomString() + "*".repeat(size); if (paging) { org.apache.activemq.artemis.core.server.Queue serverQueue = server.locateQueue("t1"); @@ -92,7 +87,7 @@ public class ReplayTest extends ActiveMQTestBase { MessageProducer producer = session.createProducer(null); - producer.send(queue, session.createTextMessage(buffer.toString())); + producer.send(queue, session.createTextMessage(buffer)); connection.start(); @@ -112,7 +107,7 @@ public class ReplayTest extends ActiveMQTestBase { assertNotNull(receivedMessage); - assertEquals(buffer.toString(), receivedMessage.getText()); + assertEquals(buffer, receivedMessage.getText()); assertNull(consumert2.receiveNoWait()); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTest.java index b8e9cb3eb6..caae468d9d 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTest.java @@ -585,16 +585,24 @@ public class StompTest extends StompTestBase { @Test public void testSendMessageWithLongHeaders() throws Exception { + final int headerSize = 1024; MessageConsumer consumer = session.createConsumer(queue); conn.connect(defUser, defPass); - StringBuffer buffer = new StringBuffer(); - for (int i = 0; i < 1024; i++) { - buffer.append("a"); - } + String longHeader = "a".repeat(headerSize); - ClientStompFrame frame = conn.createFrame(Stomp.Commands.SEND).addHeader(Stomp.Headers.Send.DESTINATION, getQueuePrefix() + getQueueName()).addHeader("foo", "abc").addHeader("bar", "123").addHeader("correlation-id", "c123").addHeader("persistent", "true").addHeader("type", "t345").addHeader("JMSXGroupID", "abc").addHeader("priority", "3").addHeader("longHeader", buffer.toString()).setBody("Hello World"); + ClientStompFrame frame = conn.createFrame(Stomp.Commands.SEND) + .addHeader(Stomp.Headers.Send.DESTINATION, getQueuePrefix() + getQueueName()) + .addHeader("foo", "abc") + .addHeader("bar", "123") + .addHeader("correlation-id", "c123") + .addHeader("persistent", "true") + .addHeader("type", "t345") + .addHeader("JMSXGroupID", "abc") + .addHeader("priority", "3") + .addHeader("longHeader", longHeader) + .setBody("Hello World"); conn.sendFrame(frame); TextMessage message = (TextMessage) consumer.receive(1000); @@ -605,7 +613,7 @@ public class StompTest extends StompTestBase { assertEquals(3, message.getJMSPriority(), "getJMSPriority"); assertEquals(javax.jms.DeliveryMode.PERSISTENT, message.getJMSDeliveryMode()); assertEquals("abc", message.getStringProperty("foo"), "foo"); - assertEquals(1024, message.getStringProperty("longHeader").length(), "longHeader"); + assertEquals(headerSize, message.getStringProperty("longHeader").length(), "longHeader"); assertEquals("abc", message.getStringProperty("JMSXGroupID"), "JMSXGroupID"); } diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompWithLargeMessagesTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompWithLargeMessagesTest.java index 8c8e555257..6a69abb1b9 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompWithLargeMessagesTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompWithLargeMessagesTest.java @@ -86,12 +86,7 @@ public class StompWithLargeMessagesTest extends StompTestBase { server.createQueue(QueueConfiguration.of(address).setRoutingType(RoutingType.ANYCAST)); // STOMP default is UTF-8 == 1 byte per char. - int largeMessageStringSize = 10 * 1024 * 1024; // 10MB - StringBuilder b = new StringBuilder(largeMessageStringSize); - for (int i = 0; i < largeMessageStringSize; i++) { - b.append('t'); - } - String payload = b.toString(); + String payload = "t".repeat(10 * 1024 * 1024); // 10MB // Set up STOMP subscription conn.connect(defUser, defPass); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11Test.java index 83482248b0..4716fdc5d4 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11Test.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11Test.java @@ -1832,14 +1832,12 @@ public class StompV11Test extends StompTestBase { @Test public void testSendMessageWithLongHeaders() throws Exception { + final int headerSize = 2048; MessageConsumer consumer = session.createConsumer(queue); conn.connect(defUser, defPass); - StringBuffer buffer = new StringBuffer(); - for (int i = 0; i < 2048; i++) { - buffer.append("a"); - } + String longHeader = "a".repeat(headerSize); ClientStompFrame frame = conn.createFrame(Stomp.Commands.SEND) .addHeader(Stomp.Headers.Send.DESTINATION, getQueuePrefix() + getQueueName()) @@ -1849,7 +1847,7 @@ public class StompV11Test extends StompTestBase { .addHeader(Stomp.Headers.Message.TYPE, "t345") .addHeader("JMSXGroupID", "abc") .addHeader("foo", "abc") - .addHeader("longHeader", buffer.toString()) + .addHeader("longHeader", longHeader) .setBody("Hello World"); frame = conn.sendFrame(frame); @@ -1862,7 +1860,7 @@ public class StompV11Test extends StompTestBase { assertEquals(3, message.getJMSPriority(), "getJMSPriority"); assertEquals(javax.jms.DeliveryMode.PERSISTENT, message.getJMSDeliveryMode()); assertEquals("abc", message.getStringProperty("foo"), "foo"); - assertEquals(2048, message.getStringProperty("longHeader").length(), "longHeader"); + assertEquals(headerSize, message.getStringProperty("longHeader").length(), "longHeader"); assertEquals("abc", message.getStringProperty("JMSXGroupID"), "JMSXGroupID"); diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v12/StompV12Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v12/StompV12Test.java index 2848e1556d..960f03727c 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v12/StompV12Test.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v12/StompV12Test.java @@ -1867,14 +1867,12 @@ public class StompV12Test extends StompTestBase { @Test public void testSendMessageWithLongHeaders() throws Exception { + final int headerSize = 2048; MessageConsumer consumer = session.createConsumer(queue); conn.connect(defUser, defPass); - StringBuffer buffer = new StringBuffer(); - for (int i = 0; i < 2048; i++) { - buffer.append("a"); - } + String longHeader = "a".repeat(headerSize); ClientStompFrame frame = conn.createFrame(Stomp.Commands.SEND) .addHeader(Stomp.Headers.Subscribe.DESTINATION, getQueuePrefix() + getQueueName()) @@ -1884,7 +1882,7 @@ public class StompV12Test extends StompTestBase { .addHeader(Stomp.Headers.Message.TYPE, "t345") .addHeader("JMSXGroupID", "abc") .addHeader("foo", "abc") - .addHeader("very-very-long-stomp-message-header", buffer.toString()) + .addHeader("very-very-long-stomp-message-header", longHeader) .setBody("Hello World"); conn.sendFrame(frame); @@ -1897,7 +1895,7 @@ public class StompV12Test extends StompTestBase { assertEquals(3, message.getJMSPriority(), "getJMSPriority"); assertEquals(javax.jms.DeliveryMode.PERSISTENT, message.getJMSDeliveryMode()); assertEquals("abc", message.getStringProperty("foo"), "foo"); - assertEquals(2048, message.getStringProperty("very-very-long-stomp-message-header").length(), "very-very-long-stomp-message-header"); + assertEquals(headerSize, message.getStringProperty("very-very-long-stomp-message-header").length(), "very-very-long-stomp-message-header"); assertEquals("abc", message.getStringProperty("JMSXGroupID"), "JMSXGroupID"); diff --git a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/PagedMirrorSmokeTest.java b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/PagedMirrorSmokeTest.java index 83595aa27d..40f6ceb81d 100644 --- a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/PagedMirrorSmokeTest.java +++ b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/PagedMirrorSmokeTest.java @@ -92,14 +92,7 @@ public class PagedMirrorSmokeTest extends SmokeTestBase { ConnectionFactory consumeCF = CFUtil.createConnectionFactory(protocol, consumeURI); ConnectionFactory secondConsumeCF = CFUtil.createConnectionFactory(protocol, secondConsumeURI); - String bodyBuffer; - { - StringBuffer buffer = new StringBuffer(); - for (int i = 0; i < 1024; i++) { - buffer.append("*"); - } - bodyBuffer = buffer.toString(); - } + String bodyBuffer = "*".repeat(1024); int NUMBER_OF_MESSAGES = 200; int ACK_I = 77; diff --git a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/retention/ReplayTest.java b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/retention/ReplayTest.java index 5c57cdb67e..b206d1aa60 100644 --- a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/retention/ReplayTest.java +++ b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/retention/ReplayTest.java @@ -99,14 +99,7 @@ public class ReplayTest extends SmokeTestBase { ActiveMQServerControl serverControl = getServerControl(liveURI, nameBuilder, 5000); - String bufferStr; - { - StringBuffer buffer = new StringBuffer(); - for (int i = 0; i < bodySize; i++) { - buffer.append("*"); - } - bufferStr = RandomUtil.randomString() + buffer.toString(); - } + String bufferStr = RandomUtil.randomString() + "*".repeat(bodySize); ConnectionFactory factory = CFUtil.createConnectionFactory(protocol, "tcp://localhost:61616"); try (Connection connection = factory.createConnection()) { diff --git a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/retention/LargeMessageRetentionTest.java b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/retention/LargeMessageRetentionTest.java index 37fd0640b9..828b1d1c3b 100644 --- a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/retention/LargeMessageRetentionTest.java +++ b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/retention/LargeMessageRetentionTest.java @@ -132,14 +132,7 @@ public class LargeMessageRetentionTest extends SoakTestBase { final CountDownLatch latchReceiver = new CountDownLatch(1); final CountDownLatch latchSender = new CountDownLatch(producers); - String bufferStr; - { - StringBuffer buffer = new StringBuffer(); - for (int i = 0; i < bodySize; i++) { - buffer.append("*"); - } - bufferStr = RandomUtil.randomString() + buffer; - } + String bufferStr = RandomUtil.randomString() + "*".repeat(bodySize); ConnectionFactory factory = CFUtil.createConnectionFactory(protocol, "tcp://localhost:61616"); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information, visit: https://activemq.apache.org/contact
