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 e8f7a0b623 QPID-8653: [Broker-J] Code cleanup: collection type
arguments, collection factory methods, lambdas (#196)
e8f7a0b623 is described below
commit e8f7a0b623e19dc73ec0ea99cae1606087ee09af
Author: Daniil Kirilyuk <[email protected]>
AuthorDate: Mon Aug 7 09:57:12 2023 +0200
QPID-8653: [Broker-J] Code cleanup: collection type arguments, collection
factory methods, lambdas (#196)
---
.../org/apache/qpid/tests/protocol/v0_10/Disassembler.java | 8 +-------
.../org/apache/qpid/tests/protocol/v0_10/FrameEncoder.java | 2 --
.../org/apache/qpid/tests/protocol/v0_10/Interaction.java | 4 +---
.../apache/qpid/tests/protocol/v0_10/SessionInteraction.java | 1 -
.../org/apache/qpid/tests/protocol/v0_10/ExchangeTest.java | 7 +++----
.../java/org/apache/qpid/tests/protocol/v0_10/QueueTest.java | 1 -
.../extensions/authtimeout/AuthenticationTimeoutTest.java | 2 --
.../protocol/v0_10/extensions/exchange/ExchangeTest.java | 6 +++---
.../tests/protocol/v0_10/extensions/queue/QueueTest.java | 12 ++++++------
9 files changed, 14 insertions(+), 29 deletions(-)
diff --git
a/systests/protocol-tests-amqp-0-10/src/main/java/org/apache/qpid/tests/protocol/v0_10/Disassembler.java
b/systests/protocol-tests-amqp-0-10/src/main/java/org/apache/qpid/tests/protocol/v0_10/Disassembler.java
index f5de466433..47077eb580 100644
---
a/systests/protocol-tests-amqp-0-10/src/main/java/org/apache/qpid/tests/protocol/v0_10/Disassembler.java
+++
b/systests/protocol-tests-amqp-0-10/src/main/java/org/apache/qpid/tests/protocol/v0_10/Disassembler.java
@@ -56,13 +56,7 @@ public final class Disassembler implements
ProtocolEventSender, ProtocolDelegate
private final ByteBufferSender _sender;
private final Object _sendlock = new Object();
private volatile int _maxPayload;
- private final static ThreadLocal<BBEncoder> _encoder = new
ThreadLocal<BBEncoder>()
- {
- public BBEncoder initialValue()
- {
- return new BBEncoder(4 * 1024);
- }
- };
+ private final static ThreadLocal<BBEncoder> _encoder =
ThreadLocal.withInitial(() -> new BBEncoder(4 * 1024));
public Disassembler(ByteBufferSender sender, int maxFrame)
{
diff --git
a/systests/protocol-tests-amqp-0-10/src/main/java/org/apache/qpid/tests/protocol/v0_10/FrameEncoder.java
b/systests/protocol-tests-amqp-0-10/src/main/java/org/apache/qpid/tests/protocol/v0_10/FrameEncoder.java
index dfec4f451e..cc49a13e28 100644
---
a/systests/protocol-tests-amqp-0-10/src/main/java/org/apache/qpid/tests/protocol/v0_10/FrameEncoder.java
+++
b/systests/protocol-tests-amqp-0-10/src/main/java/org/apache/qpid/tests/protocol/v0_10/FrameEncoder.java
@@ -26,8 +26,6 @@ import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
-import org.apache.qpid.server.protocol.v0_10.transport.BBEncoder;
-import org.apache.qpid.server.protocol.v0_10.transport.Method;
import org.apache.qpid.server.protocol.v0_10.transport.ProtocolEvent;
import org.apache.qpid.server.transport.ByteBufferSender;
import org.apache.qpid.tests.protocol.OutputEncoder;
diff --git
a/systests/protocol-tests-amqp-0-10/src/main/java/org/apache/qpid/tests/protocol/v0_10/Interaction.java
b/systests/protocol-tests-amqp-0-10/src/main/java/org/apache/qpid/tests/protocol/v0_10/Interaction.java
index 7b335acaee..10f5b31acb 100644
---
a/systests/protocol-tests-amqp-0-10/src/main/java/org/apache/qpid/tests/protocol/v0_10/Interaction.java
+++
b/systests/protocol-tests-amqp-0-10/src/main/java/org/apache/qpid/tests/protocol/v0_10/Interaction.java
@@ -23,7 +23,6 @@ package org.apache.qpid.tests.protocol.v0_10;
import static java.nio.charset.StandardCharsets.UTF_8;
import java.nio.ByteBuffer;
-import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
@@ -179,8 +178,7 @@ public class Interaction extends
AbstractInteraction<Interaction>
{
final ConnectionStart start =
this.negotiateProtocol().consumeResponse()
.consumeResponse().getLatestResponse(ConnectionStart.class);
- final List<Object> supportedMechanisms =
- start.getMechanisms() == null ? Collections.emptyList() :
start.getMechanisms();
+ final List<Object> supportedMechanisms = start.getMechanisms() ==
null ? List.of() : start.getMechanisms();
if (supportedMechanisms.stream().noneMatch(m ->
String.valueOf(m).equalsIgnoreCase(ConnectionInteraction.SASL_MECHANISM_PLAIN)))
{
diff --git
a/systests/protocol-tests-amqp-0-10/src/main/java/org/apache/qpid/tests/protocol/v0_10/SessionInteraction.java
b/systests/protocol-tests-amqp-0-10/src/main/java/org/apache/qpid/tests/protocol/v0_10/SessionInteraction.java
index 2909126901..498b5125d7 100644
---
a/systests/protocol-tests-amqp-0-10/src/main/java/org/apache/qpid/tests/protocol/v0_10/SessionInteraction.java
+++
b/systests/protocol-tests-amqp-0-10/src/main/java/org/apache/qpid/tests/protocol/v0_10/SessionInteraction.java
@@ -20,7 +20,6 @@
*/
package org.apache.qpid.tests.protocol.v0_10;
-import org.apache.qpid.server.protocol.v0_10.transport.Method;
import org.apache.qpid.server.protocol.v0_10.transport.SessionAttach;
import org.apache.qpid.server.protocol.v0_10.transport.SessionCommandPoint;
import org.apache.qpid.server.protocol.v0_10.transport.SessionDetach;
diff --git
a/systests/protocol-tests-amqp-0-10/src/test/java/org/apache/qpid/tests/protocol/v0_10/ExchangeTest.java
b/systests/protocol-tests-amqp-0-10/src/test/java/org/apache/qpid/tests/protocol/v0_10/ExchangeTest.java
index ec878ef925..22c84beeff 100644
---
a/systests/protocol-tests-amqp-0-10/src/test/java/org/apache/qpid/tests/protocol/v0_10/ExchangeTest.java
+++
b/systests/protocol-tests-amqp-0-10/src/test/java/org/apache/qpid/tests/protocol/v0_10/ExchangeTest.java
@@ -28,7 +28,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;
@@ -493,7 +493,7 @@ public class ExchangeTest extends BrokerAdminUsingTestBase
.bindExchange("amq.direct")
.bindQueue(BrokerAdmin.TEST_QUEUE_NAME)
.bindBindingKey("bk")
-
.bindArguments(Collections.singletonMap(JMS_SELECTOR.name(), "name='a'"))
+ .bindArguments(Map.of(JMS_SELECTOR.name(), "name='a'"))
.bind()
.session()
.flushCompleted()
@@ -505,8 +505,7 @@ public class ExchangeTest extends BrokerAdminUsingTestBase
.boundExchange("amq.direct")
.boundQueue(BrokerAdmin.TEST_QUEUE_NAME)
.boundBindingKey("bk")
-
.boundArguments(Collections.singletonMap(JMS_SELECTOR.name(),
-
"name='a'"))
+
.boundArguments(Map.of(JMS_SELECTOR.name(), "name='a'"))
.bound()
.session()
.flushCompleted()
diff --git
a/systests/protocol-tests-amqp-0-10/src/test/java/org/apache/qpid/tests/protocol/v0_10/QueueTest.java
b/systests/protocol-tests-amqp-0-10/src/test/java/org/apache/qpid/tests/protocol/v0_10/QueueTest.java
index 0357af3498..1722d22a6c 100644
---
a/systests/protocol-tests-amqp-0-10/src/test/java/org/apache/qpid/tests/protocol/v0_10/QueueTest.java
+++
b/systests/protocol-tests-amqp-0-10/src/test/java/org/apache/qpid/tests/protocol/v0_10/QueueTest.java
@@ -27,7 +27,6 @@ import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assumptions.assumeTrue;
-import org.hamcrest.Matchers;
import org.junit.jupiter.api.Test;
import org.apache.qpid.server.protocol.v0_10.transport.ExecutionErrorCode;
diff --git
a/systests/protocol-tests-amqp-0-10/src/test/java/org/apache/qpid/tests/protocol/v0_10/extensions/authtimeout/AuthenticationTimeoutTest.java
b/systests/protocol-tests-amqp-0-10/src/test/java/org/apache/qpid/tests/protocol/v0_10/extensions/authtimeout/AuthenticationTimeoutTest.java
index c14454a3c7..3298110c52 100644
---
a/systests/protocol-tests-amqp-0-10/src/test/java/org/apache/qpid/tests/protocol/v0_10/extensions/authtimeout/AuthenticationTimeoutTest.java
+++
b/systests/protocol-tests-amqp-0-10/src/test/java/org/apache/qpid/tests/protocol/v0_10/extensions/authtimeout/AuthenticationTimeoutTest.java
@@ -19,9 +19,7 @@
*/
package org.apache.qpid.tests.protocol.v0_10.extensions.authtimeout;
-import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.hasItem;
-import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assumptions.assumeTrue;
diff --git
a/systests/protocol-tests-amqp-0-10/src/test/java/org/apache/qpid/tests/protocol/v0_10/extensions/exchange/ExchangeTest.java
b/systests/protocol-tests-amqp-0-10/src/test/java/org/apache/qpid/tests/protocol/v0_10/extensions/exchange/ExchangeTest.java
index 0f545a0090..0c7973d01f 100644
---
a/systests/protocol-tests-amqp-0-10/src/test/java/org/apache/qpid/tests/protocol/v0_10/extensions/exchange/ExchangeTest.java
+++
b/systests/protocol-tests-amqp-0-10/src/test/java/org/apache/qpid/tests/protocol/v0_10/extensions/exchange/ExchangeTest.java
@@ -26,7 +26,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 ExchangeTest extends BrokerAdminUsingTestBase
.attachSession(SESSION_NAME)
.exchange()
.declareExchange("test")
-
.declareArguments(Collections.singletonMap("unroutableMessageBehaviour",
"REJECT"))
+
.declareArguments(Map.of("unroutableMessageBehaviour", "REJECT"))
.declareType(ExchangeDefaults.DIRECT_EXCHANGE_CLASS)
.declareId(0)
.declare()
@@ -83,7 +83,7 @@ public class ExchangeTest extends BrokerAdminUsingTestBase
.declareExchange("test")
.declareType(ExchangeDefaults.DIRECT_EXCHANGE_CLASS)
.declareId(0)
- .declareArguments(Collections.singletonMap("foo",
"bar"))
+ .declareArguments(Map.of("foo", "bar"))
.declare()
.session()
.flushCompleted()
diff --git
a/systests/protocol-tests-amqp-0-10/src/test/java/org/apache/qpid/tests/protocol/v0_10/extensions/queue/QueueTest.java
b/systests/protocol-tests-amqp-0-10/src/test/java/org/apache/qpid/tests/protocol/v0_10/extensions/queue/QueueTest.java
index 45edc0afde..d200a79174 100644
---
a/systests/protocol-tests-amqp-0-10/src/test/java/org/apache/qpid/tests/protocol/v0_10/extensions/queue/QueueTest.java
+++
b/systests/protocol-tests-amqp-0-10/src/test/java/org/apache/qpid/tests/protocol/v0_10/extensions/queue/QueueTest.java
@@ -27,7 +27,7 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import java.nio.charset.StandardCharsets;
-import java.util.Collections;
+import java.util.Map;
import org.junit.jupiter.api.Test;
@@ -62,8 +62,8 @@ public class QueueTest extends BrokerAdminUsingTestBase
.attachSession(SESSION_NAME)
.queue()
.declareQueue(BrokerAdmin.TEST_QUEUE_NAME)
-
.declareArguments(Collections.singletonMap("defaultFilters",
-
"{\"selector\":{\"x-filter-jms-selector\":[\"id=2\"]}}"))
+
.declareArguments(Map.of("defaultFilters",
+
"{\"selector\":{\"x-filter-jms-selector\":[\"id=2\"]}}"))
.declareId(0)
.declare()
.session()
@@ -76,7 +76,7 @@ public class QueueTest extends BrokerAdminUsingTestBase
assertThat(getBrokerAdmin().getQueueDepthMessages(BrokerAdmin.TEST_QUEUE_NAME),
is(equalTo(0)));
MessageProperties messageProperties1 = new MessageProperties();
-
messageProperties1.setApplicationHeaders(Collections.singletonMap("id", 1));
+ messageProperties1.setApplicationHeaders(Map.of("id", 1));
interaction.message()
.transferDestination(BrokerAdmin.TEST_QUEUE_NAME)
@@ -90,7 +90,7 @@ public class QueueTest extends BrokerAdminUsingTestBase
.consumeResponse();
MessageProperties messageProperties2 = new MessageProperties();
-
messageProperties2.setApplicationHeaders(Collections.singletonMap("id", 2));
+ messageProperties2.setApplicationHeaders(Map.of("id", 2));
final String body2 = "Message 2 Content";
interaction.message()
.transferDestination(BrokerAdmin.TEST_QUEUE_NAME)
@@ -148,7 +148,7 @@ public class QueueTest extends BrokerAdminUsingTestBase
.attachSession(SESSION_NAME)
.queue()
.declareQueue(BrokerAdmin.TEST_QUEUE_NAME)
- .declareArguments(Collections.singletonMap("foo",
"bar"))
+ .declareArguments(Map.of("foo", "bar"))
.declareId(0)
.declare()
.session()
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
