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 c670625e59 QPID-8653: [Broker-J] Code cleanup: collection type
arguments, collection factory methods, lambdas (#197)
c670625e59 is described below
commit c670625e594f6ca2c8650ec40ca6d42c8e8f53fe
Author: Daniil Kirilyuk <daniel.kiril...@gmail.com>
AuthorDate: Mon Aug 7 09:58:13 2023 +0200
QPID-8653: [Broker-J] Code cleanup: collection type arguments, collection
factory methods, lambdas (#197)
---
.../apache/qpid/tests/protocol/v1_0/Interaction.java | 14 ++++++--------
.../qpid/tests/protocol/v1_0/DecodeErrorTest.java | 9 +++------
.../extensions/bindmapjms/TemporaryDestinationTest.java | 14 +++++++-------
.../protocol/v1_0/extensions/filter/FilterTest.java | 7 ++-----
.../v1_0/extensions/management/ManagementTest.java | 4 ++--
.../extensions/soleconn/CloseExistingPolicyTest.java | 15 ++++++---------
.../v1_0/extensions/soleconn/MixedPolicyTest.java | 17 ++++++-----------
.../extensions/soleconn/RefuseConnectionPolicyTest.java | 13 ++++++-------
.../v1_0/extensions/soleconn/SoleConnectionAsserts.java | 6 +++---
.../protocol/v1_0/messaging/DeleteOnCloseTest.java | 10 +++++-----
.../v1_0/transaction/TransactionalTransferTest.java | 10 ++++------
.../v1_0/transport/link/ResumeDeliveriesTest.java | 16 +++++++---------
12 files changed, 57 insertions(+), 78 deletions(-)
diff --git
a/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/Interaction.java
b/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/Interaction.java
index 207cfddf7a..99dfb463c1 100644
---
a/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/Interaction.java
+++
b/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/Interaction.java
@@ -1093,13 +1093,11 @@ public class Interaction extends
AbstractInteraction<Interaction>
private DeliveryState handleCoordinatorResponse() throws Exception
{
- final Set<Class<?>> expected = new
HashSet<>(Collections.singletonList(Disposition.class));
- if (_coordinatorCredits.decrementAndGet() == 0)
- {
- expected.add(Flow.class);
- }
+ final Set<Class<?>> expected = _coordinatorCredits.decrementAndGet()
== 0
+ ? Set.of(Disposition.class, Flow.class)
+ : Set.of(Disposition.class);
- final Map<Class<?>, ?> responses = consumeResponses(expected,
Collections.singleton(Flow.class));
+ final Map<Class<?>, ?> responses = consumeResponses(expected,
Set.of(Flow.class));
final Disposition disposition = (Disposition)
responses.get(Disposition.class);
if (expected.contains(Flow.class))
@@ -1260,9 +1258,9 @@ public class Interaction extends
AbstractInteraction<Interaction>
boolean hasMore = true;
do
{
- Set<Class<?>> responseTypesSet = new
HashSet<>(Arrays.asList(ignore));
+ Set<Class<?>> responseTypesSet = new HashSet<>(List.of(ignore));
responseTypesSet.add(Transfer.class);
- Class<?>[] responseTypes = responseTypesSet.toArray(new
Class<?>[responseTypesSet.size()]);
+ Class<?>[] responseTypes = responseTypesSet.toArray(new
Class<?>[0]);
Response<?> latestResponse =
consumeResponse(responseTypes).getLatestResponse();
if (latestResponse.getBody() instanceof Transfer)
{
diff --git
a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/DecodeErrorTest.java
b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/DecodeErrorTest.java
index ebf582d69c..01e6d14ce1 100644
---
a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/DecodeErrorTest.java
+++
b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/DecodeErrorTest.java
@@ -30,7 +30,6 @@ import static org.hamcrest.Matchers.is;
import static org.junit.jupiter.api.Assumptions.assumeTrue;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -108,8 +107,7 @@ public class DecodeErrorTest extends
BrokerAdminUsingTestBase
{
final Source source = new Source();
source.setDynamic(Boolean.TRUE);
-
source.setDynamicNodeProperties(Collections.singletonMap(Symbol.valueOf("lifetime-policy"),
-
UnsignedInteger.MAX_VALUE));
+
source.setDynamicNodeProperties(Map.of(Symbol.valueOf("lifetime-policy"),
UnsignedInteger.MAX_VALUE));
final Interaction interaction = transport.newInteraction()
.negotiateOpen()
.begin().consumeResponse(Begin.class)
@@ -132,8 +130,7 @@ public class DecodeErrorTest extends
BrokerAdminUsingTestBase
{
final Target target = new Target();
target.setDynamic(Boolean.TRUE);
-
target.setDynamicNodeProperties(Collections.singletonMap(Symbol.valueOf("supported-dist-modes"),
-
UnsignedInteger.ZERO));
+
target.setDynamicNodeProperties(Map.of(Symbol.valueOf("supported-dist-modes"),
UnsignedInteger.ZERO));
final Interaction interaction = transport.newInteraction()
.negotiateOpen()
.begin().consumeResponse(Begin.class)
@@ -168,7 +165,7 @@ public class DecodeErrorTest extends
BrokerAdminUsingTestBase
encodedString.flip();
payloads.add(encodedString);
- final Map<Symbol, Object> annotationMap =
Collections.singletonMap(Symbol.valueOf("foo"), "bar");
+ final Map<Symbol, Object> annotationMap =
Map.of(Symbol.valueOf("foo"), "bar");
final DeliveryAnnotations annotations = new
DeliveryAnnotations(annotationMap);
final DeliveryAnnotationsSection deliveryAnnotationsSection =
annotations.createEncodingRetainingSection();
try
diff --git
a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/bindmapjms/TemporaryDestinationTest.java
b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/bindmapjms/TemporaryDestinationTest.java
index dff6fea970..a218388cf0 100644
---
a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/bindmapjms/TemporaryDestinationTest.java
+++
b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/bindmapjms/TemporaryDestinationTest.java
@@ -27,7 +27,7 @@ import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
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.Test;
@@ -283,7 +283,7 @@ public class TemporaryDestinationTest extends
BrokerAdminUsingTestBase
try (FrameTransport transport = new
FrameTransport(getBrokerAdmin()).connect())
{
final Source source = new Source();
-
source.setDynamicNodeProperties(Collections.singletonMap(Session_1_0.LIFETIME_POLICY,
new DeleteOnClose()));
+
source.setDynamicNodeProperties(Map.of(Session_1_0.LIFETIME_POLICY, new
DeleteOnClose()));
source.setExpiryPolicy(TerminusExpiryPolicy.LINK_DETACH);
source.setCapabilities(capabilities);
source.setDynamic(true);
@@ -305,7 +305,7 @@ public class TemporaryDestinationTest extends
BrokerAdminUsingTestBase
assertThat(newTemporaryNodeAddress, is(notNullValue()));
Target target = new Target();
-
target.setDynamicNodeProperties(Collections.singletonMap(Session_1_0.LIFETIME_POLICY,
new DeleteOnClose()));
+
target.setDynamicNodeProperties(Map.of(Session_1_0.LIFETIME_POLICY, new
DeleteOnClose()));
target.setExpiryPolicy(TerminusExpiryPolicy.LINK_DETACH);
target.setCapabilities(capabilities);
target.setAddress(newTemporaryNodeAddress);
@@ -347,7 +347,7 @@ public class TemporaryDestinationTest extends
BrokerAdminUsingTestBase
try (FrameTransport transport = new
FrameTransport(getBrokerAdmin()).connect())
{
final Source source = new Source();
-
source.setDynamicNodeProperties(Collections.singletonMap(Session_1_0.LIFETIME_POLICY,
new DeleteOnClose()));
+
source.setDynamicNodeProperties(Map.of(Session_1_0.LIFETIME_POLICY, new
DeleteOnClose()));
source.setExpiryPolicy(TerminusExpiryPolicy.LINK_DETACH);
source.setCapabilities(capabilities);
source.setDynamic(true);
@@ -388,7 +388,7 @@ public class TemporaryDestinationTest extends
BrokerAdminUsingTestBase
try (FrameTransport transport = new
FrameTransport(getBrokerAdmin()).connect())
{
final Source source = new Source();
-
source.setDynamicNodeProperties(Collections.singletonMap(Session_1_0.LIFETIME_POLICY,
new DeleteOnClose()));
+
source.setDynamicNodeProperties(Map.of(Session_1_0.LIFETIME_POLICY, new
DeleteOnClose()));
source.setExpiryPolicy(TerminusExpiryPolicy.LINK_DETACH);
source.setCapabilities(capabilities);
source.setDynamic(true);
@@ -459,7 +459,7 @@ public class TemporaryDestinationTest extends
BrokerAdminUsingTestBase
private Target createTarget(final Symbol[] capabilities)
{
Target target = new Target();
-
target.setDynamicNodeProperties(Collections.singletonMap(Session_1_0.LIFETIME_POLICY,
new DeleteOnClose()));
+ target.setDynamicNodeProperties(Map.of(Session_1_0.LIFETIME_POLICY,
new DeleteOnClose()));
target.setExpiryPolicy(TerminusExpiryPolicy.LINK_DETACH);
target.setDynamic(true);
target.setCapabilities(capabilities);
@@ -469,7 +469,7 @@ public class TemporaryDestinationTest extends
BrokerAdminUsingTestBase
private Source createSource(final String name, final Symbol[] capabilities)
{
final Source source = new Source();
-
source.setDynamicNodeProperties(Collections.singletonMap(Session_1_0.LIFETIME_POLICY,
new DeleteOnClose()));
+ source.setDynamicNodeProperties(Map.of(Session_1_0.LIFETIME_POLICY,
new DeleteOnClose()));
source.setExpiryPolicy(TerminusExpiryPolicy.LINK_DETACH);
source.setCapabilities(capabilities);
source.setAddress(name);
diff --git
a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/filter/FilterTest.java
b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/filter/FilterTest.java
index a9d7c963f4..0c29a5a494 100644
---
a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/filter/FilterTest.java
+++
b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/filter/FilterTest.java
@@ -32,7 +32,6 @@ import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.Matchers.nullValue;
import static org.junit.jupiter.api.Assumptions.assumeTrue;
-import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -91,8 +90,7 @@ public class FilterTest extends BrokerAdminUsingTestBase
for (int i = 0; i < 2; i++)
{
QpidByteBuffer payload =
-
generateMessagePayloadWithApplicationProperties(Collections.singletonMap("index",
i),
-
getTestName());
+
generateMessagePayloadWithApplicationProperties(Map.of("index", i),
getTestName());
interaction.transferPayload(payload)
.transferSettled(true)
.transfer();
@@ -108,8 +106,7 @@ public class FilterTest extends BrokerAdminUsingTestBase
.attachRole(Role.RECEIVER)
.attachSourceAddress(BrokerAdmin.TEST_QUEUE_NAME)
.attachRcvSettleMode(ReceiverSettleMode.FIRST)
-
.attachSourceFilter(Collections.singletonMap(Symbol.valueOf("selector-filter"),
- new
JMSSelectorFilter("index=1")))
+
.attachSourceFilter(Map.of(Symbol.valueOf("selector-filter"), new
JMSSelectorFilter("index=1")))
.attach().consumeResponse()
.flowIncomingWindow(UnsignedInteger.ONE)
.flowNextIncomingId(UnsignedInteger.ZERO)
diff --git
a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/management/ManagementTest.java
b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/management/ManagementTest.java
index 09370f6a74..ea7e434ea8 100644
---
a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/management/ManagementTest.java
+++
b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/management/ManagementTest.java
@@ -27,7 +27,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
import static org.junit.jupiter.api.Assumptions.assumeTrue;
-import java.util.Collections;
+import java.util.Map;
import org.junit.jupiter.api.Test;
@@ -64,7 +64,7 @@ public class ManagementTest extends BrokerAdminUsingTestBase
try (FrameTransport transport = new
FrameTransport(getBrokerAdmin()).connect())
{
Target target = new Target();
-
target.setDynamicNodeProperties(Collections.singletonMap(Session_1_0.LIFETIME_POLICY,
new DeleteOnClose()));
+
target.setDynamicNodeProperties(Map.of(Session_1_0.LIFETIME_POLICY, new
DeleteOnClose()));
target.setExpiryPolicy(TerminusExpiryPolicy.LINK_DETACH);
target.setDynamic(true);
target.setCapabilities(new
Symbol[]{Symbol.valueOf("temporary-queue")});
diff --git
a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/soleconn/CloseExistingPolicyTest.java
b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/soleconn/CloseExistingPolicyTest.java
index c401f5187c..fe232add0a 100644
---
a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/soleconn/CloseExistingPolicyTest.java
+++
b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/soleconn/CloseExistingPolicyTest.java
@@ -33,7 +33,7 @@ import static
org.apache.qpid.tests.protocol.v1_0.extensions.soleconn.SoleConnec
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.in;
-import java.util.Collections;
+import java.util.Map;
import org.junit.jupiter.api.Test;
@@ -56,7 +56,7 @@ public class CloseExistingPolicyTest extends
BrokerAdminUsingTestBase
Open responseOpen = transport.newInteraction()
.openContainerId("testContainerId")
.openDesiredCapabilities(SOLE_CONNECTION_FOR_CONTAINER)
-
.openProperties(Collections.singletonMap(
+ .openProperties(Map.of(
SOLE_CONNECTION_ENFORCEMENT_POLICY,
CLOSE_EXISTING))
.negotiateOpen()
@@ -82,8 +82,7 @@ public class CloseExistingPolicyTest extends
BrokerAdminUsingTestBase
final Interaction interaction1 = transport1.newInteraction();
interaction1.openContainerId("testContainerId")
.openDesiredCapabilities(SOLE_CONNECTION_FOR_CONTAINER)
-
.openProperties(Collections.singletonMap(SOLE_CONNECTION_ENFORCEMENT_POLICY,
-
CLOSE_EXISTING))
+
.openProperties(Map.of(SOLE_CONNECTION_ENFORCEMENT_POLICY, CLOSE_EXISTING))
.negotiateOpen();
final Open responseOpen =
interaction1.getLatestResponse(Open.class);
@@ -95,8 +94,7 @@ public class CloseExistingPolicyTest extends
BrokerAdminUsingTestBase
final Interaction interaction2 = transport2.newInteraction();
interaction2.openContainerId("testContainerId")
.openDesiredCapabilities(SOLE_CONNECTION_FOR_CONTAINER)
-
.openProperties(Collections.singletonMap(SOLE_CONNECTION_ENFORCEMENT_POLICY,
-
CLOSE_EXISTING))
+
.openProperties(Map.of(SOLE_CONNECTION_ENFORCEMENT_POLICY, CLOSE_EXISTING))
.sendOpen()
.sync();
@@ -129,8 +127,7 @@ public class CloseExistingPolicyTest extends
BrokerAdminUsingTestBase
final Interaction interaction2 = transport2.newInteraction();
interaction2.openContainerId("testContainerId")
.openDesiredCapabilities(SOLE_CONNECTION_FOR_CONTAINER)
-
.openProperties(Collections.singletonMap(SOLE_CONNECTION_ENFORCEMENT_POLICY,
-
CLOSE_EXISTING))
+
.openProperties(Map.of(SOLE_CONNECTION_ENFORCEMENT_POLICY, CLOSE_EXISTING))
.negotiateOpen();
final Open responseOpen2 =
interaction2.getLatestResponse(Open.class);
@@ -150,7 +147,7 @@ public class CloseExistingPolicyTest extends
BrokerAdminUsingTestBase
final Interaction interaction1 = transport1.newInteraction();
Open responseOpen = interaction1.openContainerId("testContainerId")
.openDesiredCapabilities(SOLE_CONNECTION_FOR_CONTAINER)
-
.openProperties(Collections.singletonMap(
+ .openProperties(Map.of(
SOLE_CONNECTION_ENFORCEMENT_POLICY,
CLOSE_EXISTING))
.negotiateOpen()
diff --git
a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/soleconn/MixedPolicyTest.java
b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/soleconn/MixedPolicyTest.java
index e023f30218..35ed86a862 100644
---
a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/soleconn/MixedPolicyTest.java
+++
b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/soleconn/MixedPolicyTest.java
@@ -28,7 +28,7 @@ import static
org.apache.qpid.tests.protocol.v1_0.extensions.soleconn.SoleConnec
import static
org.apache.qpid.tests.protocol.v1_0.extensions.soleconn.SoleConnectionAsserts.assumeEnforcementPolicyRefuse;
import static
org.apache.qpid.tests.protocol.v1_0.extensions.soleconn.SoleConnectionAsserts.assumeSoleConnectionCapability;
-import java.util.Collections;
+import java.util.Map;
import org.junit.jupiter.api.Test;
@@ -49,8 +49,7 @@ public class MixedPolicyTest extends BrokerAdminUsingTestBase
final Interaction interaction1 = transport1.newInteraction();
interaction1.openContainerId("testContainerId")
.openDesiredCapabilities(SOLE_CONNECTION_FOR_CONTAINER)
-
.openProperties(Collections.singletonMap(SOLE_CONNECTION_ENFORCEMENT_POLICY,
-
CLOSE_EXISTING))
+
.openProperties(Map.of(SOLE_CONNECTION_ENFORCEMENT_POLICY, CLOSE_EXISTING))
.negotiateOpen();
Open responseOpen = interaction1.getLatestResponse(Open.class);
@@ -62,8 +61,7 @@ public class MixedPolicyTest extends BrokerAdminUsingTestBase
final Interaction interaction2 = transport2.newInteraction();
interaction2.openContainerId("testContainerId")
.openDesiredCapabilities(SOLE_CONNECTION_FOR_CONTAINER)
-
.openProperties(Collections.singletonMap(SOLE_CONNECTION_ENFORCEMENT_POLICY,
-
REFUSE_CONNECTION))
+
.openProperties(Map.of(SOLE_CONNECTION_ENFORCEMENT_POLICY, REFUSE_CONNECTION))
.sendOpen().sync();
interaction1.consumeResponse(Close.class);
@@ -75,8 +73,7 @@ public class MixedPolicyTest extends BrokerAdminUsingTestBase
final Interaction interaction3 =
transport3.newInteraction();
interaction3.openContainerId("testContainerId")
.openDesiredCapabilities(SOLE_CONNECTION_FOR_CONTAINER)
-
.openProperties(Collections.singletonMap(SOLE_CONNECTION_ENFORCEMENT_POLICY,
-
CLOSE_EXISTING))
+
.openProperties(Map.of(SOLE_CONNECTION_ENFORCEMENT_POLICY, CLOSE_EXISTING))
.negotiateOpen()
.consumeResponse(Close.class);
}
@@ -92,8 +89,7 @@ public class MixedPolicyTest extends BrokerAdminUsingTestBase
final Interaction interaction1 = transport1.newInteraction();
interaction1.openContainerId("testContainerId")
.openDesiredCapabilities(SOLE_CONNECTION_FOR_CONTAINER)
-
.openProperties(Collections.singletonMap(SOLE_CONNECTION_ENFORCEMENT_POLICY,
-
REFUSE_CONNECTION))
+
.openProperties(Map.of(SOLE_CONNECTION_ENFORCEMENT_POLICY, REFUSE_CONNECTION))
.negotiateOpen();
final Open responseOpen =
interaction1.getLatestResponse(Open.class);
@@ -105,8 +101,7 @@ public class MixedPolicyTest extends
BrokerAdminUsingTestBase
final Interaction interaction2 = transport2.newInteraction();
interaction2.openContainerId("testContainerId")
.openDesiredCapabilities(SOLE_CONNECTION_FOR_CONTAINER)
-
.openProperties(Collections.singletonMap(SOLE_CONNECTION_ENFORCEMENT_POLICY,
-
CLOSE_EXISTING))
+
.openProperties(Map.of(SOLE_CONNECTION_ENFORCEMENT_POLICY, CLOSE_EXISTING))
.negotiateOpen()
.consumeResponse(Close.class);
}
diff --git
a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/soleconn/RefuseConnectionPolicyTest.java
b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/soleconn/RefuseConnectionPolicyTest.java
index 8789bae143..e8ab9fc61e 100644
---
a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/soleconn/RefuseConnectionPolicyTest.java
+++
b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/soleconn/RefuseConnectionPolicyTest.java
@@ -33,7 +33,7 @@ import static
org.apache.qpid.tests.protocol.v1_0.extensions.soleconn.SoleConnec
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.in;
-import java.util.Collections;
+import java.util.Map;
import org.junit.jupiter.api.Test;
@@ -56,7 +56,7 @@ public class RefuseConnectionPolicyTest extends
BrokerAdminUsingTestBase
final Interaction interaction = transport.newInteraction();
final Open responseOpen =
interaction.openContainerId("testContainerId")
.openDesiredCapabilities(SOLE_CONNECTION_FOR_CONTAINER)
-
.openProperties(Collections.singletonMap(
+ .openProperties(Map.of(
SOLE_CONNECTION_ENFORCEMENT_POLICY,
REFUSE_CONNECTION))
.negotiateOpen()
@@ -82,8 +82,7 @@ public class RefuseConnectionPolicyTest extends
BrokerAdminUsingTestBase
final Interaction interaction1 = transport1.newInteraction();
interaction1.openContainerId("testContainerId")
.openDesiredCapabilities(SOLE_CONNECTION_FOR_CONTAINER)
-
.openProperties(Collections.singletonMap(SOLE_CONNECTION_ENFORCEMENT_POLICY,
-
REFUSE_CONNECTION))
+
.openProperties(Map.of(SOLE_CONNECTION_ENFORCEMENT_POLICY, REFUSE_CONNECTION))
.negotiateOpen();
final Open responseOpen =
interaction1.getLatestResponse(Open.class);
@@ -95,7 +94,7 @@ public class RefuseConnectionPolicyTest extends
BrokerAdminUsingTestBase
final Interaction interaction2 = transport2.newInteraction();
final Open responseOpen2 =
interaction2.openContainerId("testContainerId")
.openDesiredCapabilities(SOLE_CONNECTION_FOR_CONTAINER)
-
.openProperties(Collections.singletonMap(
+ .openProperties(Map.of(
SOLE_CONNECTION_ENFORCEMENT_POLICY,
REFUSE_CONNECTION))
.negotiateOpen()
@@ -127,7 +126,7 @@ public class RefuseConnectionPolicyTest extends
BrokerAdminUsingTestBase
final Interaction interaction2 = transport2.newInteraction();
final Open responseOpen2 =
interaction2.openContainerId("testContainerId")
.openDesiredCapabilities(SOLE_CONNECTION_FOR_CONTAINER)
-
.openProperties(Collections.singletonMap(
+ .openProperties(Map.of(
SOLE_CONNECTION_ENFORCEMENT_POLICY,
REFUSE_CONNECTION))
.negotiateOpen()
@@ -147,7 +146,7 @@ public class RefuseConnectionPolicyTest extends
BrokerAdminUsingTestBase
final Interaction interaction1 = transport1.newInteraction();
final Open responseOpen =
interaction1.openContainerId("testContainerId")
.openDesiredCapabilities(SOLE_CONNECTION_FOR_CONTAINER)
-
.openProperties(Collections.singletonMap(
+ .openProperties(Map.of(
SOLE_CONNECTION_ENFORCEMENT_POLICY,
REFUSE_CONNECTION.getValue()))
.negotiateOpen()
diff --git
a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/soleconn/SoleConnectionAsserts.java
b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/soleconn/SoleConnectionAsserts.java
index e1bcea9e3e..161da65a99 100644
---
a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/soleconn/SoleConnectionAsserts.java
+++
b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/soleconn/SoleConnectionAsserts.java
@@ -36,7 +36,7 @@ import static
org.hamcrest.collection.IsMapContaining.hasEntry;
import static org.hamcrest.collection.IsMapContaining.hasKey;
import static org.junit.jupiter.api.Assumptions.assumeTrue;
-import java.util.Collections;
+import java.util.Map;
import org.apache.qpid.server.protocol.v1_0.type.Symbol;
import
org.apache.qpid.server.protocol.v1_0.type.extensions.soleconn.SoleConnectionDetectionPolicy;
@@ -111,13 +111,13 @@ class SoleConnectionAsserts
{
assertThat(close.getError(), is(notNullValue()));
assertThat(close.getError().getCondition(),
is(equalTo(AmqpError.RESOURCE_LOCKED)));
- assertThat(close.getError().getInfo(),
is(equalTo(Collections.singletonMap(SOLE_CONNECTION_ENFORCEMENT, true))));
+ assertThat(close.getError().getInfo(),
is(equalTo(Map.of(SOLE_CONNECTION_ENFORCEMENT, true))));
}
static void assertInvalidContainerId(final Close close)
{
assertThat(close.getError(), is(notNullValue()));
assertThat(close.getError().getCondition(),
is(equalTo(AmqpError.INVALID_FIELD)));
- assertThat(close.getError().getInfo(),
is(equalTo(Collections.singletonMap(INVALID_FIELD, CONTAINER_ID))));
+ assertThat(close.getError().getInfo(),
is(equalTo(Map.of(INVALID_FIELD, CONTAINER_ID))));
}
}
diff --git
a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/messaging/DeleteOnCloseTest.java
b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/messaging/DeleteOnCloseTest.java
index 46de9f1acc..cf07966ac4 100644
---
a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/messaging/DeleteOnCloseTest.java
+++
b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/messaging/DeleteOnCloseTest.java
@@ -26,7 +26,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
import static org.junit.jupiter.api.Assumptions.assumeTrue;
-import java.util.Collections;
+import java.util.Map;
import java.util.concurrent.TimeUnit;
import com.google.common.util.concurrent.ListenableFuture;
@@ -62,7 +62,7 @@ public class DeleteOnCloseTest extends
BrokerAdminUsingTestBase
try (FrameTransport transport = new
FrameTransport(getBrokerAdmin()).connect())
{
Source source = new Source();
-
source.setDynamicNodeProperties(Collections.singletonMap(Session_1_0.LIFETIME_POLICY,
new DeleteOnClose()));
+
source.setDynamicNodeProperties(Map.of(Session_1_0.LIFETIME_POLICY, new
DeleteOnClose()));
source.setDynamic(true);
final Interaction interaction = transport.newInteraction();
final Attach attachResponse = interaction.negotiateOpen()
@@ -97,7 +97,7 @@ public class DeleteOnCloseTest extends
BrokerAdminUsingTestBase
try (FrameTransport transport = new
FrameTransport(getBrokerAdmin()).connect())
{
Target target = new Target();
-
target.setDynamicNodeProperties(Collections.singletonMap(Session_1_0.LIFETIME_POLICY,
new DeleteOnClose()));
+
target.setDynamicNodeProperties(Map.of(Session_1_0.LIFETIME_POLICY, new
DeleteOnClose()));
target.setDynamic(true);
final Interaction interaction = transport.newInteraction();
final Attach attachResponse = interaction.negotiateOpen()
@@ -135,7 +135,7 @@ public class DeleteOnCloseTest extends
BrokerAdminUsingTestBase
try (FrameTransport transport = new
FrameTransport(getBrokerAdmin()).connect())
{
Source source = new Source();
-
source.setDynamicNodeProperties(Collections.singletonMap(Session_1_0.LIFETIME_POLICY,
new DeleteOnClose()));
+
source.setDynamicNodeProperties(Map.of(Session_1_0.LIFETIME_POLICY, new
DeleteOnClose()));
source.setDynamic(true);
final Interaction interaction = transport.newInteraction();
final Attach attachResponse = interaction.negotiateOpen()
@@ -178,7 +178,7 @@ public class DeleteOnCloseTest extends
BrokerAdminUsingTestBase
try (FrameTransport transport = new
FrameTransport(getBrokerAdmin()).connect())
{
Source source = new Source();
-
source.setDynamicNodeProperties(Collections.singletonMap(Session_1_0.LIFETIME_POLICY,
new DeleteOnClose()));
+
source.setDynamicNodeProperties(Map.of(Session_1_0.LIFETIME_POLICY, new
DeleteOnClose()));
source.setExpiryPolicy(TerminusExpiryPolicy.NEVER);
source.setDynamic(true);
final Interaction interaction = transport.newInteraction();
diff --git
a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/transaction/TransactionalTransferTest.java
b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/transaction/TransactionalTransferTest.java
index e83f1fdcaf..d25accacbe 100644
---
a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/transaction/TransactionalTransferTest.java
+++
b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/transaction/TransactionalTransferTest.java
@@ -28,8 +28,8 @@ import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
import static org.junit.jupiter.api.Assumptions.assumeTrue;
-import java.util.Collections;
import java.util.List;
+import java.util.Map;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
@@ -495,8 +495,7 @@ public class TransactionalTransferTest extends
BrokerAdminUsingTestBase
.flowNextOutgoingId(UnsignedInteger.ZERO)
.flowLinkCredit(UnsignedInteger.ONE)
.flowHandleFromLinkHandle()
-
.flowProperties(Collections.singletonMap(Symbol.valueOf("txn-id"),
-
interaction.getCurrentTransactionId()))
+ .flowProperties(Map.of(Symbol.valueOf("txn-id"),
interaction.getCurrentTransactionId()))
.flow()
.receiveDelivery();
@@ -558,8 +557,7 @@ public class TransactionalTransferTest extends
BrokerAdminUsingTestBase
.flowNextOutgoingId(UnsignedInteger.ZERO)
.flowLinkCredit(UnsignedInteger.ONE)
.flowHandleFromLinkHandle()
-
.flowProperties(Collections.singletonMap(Symbol.valueOf("txn-id"),
-
interaction.getCurrentTransactionId()))
+ .flowProperties(Map.of(Symbol.valueOf("txn-id"),
interaction.getCurrentTransactionId()))
.flow()
.receiveDelivery();
@@ -617,7 +615,7 @@ public class TransactionalTransferTest extends
BrokerAdminUsingTestBase
.flowIncomingWindow(UnsignedInteger.ONE)
.flowLinkCredit(UnsignedInteger.ONE)
.flowHandleFromLinkHandle()
-
.flowProperties(Collections.singletonMap(Symbol.valueOf("txn-id"),
+
.flowProperties(Map.of(Symbol.valueOf("txn-id"),
integerToBinary(Integer.MAX_VALUE)))
.flow()
.consume(ErrorCarryingFrameBody.class, Flow.class);
diff --git
a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/transport/link/ResumeDeliveriesTest.java
b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/transport/link/ResumeDeliveriesTest.java
index 641cf12ca8..23315db4bf 100644
---
a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/transport/link/ResumeDeliveriesTest.java
+++
b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/transport/link/ResumeDeliveriesTest.java
@@ -40,6 +40,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import org.hamcrest.Matchers;
@@ -138,7 +139,7 @@ public class ResumeDeliveriesTest extends
BrokerAdminUsingTestBase
assertThat(responseAttach2.getTarget(), is(notNullValue()));
final Map<Binary, DeliveryState> remoteUnsettled =
responseAttach2.getUnsettled();
assertThat(remoteUnsettled, is(notNullValue()));
- assertThat(remoteUnsettled.keySet(),
is(equalTo(Collections.singleton(deliveryTag))));
+ assertThat(remoteUnsettled.keySet(),
is(equalTo(Set.of(deliveryTag))));
assertThat(remoteUnsettled.get(deliveryTag).getClass(),
typeCompatibleWith(remoteDeliveryState.getClass()));
assertThat(responseAttach2.getIncompleteUnsettled(),
is(anyOf(nullValue(), equalTo(false))));
}
@@ -198,8 +199,7 @@ public class ResumeDeliveriesTest extends
BrokerAdminUsingTestBase
// 4. resume the link
final UnsignedInteger linkHandle2 = UnsignedInteger.ONE;
final Binary sampleLocalUnsettled =
localUnsettled.keySet().iterator().next();
- Map<Binary, DeliveryState> unsettled =
Collections.singletonMap(sampleLocalUnsettled,
-
localUnsettled.get(sampleLocalUnsettled));
+ Map<Binary, DeliveryState> unsettled =
Map.of(sampleLocalUnsettled, localUnsettled.get(sampleLocalUnsettled));
final Response<?> latestResponse =
interaction.attachHandle(linkHandle2)
.attachUnsettled(unsettled)
.attachIncompleteUnsettled(true)
@@ -292,8 +292,7 @@ public class ResumeDeliveriesTest extends
BrokerAdminUsingTestBase
// 4. resume the link
final UnsignedInteger linkHandle2 = UnsignedInteger.ONE;
final Binary sampleLocalUnsettled =
localUnsettled.keySet().iterator().next();
- Map<Binary, DeliveryState> unsettled =
Collections.singletonMap(sampleLocalUnsettled,
-
localUnsettled.get(sampleLocalUnsettled));
+ Map<Binary, DeliveryState> unsettled =
Map.of(sampleLocalUnsettled, localUnsettled.get(sampleLocalUnsettled));
final Response<?> latestResponse =
interaction.attachHandle(linkHandle2)
.attachUnsettled(unsettled)
.attachIncompleteUnsettled(true)
@@ -389,8 +388,7 @@ public class ResumeDeliveriesTest extends
BrokerAdminUsingTestBase
// 4. resume the link
final Binary sampleLocalUnsettled =
localUnsettled.keySet().iterator().next();
- Map<Binary, DeliveryState> unsettled =
Collections.singletonMap(sampleLocalUnsettled,
-
localUnsettled.get(sampleLocalUnsettled));
+ Map<Binary, DeliveryState> unsettled =
Map.of(sampleLocalUnsettled, localUnsettled.get(sampleLocalUnsettled));
final UnsignedInteger linkHandle2 = UnsignedInteger.ONE;
Response<?> latestResponse = interaction.attachHandle(linkHandle2)
.attachUnsettled(unsettled)
@@ -534,7 +532,7 @@ public class ResumeDeliveriesTest extends
BrokerAdminUsingTestBase
Detach detach =
interaction.detach().consumeResponse().getLatestResponse(Detach.class);
assertThat(detach.getClosed(), anyOf(nullValue(), equalTo(false)));
- interaction.attachUnsettled(Collections.singletonMap(deliveryTag,
new Accepted()))
+ interaction.attachUnsettled(Map.of(deliveryTag, new Accepted()))
.attach()
.consumeResponse(Attach.class);
@@ -707,7 +705,7 @@ public class ResumeDeliveriesTest extends
BrokerAdminUsingTestBase
final Map<Binary, DeliveryState> remoteUnsettled =
responseAttach2.getUnsettled();
assertThat(remoteUnsettled, is(notNullValue()));
- assertThat(remoteUnsettled.keySet(),
is(equalTo(Collections.singleton(deliveryTag))));
+ assertThat(remoteUnsettled.keySet(),
is(equalTo(Set.of(deliveryTag))));
interaction.transferHandle(linkHandle2)
.transferResume(true)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
