This is an automated email from the ASF dual-hosted git repository.
vavrtom pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
The following commit(s) were added to refs/heads/main by this push:
new c054e94dbe QPID-8653: [Broker-J] Code cleanup: collection type
arguments, collection factory methods, lambdas (#195)
c054e94dbe is described below
commit c054e94dbe070bd6afeea168ccb4eb3c0a770095
Author: Daniil Kirilyuk <daniel.kiril...@gmail.com>
AuthorDate: Mon Aug 7 09:55:27 2023 +0200
QPID-8653: [Broker-J] Code cleanup: collection type arguments, collection
factory methods, lambdas (#195)
---
.../qpid/tests/protocol/v0_8/ConnectionInteraction.java | 3 +--
.../qpid/tests/protocol/v0_8/ExchangeInteraction.java | 3 +--
.../qpid/tests/protocol/v0_8/PerformativeResponse.java | 1 -
.../apache/qpid/tests/protocol/v0_8/QueueInteraction.java | 5 ++---
.../apache/qpid/tests/protocol/v0_8/TxInteraction.java | 1 -
.../org/apache/qpid/tests/protocol/v0_8/BasicTest.java | 15 +++++++--------
.../org/apache/qpid/tests/protocol/v0_8/ExchangeTest.java | 6 +++---
.../apache/qpid/tests/protocol/v0_8/LargeHeadersTest.java | 7 +++----
.../org/apache/qpid/tests/protocol/v0_8/QueueTest.java | 12 +++++-------
.../apache/qpid/tests/protocol/v0_8/TransactionTest.java | 7 +++----
.../v0_8/extension/basic/MalformedMessageTest.java | 5 ++---
.../ExchangeDeclareInvalidOptionBehaviourTest.java | 4 ++--
.../protocol/v0_8/extension/exchange/ExchangeTest.java | 6 +++---
.../queue/QueueDeclareInvalidOptionBehaviourTest.java | 4 ++--
.../tests/protocol/v0_8/extension/queue/QueueTest.java | 9 ++++-----
.../transactiontimeout/TransactionTimeoutTest.java | 4 ++--
16 files changed, 40 insertions(+), 52 deletions(-)
diff --git
a/systests/protocol-tests-amqp-0-8/src/main/java/org/apache/qpid/tests/protocol/v0_8/ConnectionInteraction.java
b/systests/protocol-tests-amqp-0-8/src/main/java/org/apache/qpid/tests/protocol/v0_8/ConnectionInteraction.java
index 24813e9a80..77b49b0949 100644
---
a/systests/protocol-tests-amqp-0-8/src/main/java/org/apache/qpid/tests/protocol/v0_8/ConnectionInteraction.java
+++
b/systests/protocol-tests-amqp-0-8/src/main/java/org/apache/qpid/tests/protocol/v0_8/ConnectionInteraction.java
@@ -20,7 +20,6 @@
*/
package org.apache.qpid.tests.protocol.v0_8;
-import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -71,7 +70,7 @@ public class ConnectionInteraction
public ConnectionInteraction startOkClientProperties(final Map<String,
Object> clientProperties)
{
- _startOkClientProperties = clientProperties == null ?
Collections.emptyMap() : new HashMap<>(clientProperties);
+ _startOkClientProperties = clientProperties == null ? Map.of() : new
HashMap<>(clientProperties);
return this;
}
diff --git
a/systests/protocol-tests-amqp-0-8/src/main/java/org/apache/qpid/tests/protocol/v0_8/ExchangeInteraction.java
b/systests/protocol-tests-amqp-0-8/src/main/java/org/apache/qpid/tests/protocol/v0_8/ExchangeInteraction.java
index 9ba53e87ff..20db254b5e 100644
---
a/systests/protocol-tests-amqp-0-8/src/main/java/org/apache/qpid/tests/protocol/v0_8/ExchangeInteraction.java
+++
b/systests/protocol-tests-amqp-0-8/src/main/java/org/apache/qpid/tests/protocol/v0_8/ExchangeInteraction.java
@@ -20,7 +20,6 @@
*/
package org.apache.qpid.tests.protocol.v0_8;
-import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -92,7 +91,7 @@ public class ExchangeInteraction
public ExchangeInteraction declareArguments(final Map<String,Object> args)
{
- _declareArguments = args == null ? Collections.emptyMap() : new
HashMap<>(args);
+ _declareArguments = args == null ? Map.of() : new HashMap<>(args);
return this;
}
diff --git
a/systests/protocol-tests-amqp-0-8/src/main/java/org/apache/qpid/tests/protocol/v0_8/PerformativeResponse.java
b/systests/protocol-tests-amqp-0-8/src/main/java/org/apache/qpid/tests/protocol/v0_8/PerformativeResponse.java
index 66871e9204..992cb5bc18 100644
---
a/systests/protocol-tests-amqp-0-8/src/main/java/org/apache/qpid/tests/protocol/v0_8/PerformativeResponse.java
+++
b/systests/protocol-tests-amqp-0-8/src/main/java/org/apache/qpid/tests/protocol/v0_8/PerformativeResponse.java
@@ -20,7 +20,6 @@
package org.apache.qpid.tests.protocol.v0_8;
import org.apache.qpid.server.protocol.v0_8.transport.AMQBody;
-import org.apache.qpid.server.protocol.v0_8.transport.AMQFrame;
import org.apache.qpid.tests.protocol.Response;
public class PerformativeResponse implements Response<AMQBody>
diff --git
a/systests/protocol-tests-amqp-0-8/src/main/java/org/apache/qpid/tests/protocol/v0_8/QueueInteraction.java
b/systests/protocol-tests-amqp-0-8/src/main/java/org/apache/qpid/tests/protocol/v0_8/QueueInteraction.java
index 00426e6ee9..9359cf9e2d 100644
---
a/systests/protocol-tests-amqp-0-8/src/main/java/org/apache/qpid/tests/protocol/v0_8/QueueInteraction.java
+++
b/systests/protocol-tests-amqp-0-8/src/main/java/org/apache/qpid/tests/protocol/v0_8/QueueInteraction.java
@@ -20,7 +20,6 @@
*/
package org.apache.qpid.tests.protocol.v0_8;
-import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -98,7 +97,7 @@ public class QueueInteraction
public QueueInteraction declareArguments(final Map<String,Object> args)
{
- _declareArguments = args == null ? Collections.emptyMap() : new
HashMap<>(args);
+ _declareArguments = args == null ? Map.of() : new HashMap<>(args);
return this;
}
@@ -167,7 +166,7 @@ public class QueueInteraction
public QueueInteraction bindArguments(final Map<String, Object> args)
{
- _bindArguments = args == null ? Collections.emptyMap() : new
HashMap<>(args);
+ _bindArguments = args == null ? Map.of() : new HashMap<>(args);
return this;
}
diff --git
a/systests/protocol-tests-amqp-0-8/src/main/java/org/apache/qpid/tests/protocol/v0_8/TxInteraction.java
b/systests/protocol-tests-amqp-0-8/src/main/java/org/apache/qpid/tests/protocol/v0_8/TxInteraction.java
index 8fc9ad6af9..a5d7d2ee79 100644
---
a/systests/protocol-tests-amqp-0-8/src/main/java/org/apache/qpid/tests/protocol/v0_8/TxInteraction.java
+++
b/systests/protocol-tests-amqp-0-8/src/main/java/org/apache/qpid/tests/protocol/v0_8/TxInteraction.java
@@ -23,7 +23,6 @@ package org.apache.qpid.tests.protocol.v0_8;
import org.apache.qpid.server.protocol.v0_8.transport.TxCommitBody;
import org.apache.qpid.server.protocol.v0_8.transport.TxRollbackBody;
import org.apache.qpid.server.protocol.v0_8.transport.TxSelectBody;
-import org.apache.qpid.tests.protocol.AbstractInteraction;
public class TxInteraction
{
diff --git
a/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/BasicTest.java
b/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/BasicTest.java
index fae47f7f67..d8242eb752 100644
---
a/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/BasicTest.java
+++
b/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/BasicTest.java
@@ -28,7 +28,6 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assumptions.assumeTrue;
import java.nio.charset.StandardCharsets;
-import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -75,7 +74,7 @@ public class BasicTest extends BrokerAdminUsingTestBase
interaction.negotiateOpen()
.channel().open().consumeResponse(ChannelOpenOkBody.class)
.basic().contentHeaderPropertiesContentType("text/plain")
-
.contentHeaderPropertiesHeaders(Collections.singletonMap("test", "testValue"))
+ .contentHeaderPropertiesHeaders(Map.of("test",
"testValue"))
.contentHeaderPropertiesDeliveryMode((byte)1)
.contentHeaderPropertiesPriority((byte)1)
.publishExchange("")
@@ -170,7 +169,7 @@ public class BasicTest extends BrokerAdminUsingTestBase
String messageContent = "Test";
String messageContentType = "text/plain";
byte deliveryMode = (byte) 2;
- Map<String, Object> messageHeaders = Collections.singletonMap("test",
"testValue");
+ Map<String, Object> messageHeaders = Map.of("test", "testValue");
try(FrameTransport transport = new
FrameTransport(getBrokerAdmin()).connect())
{
@@ -235,7 +234,7 @@ public class BasicTest extends BrokerAdminUsingTestBase
String messageContent = "Test";
String consumerTag = "A";
String queueName = BrokerAdmin.TEST_QUEUE_NAME;
- Map<String, Object> messageHeaders =
Collections.singletonMap("test", "testValue");
+ Map<String, Object> messageHeaders = Map.of("test", "testValue");
String messageContentType = "text/plain";
byte deliveryMode = (byte) 1;
byte priority = (byte) 2;
@@ -408,9 +407,9 @@ public class BasicTest extends BrokerAdminUsingTestBase
+ "also falls into other prefetch limits).")
public void qosBytesPrefetch() throws Exception
{
- String messageContent1 = String.join("", Collections.nCopies(128,
"1"));
- String messageContent2 = String.join("", Collections.nCopies(128,
"2"));
- String messageContent3 = String.join("", Collections.nCopies(256,
"3"));
+ String messageContent1 = "1".repeat(128);
+ String messageContent2 = "2".repeat(128);
+ String messageContent3 = "3".repeat(256);
try(FrameTransport transport = new
FrameTransport(getBrokerAdmin()).connect())
{
@@ -479,7 +478,7 @@ public class BasicTest extends BrokerAdminUsingTestBase
+ "unacknowledged messages.")
public void qosBytesSizeQosDoesNotPreventFirstMessage() throws Exception
{
- String messageContent = String.join("", Collections.nCopies(1024,
"*"));
+ String messageContent = "*".repeat(1024);
getBrokerAdmin().putMessageOnQueue(BrokerAdmin.TEST_QUEUE_NAME,
messageContent);
try(FrameTransport transport = new
FrameTransport(getBrokerAdmin()).connect())
diff --git
a/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/ExchangeTest.java
b/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/ExchangeTest.java
index 6bbeb3f267..ef30d47a13 100644
---
a/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/ExchangeTest.java
+++
b/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/ExchangeTest.java
@@ -26,7 +26,7 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assumptions.assumeTrue;
-import java.util.Collections;
+import java.util.Map;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
@@ -389,7 +389,7 @@ public class ExchangeTest extends BrokerAdminUsingTestBase
.consumeResponse(ExchangeDeclareOkBody.class)
.exchange()
.declareName(TEST_EXCHANGE)
-
.declareArguments(Collections.singletonMap("alternateExchange",
altExchName)).declare()
+ .declareArguments(Map.of("alternateExchange",
altExchName)).declare()
.consumeResponse(ExchangeDeclareOkBody.class);
ChannelCloseBody inUseResponse = interaction.exchange()
@@ -422,7 +422,7 @@ public class ExchangeTest extends BrokerAdminUsingTestBase
.channel().open().consumeResponse(ChannelOpenOkBody.class)
.exchange()
.declareName(TEST_EXCHANGE)
-
.declareArguments(Collections.singletonMap("alternateExchange",
"notKnown")).declare()
+
.declareArguments(Map.of("alternateExchange", "notKnown")).declare()
.consumeResponse().getLatestResponse(ConnectionCloseBody.class);
// TODO server fails - jira required
assertThat(response.getReplyCode(),
is(equalTo(ErrorCodes.NOT_FOUND)));
diff --git
a/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/LargeHeadersTest.java
b/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/LargeHeadersTest.java
index 1070266a9d..0d33f4af17 100644
---
a/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/LargeHeadersTest.java
+++
b/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/LargeHeadersTest.java
@@ -24,7 +24,6 @@ import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -53,8 +52,8 @@ public class LargeHeadersTest extends BrokerAdminUsingTestBase
getBrokerAdmin().createQueue(BrokerAdmin.TEST_QUEUE_NAME);
}
- @Test
/** Tests boundary case where headers exactly fill the content header
frame */
+ @Test
public void headersFillContentHeaderFrame() throws Exception
{
@@ -69,7 +68,7 @@ public class LargeHeadersTest extends BrokerAdminUsingTestBase
final String headerName = "test";
final int headerValueSize = (int) (connTune.getFrameMax() -
calculateContentHeaderFramingOverhead(headerName));
final String headerValue = generateLongString(headerValueSize);
- final Map<String, Object> messageHeaders =
Collections.singletonMap(headerName, headerValue);
+ final Map<String, Object> messageHeaders = Map.of(headerName,
headerValue);
interaction.connection().tuneOk()
.connection().open()
@@ -108,7 +107,7 @@ public class LargeHeadersTest extends
BrokerAdminUsingTestBase
private String generateLongString(final int count)
{
String pattern = "abcde";
- String str = String.join("", Collections.nCopies(count /
pattern.length(), pattern)) + pattern.substring(0, count % pattern.length());
+ String str = pattern.repeat(count / pattern.length()) +
pattern.substring(0, count % pattern.length());
assertThat(str.length(), is(equalTo(count)));
return str;
}
diff --git
a/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/QueueTest.java
b/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/QueueTest.java
index 3291a0c7bb..ad261b5204 100644
---
a/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/QueueTest.java
+++
b/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/QueueTest.java
@@ -28,10 +28,8 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.emptyString;
import static org.junit.jupiter.api.Assumptions.assumeTrue;
-import java.util.Collections;
import java.util.Map;
-import org.hamcrest.Matchers;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
@@ -844,7 +842,7 @@ public class QueueTest extends BrokerAdminUsingTestBase
.consumeResponse(ExchangeDeclareOkBody.class)
.queue()
.declareName(BrokerAdmin.TEST_QUEUE_NAME)
-
.declareArguments(Collections.singletonMap("alternateExchange",
altExchName)).declare()
+ .declareArguments(Map.of("alternateExchange",
altExchName)).declare()
.consumeResponse(QueueDeclareOkBody.class);
ChannelCloseBody inUseResponse = interaction.exchange()
@@ -877,7 +875,7 @@ public class QueueTest extends BrokerAdminUsingTestBase
.channel().open().consumeResponse(ChannelOpenOkBody.class)
.queue()
.declareName(BrokerAdmin.TEST_QUEUE_NAME)
-
.declareArguments(Collections.singletonMap("alternateExchange",
"notKnown")).declare()
+
.declareArguments(Map.of("alternateExchange", "notKnown")).declare()
.consumeResponse().getLatestResponse(ConnectionCloseBody.class);
assertThat(response.getReplyCode(),
is(equalTo(ErrorCodes.NOT_FOUND)));
}
@@ -894,7 +892,7 @@ public class QueueTest extends BrokerAdminUsingTestBase
try(FrameTransport transport = new
FrameTransport(getBrokerAdmin()).connect())
{
final Interaction interaction = transport.newInteraction();
- final Map<String, Object> messageProps =
Collections.singletonMap("prop", 0);
+ final Map<String, Object> messageProps = Map.of("prop", 0);
interaction.negotiateOpen()
.channel().open().consumeResponse(ChannelOpenOkBody.class)
.tx().select()
@@ -903,7 +901,7 @@ public class QueueTest extends BrokerAdminUsingTestBase
.bindName(ExchangeDefaults.TOPIC_EXCHANGE_NAME)
.bindRoutingKey(routingKey)
.bindQueueName(BrokerAdmin.TEST_QUEUE_NAME)
-
.bindArguments(Collections.singletonMap(AMQPFilterTypes.JMS_SELECTOR.getValue(),
"prop = 1"))
+
.bindArguments(Map.of(AMQPFilterTypes.JMS_SELECTOR.getValue(), "prop = 1"))
.bind()
.consumeResponse(QueueBindOkBody.class)
.basic()
@@ -921,7 +919,7 @@ public class QueueTest extends BrokerAdminUsingTestBase
.bindName(ExchangeDefaults.TOPIC_EXCHANGE_NAME)
.bindRoutingKey(routingKey)
.bindQueueName(BrokerAdmin.TEST_QUEUE_NAME)
-
.bindArguments(Collections.singletonMap(AMQPFilterTypes.JMS_SELECTOR.getValue(),
"prop = 0"))
+
.bindArguments(Map.of(AMQPFilterTypes.JMS_SELECTOR.getValue(), "prop = 0"))
.bind()
.consumeResponse(QueueBindOkBody.class)
.basic().publishExchange(ExchangeDefaults.TOPIC_EXCHANGE_NAME)
diff --git
a/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/TransactionTest.java
b/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/TransactionTest.java
index eaeaf6e323..080d97084d 100644
---
a/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/TransactionTest.java
+++
b/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/TransactionTest.java
@@ -24,7 +24,6 @@ import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import java.util.Collections;
import java.util.Map;
import org.junit.jupiter.api.BeforeEach;
@@ -91,7 +90,7 @@ public class TransactionTest extends BrokerAdminUsingTestBase
.channel().open().consumeResponse(ChannelOpenOkBody.class)
.tx().select().consumeResponse(TxSelectOkBody.class)
.basic().contentHeaderPropertiesContentType("text/plain")
-
.contentHeaderPropertiesHeaders(Collections.singletonMap("test", "testValue"))
+ .contentHeaderPropertiesHeaders(Map.of("test",
"testValue"))
.contentHeaderPropertiesDeliveryMode((byte)1)
.contentHeaderPropertiesPriority((byte)1)
.publishExchange("")
@@ -294,7 +293,7 @@ public class TransactionTest extends
BrokerAdminUsingTestBase
{
final Interaction interaction = transport.newInteraction();
- Map<String, Object> clientProperties =
Collections.singletonMap(ConnectionStartProperties.QPID_CLOSE_WHEN_NO_ROUTE,
true);
+ Map<String, Object> clientProperties =
Map.of(ConnectionStartProperties.QPID_CLOSE_WHEN_NO_ROUTE, true);
ConnectionCloseBody response =
interaction.connection().startOkClientProperties(clientProperties)
.interaction().negotiateOpen()
.channel().open().consumeResponse(ChannelOpenOkBody.class)
@@ -321,7 +320,7 @@ public class TransactionTest extends
BrokerAdminUsingTestBase
{
final Interaction interaction = transport.newInteraction();
- Map<String, Object> clientProperties =
Collections.singletonMap(ConnectionStartProperties.QPID_CLOSE_WHEN_NO_ROUTE,
false);
+ Map<String, Object> clientProperties =
Map.of(ConnectionStartProperties.QPID_CLOSE_WHEN_NO_ROUTE, false);
final String messageContent = "Test";
BasicReturnBody returned =
interaction.connection().startOkClientProperties(clientProperties)
.interaction().negotiateOpen()
diff --git
a/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/extension/basic/MalformedMessageTest.java
b/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/extension/basic/MalformedMessageTest.java
index 3c243ba408..1a50ee4460 100644
---
a/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/extension/basic/MalformedMessageTest.java
+++
b/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/extension/basic/MalformedMessageTest.java
@@ -29,7 +29,6 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assumptions.assumeTrue;
import java.nio.charset.StandardCharsets;
-import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -113,7 +112,7 @@ public class MalformedMessageTest extends
BrokerAdminUsingTestBase
.bindName(ExchangeDefaults.TOPIC_EXCHANGE_NAME)
.bindRoutingKey(BrokerAdmin.TEST_QUEUE_NAME)
.bindQueueName(BrokerAdmin.TEST_QUEUE_NAME)
-
.bindArguments(Collections.singletonMap(AMQPFilterTypes.JMS_SELECTOR.getValue(),
"prop = 1"))
+
.bindArguments(Map.of(AMQPFilterTypes.JMS_SELECTOR.getValue(), "prop = 1"))
.bind()
.consumeResponse(QueueBindOkBody.class)
.basic().publishExchange(ExchangeDefaults.TOPIC_EXCHANGE_NAME)
@@ -195,7 +194,7 @@ public class MalformedMessageTest extends
BrokerAdminUsingTestBase
.basic().publishExchange("")
.publishRoutingKey(BrokerAdmin.TEST_QUEUE_NAME)
.contentHeaderPropertiesContentType("text/plain")
- .contentHeaderPropertiesHeaders(Collections.emptyMap())
+ .contentHeaderPropertiesHeaders(Map.of())
.content(content2Bytes)
.publishMessage();
diff --git
a/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/extension/exchange/ExchangeDeclareInvalidOptionBehaviourTest.java
b/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/extension/exchange/ExchangeDeclareInvalidOptionBehaviourTest.java
index a78c1161ed..9c7a35c6fc 100644
---
a/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/extension/exchange/ExchangeDeclareInvalidOptionBehaviourTest.java
+++
b/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/extension/exchange/ExchangeDeclareInvalidOptionBehaviourTest.java
@@ -21,7 +21,7 @@ package
org.apache.qpid.tests.protocol.v0_8.extension.exchange;
import static org.apache.qpid.tests.utils.BrokerAdmin.KIND_BROKER_J;
-import java.util.Collections;
+import java.util.Map;
import org.junit.jupiter.api.Test;
@@ -51,7 +51,7 @@ public class ExchangeDeclareInvalidOptionBehaviourTest
extends BrokerAdminUsingT
.consumeResponse(ChannelOpenOkBody.class)
.exchange()
.declareName(TEST_EXCHANGE)
- .declareArguments(Collections.singletonMap("foo",
"bar"))
+ .declareArguments(Map.of("foo", "bar"))
.declare()
.consumeResponse(ExchangeDeclareOkBody.class);
}
diff --git
a/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/extension/exchange/ExchangeTest.java
b/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/extension/exchange/ExchangeTest.java
index d58206f57b..492ff145a8 100644
---
a/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/extension/exchange/ExchangeTest.java
+++
b/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/extension/exchange/ExchangeTest.java
@@ -25,7 +25,7 @@ import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import java.util.Collections;
+import java.util.Map;
import org.junit.jupiter.api.Test;
@@ -54,7 +54,7 @@ public class ExchangeTest extends BrokerAdminUsingTestBase
.channel().open().consumeResponse(ChannelOpenOkBody.class)
.exchange()
.declareName(TEST_EXCHANGE)
-
.declareArguments(Collections.singletonMap("unroutableMessageBehaviour",
"REJECT"))
+ .declareArguments(Map.of("unroutableMessageBehaviour",
"REJECT"))
.declare()
.consumeResponse(ExchangeDeclareOkBody.class);
@@ -79,7 +79,7 @@ public class ExchangeTest extends BrokerAdminUsingTestBase
.consumeResponse(ChannelOpenOkBody.class)
.exchange()
.declareName(TEST_EXCHANGE)
-
.declareArguments(Collections.singletonMap("foo", "bar"))
+
.declareArguments(Map.of("foo", "bar"))
.declare()
.consumeResponse(ConnectionCloseBody.class)
.getLatestResponse(ConnectionCloseBody.class);
diff --git
a/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/extension/queue/QueueDeclareInvalidOptionBehaviourTest.java
b/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/extension/queue/QueueDeclareInvalidOptionBehaviourTest.java
index c468648309..6906f1b615 100644
---
a/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/extension/queue/QueueDeclareInvalidOptionBehaviourTest.java
+++
b/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/extension/queue/QueueDeclareInvalidOptionBehaviourTest.java
@@ -24,7 +24,7 @@ import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import java.util.Collections;
+import java.util.Map;
import org.junit.jupiter.api.Test;
@@ -56,7 +56,7 @@ public class QueueDeclareInvalidOptionBehaviourTest extends
BrokerAdminUsingTest
.consumeResponse(ChannelOpenOkBody.class)
.queue()
.declareName(TEST_QUEUE)
-
.declareArguments(Collections.singletonMap("foo", "bar"))
+
.declareArguments(Map.of("foo", "bar"))
.declare()
.consumeResponse()
.getLatestResponse(QueueDeclareOkBody.class);
diff --git
a/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/extension/queue/QueueTest.java
b/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/extension/queue/QueueTest.java
index b3b1ed13fc..33de69f498 100644
---
a/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/extension/queue/QueueTest.java
+++
b/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/extension/queue/QueueTest.java
@@ -28,7 +28,6 @@ import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
import java.nio.charset.StandardCharsets;
-import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -67,7 +66,7 @@ public class QueueTest extends BrokerAdminUsingTestBase
QueueDeclareOkBody response = interaction.negotiateOpen()
.channel().open().consumeResponse(ChannelOpenOkBody.class)
.queue().declareName(BrokerAdmin.TEST_QUEUE_NAME)
-
.declareArguments(Collections.singletonMap("defaultFilters",
+
.declareArguments(Map.of("defaultFilters",
"{\"selector\":{\"x-filter-jms-selector\":[\"id=2\"]}}"))
.declare()
.consumeResponse().getLatestResponse(QueueDeclareOkBody.class);
@@ -91,7 +90,7 @@ public class QueueTest extends BrokerAdminUsingTestBase
.consumeResponse(ChannelFlowOkBody.class);
String content2 = "Test Content 2";
- Map<String, Object> messageHeaders2 =
Collections.singletonMap("id", 2);
+ Map<String, Object> messageHeaders2 = Map.of("id", 2);
String contentType = "text/plain";
// first message is not matching queue default filter
@@ -99,7 +98,7 @@ public class QueueTest extends BrokerAdminUsingTestBase
.publishRoutingKey(BrokerAdmin.TEST_QUEUE_NAME)
.publishMandatory(true)
.contentHeaderPropertiesContentType(contentType)
-
.contentHeaderPropertiesHeaders(Collections.singletonMap("id", 1))
+ .contentHeaderPropertiesHeaders(Map.of("id", 1))
.content("Test1")
.publishMessage()
@@ -158,7 +157,7 @@ public class QueueTest extends BrokerAdminUsingTestBase
ConnectionCloseBody response = interaction.negotiateOpen()
.channel().open().consumeResponse(ChannelOpenOkBody.class)
.queue().declareName(BrokerAdmin.TEST_QUEUE_NAME)
-
.declareArguments(Collections.singletonMap("foo", "bar"))
+
.declareArguments(Map.of("foo", "bar"))
.declare()
.consumeResponse().getLatestResponse(ConnectionCloseBody.class);
diff --git
a/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/extension/transactiontimeout/TransactionTimeoutTest.java
b/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/extension/transactiontimeout/TransactionTimeoutTest.java
index 3b41466930..fb2c2fd9d7 100644
---
a/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/extension/transactiontimeout/TransactionTimeoutTest.java
+++
b/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/extension/transactiontimeout/TransactionTimeoutTest.java
@@ -25,7 +25,7 @@ import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import java.util.Collections;
+import java.util.Map;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -69,7 +69,7 @@ public class TransactionTimeoutTest extends
BrokerAdminUsingTestBase
.channel().open().consumeResponse(ChannelOpenOkBody.class)
.tx().select().consumeResponse(TxSelectOkBody.class)
.basic().contentHeaderPropertiesContentType("text/plain")
-
.contentHeaderPropertiesHeaders(Collections.singletonMap("test", "testValue"))
+ .contentHeaderPropertiesHeaders(Map.of("test",
"testValue"))
.contentHeaderPropertiesDeliveryMode((byte)1)
.contentHeaderPropertiesPriority((byte)1)
.publishExchange("")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
