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 9fb7cae60e QPID-8653: [Broker-J] Code cleanup: collection type
arguments, collection factory methods, lambdas (#200)
9fb7cae60e is described below
commit 9fb7cae60e9648ff9cc8c50ad8194e466febf661
Author: Daniil Kirilyuk <[email protected]>
AuthorDate: Mon Aug 7 10:01:41 2023 +0200
QPID-8653: [Broker-J] Code cleanup: collection type arguments, collection
factory methods, lambdas (#200)
---
.../PreemptiveAuthenticationTest.java | 23 ++++++-------
.../http/compression/CompressedResponsesTest.java | 4 +--
.../endtoend/logging/VirtualHostLoggerTest.java | 7 ++--
.../endtoend/message/ExportImportMessagesTest.java | 5 ++-
.../endtoend/message/MessageManagementTest.java | 15 ++++----
.../tests/http/endtoend/message/MessageTest.java | 34 +++++++-----------
.../http/endtoend/message/TimeToLiveTest.java | 6 ++--
.../tests/http/endtoend/port/HttpPortTest.java | 4 +--
.../qpid/tests/http/endtoend/port/PortTest.java | 4 +--
.../endtoend/state/VirtualHostRecoveryTest.java | 3 +-
.../statistics/StatisticsReportingTest.java | 34 +++++++++---------
.../{SpiltStoreTest.java => SplitStoreTest.java} | 5 ++-
.../qpid/tests/http/rest/model/CreateTest.java | 23 ++++++-------
.../qpid/tests/http/rest/model/OperationTest.java | 15 ++++----
.../qpid/tests/http/rest/model/ReadTest.java | 14 +++-----
.../qpid/tests/http/rest/model/UpdateTest.java | 11 +++---
.../qpid/tests/http/service/StructureTest.java | 3 +-
.../http/userprefs/UserPreferencesRestTest.java | 40 +++++++++-------------
.../apache/qpid/tests/http/v6_1/BindingTest.java | 10 +++---
.../qpid/tests/http/v8_0/LegacyManagementTest.java | 10 +++---
20 files changed, 116 insertions(+), 154 deletions(-)
diff --git
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/authentication/PreemptiveAuthenticationTest.java
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/authentication/PreemptiveAuthenticationTest.java
index 5ff8bcce57..eb76e62e96 100644
---
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/authentication/PreemptiveAuthenticationTest.java
+++
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/authentication/PreemptiveAuthenticationTest.java
@@ -37,10 +37,11 @@ import java.net.InetAddress;
import java.security.KeyStore;
import java.util.ArrayDeque;
import java.util.Base64;
-import java.util.Collections;
import java.util.Deque;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
+import java.util.Set;
import jakarta.servlet.http.HttpServletResponse;
@@ -209,16 +210,13 @@ public class PreemptiveAuthenticationTest extends
HttpTestBase
helper.setTls(tls);
assertThat(helper.submitRequest("broker", "GET"),
is(equalTo(SC_OK)));
- configHelper.submitRequest("plugin/httpManagement", "POST",
- Collections.<String,
Object>singletonMap(authEnabledAttrName, Boolean.FALSE), SC_OK);
+ configHelper.submitRequest("plugin/httpManagement", "POST",
Map.of(authEnabledAttrName, Boolean.FALSE), SC_OK);
assertThat(helper.submitRequest("broker", "GET"),
is(equalTo(SC_UNAUTHORIZED)));
}
finally
{
- configHelper.submitRequest("plugin/httpManagement", "POST",
- Collections.<String,
Object>singletonMap(authEnabledAttrName, Boolean.TRUE), SC_OK);
-
+ configHelper.submitRequest("plugin/httpManagement", "POST",
Map.of(authEnabledAttrName, Boolean.TRUE), SC_OK);
}
}
@@ -252,7 +250,8 @@ public class PreemptiveAuthenticationTest extends
HttpTestBase
final Map<String, Object> truststoreAttr = new HashMap<>();
truststoreAttr.put(ManagedPeerCertificateTrustStore.TYPE,
ManagedPeerCertificateTrustStore.TYPE_NAME);
-
truststoreAttr.put(ManagedPeerCertificateTrustStore.STORED_CERTIFICATES,
Collections.singletonList(Base64.getEncoder().encodeToString(clientCertificate)));
+
truststoreAttr.put(ManagedPeerCertificateTrustStore.STORED_CERTIFICATES,
+
List.of(Base64.getEncoder().encodeToString(clientCertificate)));
getHelper().submitRequest("truststore/mytruststore","PUT",
truststoreAttr, SC_CREATED);
@@ -262,11 +261,11 @@ public class PreemptiveAuthenticationTest extends
HttpTestBase
portAttr.put(Port.TYPE, "HTTP");
portAttr.put(Port.PORT, 0);
portAttr.put(Port.AUTHENTICATION_PROVIDER, "myexternal");
- portAttr.put(Port.PROTOCOLS, Collections.singleton(Protocol.HTTP));
- portAttr.put(Port.TRANSPORTS, Collections.singleton(Transport.SSL));
+ portAttr.put(Port.PROTOCOLS, Set.of(Protocol.HTTP));
+ portAttr.put(Port.TRANSPORTS, Set.of(Transport.SSL));
portAttr.put(Port.NEED_CLIENT_AUTH, true);
portAttr.put(Port.KEY_STORE, "mykeystore");
- portAttr.put(Port.TRUST_STORES,
Collections.singletonList("mytruststore"));
+ portAttr.put(Port.TRUST_STORES, List.of("mytruststore"));
getHelper().submitRequest("port/myport","PUT", portAttr, SC_CREATED);
deleteActions.add(object -> getHelper().submitRequest("port/myport",
"DELETE", SC_OK));
@@ -299,8 +298,8 @@ public class PreemptiveAuthenticationTest extends
HttpTestBase
portAttr.put(Port.TYPE, "HTTP");
portAttr.put(Port.PORT, 0);
portAttr.put(Port.AUTHENTICATION_PROVIDER, "myanon");
- portAttr.put(Port.PROTOCOLS, Collections.singleton(Protocol.HTTP));
- portAttr.put(Port.TRANSPORTS, Collections.singleton(Transport.TCP));
+ portAttr.put(Port.PROTOCOLS, Set.of(Protocol.HTTP));
+ portAttr.put(Port.TRANSPORTS, Set.of(Transport.TCP));
getHelper().submitRequest("port/myport","PUT", portAttr, SC_CREATED);
deleteActions.add(object -> getHelper().submitRequest("port/myport",
"DELETE", SC_OK));
diff --git
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/compression/CompressedResponsesTest.java
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/compression/CompressedResponsesTest.java
index 76424a8250..ba5f3232bf 100644
---
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/compression/CompressedResponsesTest.java
+++
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/compression/CompressedResponsesTest.java
@@ -28,8 +28,8 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.net.HttpURLConnection;
-import java.util.Collections;
import java.util.LinkedHashMap;
+import java.util.Map;
import java.util.zip.GZIPInputStream;
import com.fasterxml.jackson.core.JsonParseException;
@@ -74,7 +74,7 @@ public class CompressedResponsesTest extends HttpTestBase
{
final boolean expectCompression = allowCompression && acceptCompressed;
- getHelper().submitRequest("plugin/httpManagement", "POST",
Collections.singletonMap("compressResponses", expectCompression), SC_OK);
+ getHelper().submitRequest("plugin/httpManagement", "POST",
Map.of("compressResponses", expectCompression), SC_OK);
HttpURLConnection conn =
getHelper().openManagementConnection("/service/metadata", "GET");
diff --git
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/logging/VirtualHostLoggerTest.java
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/logging/VirtualHostLoggerTest.java
index 2b40c69c29..5e91929b55 100644
---
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/logging/VirtualHostLoggerTest.java
+++
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/logging/VirtualHostLoggerTest.java
@@ -31,7 +31,6 @@ import static org.junit.jupiter.api.Assumptions.assumeTrue;
import java.io.File;
import java.io.InputStreamReader;
import java.net.HttpURLConnection;
-import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -108,7 +107,7 @@ public class VirtualHostLoggerTest extends HttpTestBase
final int queueCreateMatchesBefore = countLogFileMatches(downloadUrl,
"QUE-1001");
assertThat("Unexpected queue matches before queue creation",
queueCreateMatchesBefore, is(equalTo(0)));
- getHelper().submitRequest("queue/myqueue", "PUT",
Collections.emptyMap(), SC_CREATED);
+ getHelper().submitRequest("queue/myqueue", "PUT", Map.of(),
SC_CREATED);
final int queueCreateMatchesAfter = countLogFileMatches(downloadUrl,
"QUE-1001");
assertThat("Unexpected queue matches before queue creation",
queueCreateMatchesAfter, is(equalTo(1)));
@@ -116,7 +115,7 @@ public class VirtualHostLoggerTest extends HttpTestBase
ruleAttributes.put("level", "OFF");
getHelper().submitRequest(loggerRuleUrl, "PUT", ruleAttributes, SC_OK);
- getHelper().submitRequest("queue/myqueue2", "PUT",
Collections.emptyMap(), SC_CREATED);
+ getHelper().submitRequest("queue/myqueue2", "PUT", Map.of(),
SC_CREATED);
final int afterLevelChange = countLogFileMatches(downloadUrl,
"QUE-1001");
assertThat("Unexpected queue matches after level change",
afterLevelChange, is(equalTo(queueCreateMatchesAfter)));
@@ -124,7 +123,7 @@ public class VirtualHostLoggerTest extends HttpTestBase
ruleAttributes.put("level", "INFO");
getHelper().submitRequest(loggerRuleUrl, "PUT", ruleAttributes, SC_OK);
- getHelper().submitRequest("queue/myqueue3", "PUT",
Collections.emptyMap(), SC_CREATED);
+ getHelper().submitRequest("queue/myqueue3", "PUT", Map.of(),
SC_CREATED);
final int afterSecondLevelChange = countLogFileMatches(downloadUrl,
"QUE-1001");
assertThat("Unexpected queue matches after level change",
afterSecondLevelChange, is(equalTo(afterLevelChange + 1)));
diff --git
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/ExportImportMessagesTest.java
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/ExportImportMessagesTest.java
index 4567e7c9d5..9ff71994b6 100644
---
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/ExportImportMessagesTest.java
+++
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/ExportImportMessagesTest.java
@@ -26,7 +26,6 @@ import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assumptions.assumeTrue;
-import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -79,7 +78,7 @@ public class ExportImportMessagesTest extends HttpTestBase
changeVirtualHostState("STOPPED");
- Map<String, Object> importArgs = Collections.singletonMap("source",
extractedBytesAsDataUrl);
+ Map<String, Object> importArgs = Map.of("source",
extractedBytesAsDataUrl);
getHelper().postJson("virtualhost/importMessageStore", importArgs, new
TypeReference<Void>() {}, SC_OK);
changeVirtualHostState("ACTIVE");
@@ -88,7 +87,7 @@ public class ExportImportMessagesTest extends HttpTestBase
private void changeVirtualHostState(final String desiredState) throws
Exception
{
- Map<String, Object> attributes =
Collections.singletonMap(VirtualHost.DESIRED_STATE, desiredState);
+ Map<String, Object> attributes = Map.of(VirtualHost.DESIRED_STATE,
desiredState);
getHelper().submitRequest("virtualhost", "POST", attributes, SC_OK);
}
diff --git
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/MessageManagementTest.java
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/MessageManagementTest.java
index 1ead217a6d..96ebd14fef 100644
---
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/MessageManagementTest.java
+++
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/MessageManagementTest.java
@@ -31,7 +31,6 @@ import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.MatcherAssert.assertThat;
import java.io.IOException;
-import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -70,8 +69,8 @@ public class MessageManagementTest extends HttpTestBase
getHelper().createKeyStoreAndSetItOnPort(getFullTestName());
- final Map<String, Object> odd = Collections.singletonMap(INDEX, 1);
- final Map<String, Object> even = Collections.singletonMap(INDEX, 0);
+ final Map<String, Object> odd = Map.of(INDEX, 1);
+ final Map<String, Object> even = Map.of(INDEX, 0);
_messageIds =
Stream.generate(UUID::randomUUID).map(UUID::toString).limit(4).collect(Collectors.toSet());
@@ -177,7 +176,7 @@ public class MessageManagementTest extends HttpTestBase
{
final Set<Long> ids = new HashSet<>(getMesssageIds(SOURCE_QUEUE_NAME));
Iterator<Long> iterator = ids.iterator();
- Set<Long> toDelete = Collections.singleton(iterator.next());
+ Set<Long> toDelete = Set.of(iterator.next());
iterator.remove();
Map<String, Object> parameters = new HashMap<>();
@@ -214,7 +213,7 @@ public class MessageManagementTest extends HttpTestBase
public void testClearQueue() throws Exception
{
getHelper().submitRequest(String.format("queue/%s/clearQueue",
SOURCE_QUEUE_NAME), "POST",
- Collections.emptyMap(),
HttpServletResponse.SC_OK);
+ Map.of(), HttpServletResponse.SC_OK);
assertThat(getBrokerAdmin().getQueueDepthMessages(SOURCE_QUEUE_NAME),
is(equalTo(0)));
}
@@ -343,7 +342,7 @@ public class MessageManagementTest extends HttpTestBase
getHelper().submitRequest("virtualhost/publishMessage",
"POST",
- Collections.singletonMap("message",
messageBody),
+ Map.of("message", messageBody),
SC_OK);
}
@@ -352,12 +351,12 @@ public class MessageManagementTest extends HttpTestBase
final Map<String, Object> messageBody = new HashMap<>();
messageBody.put("address", queueName);
messageBody.put("messageId", messageId);
- messageBody.put("headers", Collections.singletonMap("id", messageId));
+ messageBody.put("headers", Map.of("id", messageId));
messageBody.put("priority", priority);
getHelper().submitRequest("virtualhost/publishMessage",
"POST",
- Collections.singletonMap("message",
messageBody),
+ Map.of("message", messageBody),
SC_OK);
}
diff --git
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/MessageTest.java
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/MessageTest.java
index fddf04391a..5672b73385 100644
---
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/MessageTest.java
+++
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/MessageTest.java
@@ -33,7 +33,6 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assumptions.assumeTrue;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.List;
@@ -55,7 +54,6 @@ import javax.jms.StreamMessage;
import javax.jms.TextMessage;
import com.fasterxml.jackson.core.type.TypeReference;
-import com.google.common.base.Strings;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -106,8 +104,7 @@ public class MessageTest extends HttpTestBase
}
List<Map<String, Object>> messages =
getHelper().postJson("queue/myqueue/getMessageInfo",
-
Collections.singletonMap("includeHeaders",
-
Boolean.TRUE),
+
Map.of("includeHeaders", Boolean.TRUE),
LIST_MAP_TYPE_REF, SC_OK);
assertThat(messages.size(), is(equalTo(1)));
@@ -137,8 +134,7 @@ public class MessageTest extends HttpTestBase
}
List<Map<String, Object>> messages =
getHelper().postJson("queue/myqueue/getMessageInfo",
-
Collections.singletonMap("includeHeaders",
-
Boolean.FALSE),
+
Map.of("includeHeaders", Boolean.FALSE),
LIST_MAP_TYPE_REF, SC_OK);
assertThat(messages.size(), is(equalTo(1)));
@@ -163,8 +159,7 @@ public class MessageTest extends HttpTestBase
producer.send(jmsMessage);
List<Map<String, Object>> messages =
getHelper().postJson("queue/myqueue/getMessageInfo",
-
Collections.singletonMap("includeHeaders",
-
Boolean.FALSE),
+
Map.of("includeHeaders", Boolean.FALSE),
LIST_MAP_TYPE_REF, SC_OK);
assertThat(messages.size(), is(equalTo(1)));
Map<String, Object> message = messages.get(0);
@@ -175,10 +170,8 @@ public class MessageTest extends HttpTestBase
jmsMessage = consumer.receive(getReceiveTimeout());
assertThat(jmsMessage, is(notNullValue()));
- messages = getHelper().postJson("queue/myqueue/getMessageInfo",
-
Collections.singletonMap("includeHeaders",
-
Boolean.FALSE),
-
LIST_MAP_TYPE_REF, SC_OK);
+ messages = getHelper().postJson("queue/myqueue/getMessageInfo",
Map.of("includeHeaders", Boolean.FALSE),
+ LIST_MAP_TYPE_REF, SC_OK);
assertThat(messages.size(), is(equalTo(1)));
message = messages.get(0);
@@ -212,8 +205,7 @@ public class MessageTest extends HttpTestBase
}
List<Map<String, Object>> messages =
getHelper().postJson("queue/myqueue/getMessageInfo",
-
Collections.singletonMap("includeHeaders",
-
Boolean.TRUE),
+
Map.of("includeHeaders", Boolean.TRUE),
LIST_MAP_TYPE_REF, SC_OK);
assertThat(messages.size(), is(equalTo(1)));
Map<String, Object> message = messages.get(0);
@@ -250,8 +242,7 @@ public class MessageTest extends HttpTestBase
}
List<Map<String, Object>> messages =
getHelper().postJson("queue/myqueue/getMessageInfo",
-
Collections.singletonMap("includeHeaders",
-
Boolean.TRUE),
+
Map.of("includeHeaders", Boolean.TRUE),
LIST_MAP_TYPE_REF, SC_OK);
assertThat(messages.size(), is(equalTo(1)));
Map<String, Object> message = messages.get(0);
@@ -291,8 +282,7 @@ public class MessageTest extends HttpTestBase
}
List<Map<String, Object>> messages =
getHelper().postJson("queue/myqueue/getMessageInfo",
-
Collections.singletonMap("includeHeaders",
-
Boolean.TRUE),
+
Map.of("includeHeaders", Boolean.TRUE),
LIST_MAP_TYPE_REF, SC_OK);
assertThat(messages.size(), is(equalTo(1)));
Map<String, Object> message = messages.get(0);
@@ -314,7 +304,7 @@ public class MessageTest extends HttpTestBase
getHelper().submitRequest("virtualhost/publishMessage",
"POST",
- Collections.singletonMap("message",
messageBody),
+ Map.of("message", messageBody),
SC_OK);
Connection connection = getConnection();
@@ -351,7 +341,7 @@ public class MessageTest extends HttpTestBase
getHelper().submitRequest("virtualhost/publishMessage",
"POST",
- Collections.singletonMap("message",
messageBody),
+ Map.of("message", messageBody),
SC_OK);
Connection connection = getConnection();
@@ -387,7 +377,7 @@ public class MessageTest extends HttpTestBase
getHelper().submitRequest("virtualhost/publishMessage",
"POST",
- Collections.singletonMap("message",
messageBody),
+ Map.of("message", messageBody),
SC_OK);
Connection connection = getConnection();
@@ -460,7 +450,7 @@ public class MessageTest extends HttpTestBase
getHelper().submitRequest("virtualhost/publishMessage",
"POST",
- Collections.singletonMap("message",
messageBody),
+ Map.of("message", messageBody),
SC_OK);
Connection connection = getConnection();
diff --git
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/TimeToLiveTest.java
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/TimeToLiveTest.java
index 83d8a4eaa6..ac74ee8888 100644
---
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/TimeToLiveTest.java
+++
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/TimeToLiveTest.java
@@ -27,7 +27,7 @@ import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.MatcherAssert.assertThat;
-import java.util.Collections;
+import java.util.Map;
import javax.jms.Connection;
import javax.jms.DeliveryMode;
@@ -87,14 +87,14 @@ public class TimeToLiveTest extends HttpTestBase
getHelper().submitRequest(String.format("queue/%s", QUEUE_NAME),
"POST",
-
Collections.singletonMap("maximumMessageTtl", 1),
+ Map.of("maximumMessageTtl", 1),
SC_OK);
Thread.sleep(HOUSE_KEEPING_CHECK_PERIOD * 2);
getHelper().submitRequest(String.format("queue/%s", QUEUE_NAME),
"POST",
-
Collections.singletonMap("maximumMessageTtl", 0),
+ Map.of("maximumMessageTtl", 0),
SC_OK);
Connection connection2 = getConnection();
diff --git
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/port/HttpPortTest.java
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/port/HttpPortTest.java
index 106e11baf5..b81676856d 100644
---
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/port/HttpPortTest.java
+++
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/port/HttpPortTest.java
@@ -28,7 +28,6 @@ import static org.junit.jupiter.api.Assertions.fail;
import java.io.IOException;
import java.net.ConnectException;
-import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -109,8 +108,7 @@ public class HttpPortTest extends HttpTestBase
private void createAnonymousAuthenticationProvider(final String
providerName) throws IOException
{
- Map<String, Object> data =
Collections.singletonMap(ConfiguredObject.TYPE,
-
AnonymousAuthenticationManager.PROVIDER_TYPE);
+ Map<String, Object> data = Map.of(ConfiguredObject.TYPE,
AnonymousAuthenticationManager.PROVIDER_TYPE);
getHelper().submitRequest("authenticationprovider/" + providerName,
"PUT",
data,
diff --git
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/port/PortTest.java
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/port/PortTest.java
index 2a721e76ac..e9a4ae8a83 100644
---
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/port/PortTest.java
+++
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/port/PortTest.java
@@ -36,7 +36,6 @@ import java.io.File;
import java.io.IOException;
import java.nio.file.Path;
import java.security.cert.X509Certificate;
-import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
@@ -233,8 +232,7 @@ public class PortTest extends HttpTestBase
private void createAnonymousAuthenticationProvider() throws IOException
{
- final Map<String, Object> data =
Collections.singletonMap(ConfiguredObject.TYPE,
-
AnonymousAuthenticationManager.PROVIDER_TYPE);
+ final Map<String, Object> data = Map.of(ConfiguredObject.TYPE,
AnonymousAuthenticationManager.PROVIDER_TYPE);
getHelper().submitRequest("authenticationprovider/" +
_authenticationProvider, "PUT", data, SC_CREATED);
}
diff --git
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/state/VirtualHostRecoveryTest.java
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/state/VirtualHostRecoveryTest.java
index a9c3b460dc..44f1d5a9b7 100644
---
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/state/VirtualHostRecoveryTest.java
+++
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/state/VirtualHostRecoveryTest.java
@@ -26,7 +26,6 @@ import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assumptions.assumeTrue;
-import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -126,7 +125,7 @@ public class VirtualHostRecoveryTest extends HttpTestBase
private void changeState(final String url, final String desiredState)
throws Exception
{
- Map<String, Object> attributes =
Collections.singletonMap(ConfiguredObject.DESIRED_STATE, desiredState);
+ Map<String, Object> attributes =
Map.of(ConfiguredObject.DESIRED_STATE, desiredState);
getHelper().submitRequest(url, "POST", attributes, SC_OK);
}
diff --git
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/statistics/StatisticsReportingTest.java
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/statistics/StatisticsReportingTest.java
index 9113040662..1355526ca7 100644
---
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/statistics/StatisticsReportingTest.java
+++
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/statistics/StatisticsReportingTest.java
@@ -19,7 +19,6 @@
*/
package org.apache.qpid.tests.http.endtoend.statistics;
-import static java.util.Collections.singletonMap;
import static jakarta.servlet.http.HttpServletResponse.SC_CREATED;
import static jakarta.servlet.http.HttpServletResponse.SC_OK;
import static org.hamcrest.CoreMatchers.is;
@@ -30,7 +29,6 @@ import static org.hamcrest.MatcherAssert.assertThat;
import java.io.File;
import java.io.InputStreamReader;
import java.net.HttpURLConnection;
-import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -77,10 +75,10 @@ public class StatisticsReportingTest extends HttpTestBase
// Enable Virtual Host Statistics Reporting
final Map<String, Object> arguments = new HashMap<>();
arguments.put(QueueManagingVirtualHost.STATISTICS_REPORTING_PERIOD,
STATISTICS_REPORTING_PERIOD_IN_SEC);
- Map<String, String> context =
singletonMap("qpid.queue.statisticsReportPattern",
-
"${ancestor:virtualhost:name}/${ancestor:queue:name}: "
- +
"queueDepthMessages=${queueDepthMessages}, "
- +
"queueDepthBytes=${queueDepthBytes:byteunit}");
+ Map<String, String> context =
Map.of("qpid.queue.statisticsReportPattern",
+ "${ancestor:virtualhost:name}/${ancestor:queue:name}: " +
+ "queueDepthMessages=${queueDepthMessages}, " +
+ "queueDepthBytes=${queueDepthBytes:byteunit}");
arguments.put(ConfiguredObject.CONTEXT, context);
getHelper().submitRequest("virtualhost", "POST", arguments, SC_OK);
@@ -109,11 +107,11 @@ public class StatisticsReportingTest extends HttpTestBase
// Override the statistic report for queue2 only
- Map<String, String> queue2Context =
singletonMap("qpid.queue.statisticsReportPattern",
-
"${ancestor:virtualhost:name}/${ancestor:queue:name}: "
- +
"oldestMessageAge=${oldestMessageAge:duration}");
+ Map<String, String> queue2Context =
Map.of("qpid.queue.statisticsReportPattern",
+ "${ancestor:virtualhost:name}/${ancestor:queue:name}: " +
+ "oldestMessageAge=${oldestMessageAge:duration}");
- getHelper().submitRequest(String.format("queue/%s", QUEUE2_NAME),
"POST", singletonMap(ConfiguredObject.CONTEXT, queue2Context), SC_OK);
+ getHelper().submitRequest(String.format("queue/%s", QUEUE2_NAME),
"POST", Map.of(ConfiguredObject.CONTEXT, queue2Context), SC_OK);
assertThat("Post-enqueue queue2 statistics report not found",
countLogFileMatches(hostLogDownloadUrl,
String.format("%s/%s: oldestMessageAge=PT",
@@ -147,10 +145,10 @@ public class StatisticsReportingTest extends HttpTestBase
// Enable Virtual Host Statistics Reporting
final Map<String, Object> arguments = new HashMap<>();
arguments.put(QueueManagingVirtualHost.STATISTICS_REPORTING_PERIOD,
STATISTICS_REPORTING_PERIOD_IN_SEC);
- Map<String, String> context =
singletonMap("qpid.connection.statisticsReportPattern",
-
"${ancestor:connection:principal}: "
- +
"messagesIn=${messagesIn}, "
- +
"lastIoTime=${lastIoTime:datetime}");
+ Map<String, String> context =
Map.of("qpid.connection.statisticsReportPattern",
+ "${ancestor:connection:principal}: " +
+ "messagesIn=${messagesIn}, " +
+ "lastIoTime=${lastIoTime:datetime}");
arguments.put(ConfiguredObject.CONTEXT, context);
getHelper().submitRequest("virtualhost", "POST", arguments, SC_OK);
@@ -173,7 +171,7 @@ public class StatisticsReportingTest extends HttpTestBase
finally
{
brokerHelper.submitRequest("broker/removeContextVariable", "POST",
- singletonMap("name",
"qpid.connection.statisticsReportPattern"), SC_OK);
+ Map.of("name",
"qpid.connection.statisticsReportPattern"), SC_OK);
conn.close();
}
}
@@ -193,7 +191,7 @@ public class StatisticsReportingTest extends HttpTestBase
args1.put("value", "messagesIn=${messagesIn}");
getHelper().submitRequest("broker/setContextVariable", "POST",
args1, SC_OK);
- final Map<String, Object> attrs =
Collections.singletonMap(Broker.STATISTICS_REPORTING_PERIOD,
STATISTICS_REPORTING_PERIOD_IN_SEC);
+ final Map<String, Object> attrs =
Map.of(Broker.STATISTICS_REPORTING_PERIOD, STATISTICS_REPORTING_PERIOD_IN_SEC);
getHelper().submitRequest("broker", "POST", attrs, SC_OK);
getBrokerAdmin().createQueue(QUEUE1_NAME);
@@ -213,9 +211,9 @@ public class StatisticsReportingTest extends HttpTestBase
finally
{
getHelper().submitRequest("broker/removeContextVariable", "POST",
- singletonMap("name",
"qpid.broker.statisticsReportPattern"), SC_OK);
+ Map.of("name",
"qpid.broker.statisticsReportPattern"), SC_OK);
getHelper().submitRequest("broker/removeContextVariable", "POST",
- singletonMap("name",
Broker.STATISTICS_REPORTING_PERIOD), SC_OK);
+ Map.of("name",
Broker.STATISTICS_REPORTING_PERIOD), SC_OK);
getHelper().submitRequest("brokerlogger/statslogger", "DELETE",
SC_OK);
conn.close();
}
diff --git
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/store/SpiltStoreTest.java
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/store/SplitStoreTest.java
similarity index 96%
rename from
systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/store/SpiltStoreTest.java
rename to
systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/store/SplitStoreTest.java
index 0b24aab49b..9c09c5c3f1 100644
---
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/store/SpiltStoreTest.java
+++
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/store/SplitStoreTest.java
@@ -28,7 +28,6 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assumptions.assumeTrue;
import java.io.File;
-import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -52,7 +51,7 @@ import org.apache.qpid.tests.http.HttpRequestConfig;
import org.apache.qpid.tests.http.HttpTestBase;
@HttpRequestConfig(useVirtualHostAsHost = false)
-public class SpiltStoreTest extends HttpTestBase
+public class SplitStoreTest extends HttpTestBase
{
private static final String TEST_QUEUE = "testQueue";
@@ -130,7 +129,7 @@ public class SpiltStoreTest extends HttpTestBase
private void changeState(final String url, final String desiredState)
throws Exception
{
- Map<String, Object> attributes =
Collections.singletonMap(ConfiguredObject.DESIRED_STATE, desiredState);
+ Map<String, Object> attributes =
Map.of(ConfiguredObject.DESIRED_STATE, desiredState);
getHelper().submitRequest(url, "POST", attributes, SC_OK);
}
diff --git
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/rest/model/CreateTest.java
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/rest/model/CreateTest.java
index d62e14df16..55aab19e1c 100644
---
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/rest/model/CreateTest.java
+++
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/rest/model/CreateTest.java
@@ -31,7 +31,6 @@ import static org.hamcrest.MatcherAssert.assertThat;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
-import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -55,7 +54,7 @@ public class CreateTest extends HttpTestBase
public void create() throws Exception
{
final String queueUrl = "queue/myqueue";
- getHelper().submitRequest(queueUrl, "PUT", Collections.emptyMap(),
SC_CREATED);
+ getHelper().submitRequest(queueUrl, "PUT", Map.of(), SC_CREATED);
final Map<String, Object> queue = getHelper().getJsonAsMap(queueUrl);
assertThat(queue.get(ConfiguredObject.NAME), is(equalTo("myqueue")));
@@ -66,7 +65,7 @@ public class CreateTest extends HttpTestBase
{
final String queueUrl = "queue/myqueue";
Map<String, List<String>> headers = new HashMap<>();
- int responseCode = getHelper().submitRequest(queueUrl, "PUT",
Collections.emptyMap(), headers);
+ int responseCode = getHelper().submitRequest(queueUrl, "PUT",
Map.of(), headers);
assertThat(responseCode, is(equalTo(SC_CREATED)));
List<String> location = headers.get("Location");
assertThat(location.size(), is(equalTo(1)));
@@ -79,7 +78,7 @@ public class CreateTest extends HttpTestBase
final String parentUrl = "queue";
final String queueUrl = "queue/myqueue";
Map<String, List<String>> headers = new HashMap<>();
- int responseCode = getHelper().submitRequest(parentUrl, "PUT",
Collections.singletonMap(ConfiguredObject.NAME, "myqueue"), headers);
+ int responseCode = getHelper().submitRequest(parentUrl, "PUT",
Map.of(ConfiguredObject.NAME, "myqueue"), headers);
assertThat(responseCode, is(equalTo(SC_CREATED)));
List<String> location = headers.get("Location");
assertThat(location.size(), is(equalTo(1)));
@@ -90,7 +89,7 @@ public class CreateTest extends HttpTestBase
public void createSubtype() throws Exception
{
final String queueUrl = "queue/myqueue";
- final Map<String, Object> attrs =
Collections.singletonMap(ConfiguredObject.TYPE, "priority");
+ final Map<String, Object> attrs = Map.of(ConfiguredObject.TYPE,
"priority");
getHelper().submitRequest(queueUrl, "PUT", attrs, SC_CREATED);
final Map<String, Object> queue = getHelper().getJsonAsMap(queueUrl);
@@ -114,7 +113,7 @@ public class CreateTest extends HttpTestBase
public void unknownSubtype() throws Exception
{
final String queueUrl = "queue/myqueue";
- final Map<String, Object> attrs =
Collections.singletonMap(ConfiguredObject.TYPE, "unknown");
+ final Map<String, Object> attrs = Map.of(ConfiguredObject.TYPE,
"unknown");
getHelper().submitRequest(queueUrl, "PUT", attrs,
SC_UNPROCESSABLE_ENTITY);
getHelper().submitRequest(queueUrl, "GET", SC_NOT_FOUND);
}
@@ -123,7 +122,7 @@ public class CreateTest extends HttpTestBase
public void unknownCategory() throws Exception
{
final String queueUrl = "unknown/myobj";
- final Map<Object, Object> attrs =
Collections.singletonMap(ConfiguredObject.TYPE, "unknown");
+ final Map<Object, Object> attrs = Map.of(ConfiguredObject.TYPE,
"unknown");
getHelper().submitRequest(queueUrl, "PUT", attrs,
SC_METHOD_NOT_ALLOWED);
getHelper().submitRequest(queueUrl, "GET", SC_NOT_FOUND);
}
@@ -132,12 +131,12 @@ public class CreateTest extends HttpTestBase
public void createChild() throws Exception
{
final String parentUrl = "virtualhostlogger/mylogger";
- Map<String, Object> parentAttrs =
Collections.singletonMap(ConfiguredObject.TYPE, VirtualHostFileLogger.TYPE);
+ Map<String, Object> parentAttrs = Map.of(ConfiguredObject.TYPE,
VirtualHostFileLogger.TYPE);
getHelper().submitRequest(parentUrl, "PUT", parentAttrs, SC_CREATED);
final String childUrl = "virtualhostloginclusionrule/mylogger/myrule";
- Map<String, Object> childAttrs =
Collections.singletonMap(ConfiguredObject.TYPE,
VirtualHostNameAndLevelLogInclusionRule.TYPE);
+ Map<String, Object> childAttrs = Map.of(ConfiguredObject.TYPE,
VirtualHostNameAndLevelLogInclusionRule.TYPE);
getHelper().submitRequest(childUrl, "PUT", childAttrs, SC_CREATED);
}
@@ -145,7 +144,7 @@ public class CreateTest extends HttpTestBase
public void unknownParent() throws Exception
{
final String childUrl = "virtualhostloginclusionrule/unknown/myrule";
- Map<String, Object> childAttrs =
Collections.singletonMap(ConfiguredObject.TYPE,
VirtualHostNameAndLevelLogInclusionRule.TYPE);
+ Map<String, Object> childAttrs = Map.of(ConfiguredObject.TYPE,
VirtualHostNameAndLevelLogInclusionRule.TYPE);
getHelper().submitRequest(childUrl, "PUT", childAttrs,
SC_UNPROCESSABLE_ENTITY);
}
@@ -158,7 +157,7 @@ public class CreateTest extends HttpTestBase
String queueUrl = "queue/" + queueNameDoubleEncoded;
Map<String, List<String>> headers = new HashMap<>();
- int responseCode = getHelper().submitRequest(queueUrl, "PUT",
Collections.emptyMap(), headers);
+ int responseCode = getHelper().submitRequest(queueUrl, "PUT",
Map.of(), headers);
assertThat(responseCode, is(equalTo(SC_CREATED)));
List<String> location = headers.get("Location");
assertThat(location.size(), is(equalTo(1)));
@@ -174,7 +173,7 @@ public class CreateTest extends HttpTestBase
{
final String parentUrl = "queue";
final String queueName = "myqueue";
- final Map<Object, Object> attrs =
Collections.singletonMap(ConfiguredObject.NAME, queueName);
+ final Map<Object, Object> attrs = Map.of(ConfiguredObject.NAME,
queueName);
getHelper().submitRequest(parentUrl, method, attrs, SC_CREATED);
final Map<String, Object> queue =
getHelper().getJsonAsMap(String.format("%s/%s", parentUrl, queueName));
diff --git
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/rest/model/OperationTest.java
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/rest/model/OperationTest.java
index a91926dc21..79ec0fbd09 100644
---
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/rest/model/OperationTest.java
+++
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/rest/model/OperationTest.java
@@ -32,8 +32,8 @@ import static org.hamcrest.Matchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
import java.io.FileNotFoundException;
-import java.util.Collections;
import java.util.LinkedHashMap;
+import java.util.List;
import java.util.Map;
import com.fasterxml.jackson.core.type.TypeReference;
@@ -58,7 +58,7 @@ public class OperationTest extends HttpTestBase
public void invokeNoParameters() throws Exception
{
Map<String, Object> response =
getHelper().postJson("virtualhost/getStatistics",
-
Collections.emptyMap(),
+ Map.of(),
MAP_TYPE_REF,
SC_OK);
assertThat(response.size(), is(greaterThan(1)));
}
@@ -66,8 +66,7 @@ public class OperationTest extends HttpTestBase
@Test
public void invokeWithParameters() throws Exception
{
- Map<Object, Object> params = Collections.singletonMap("statistics",
-
Collections.singletonList("connectionCount"));
+ Map<Object, Object> params = Map.of("statistics",
List.of("connectionCount"));
Map<String, Object> response =
getHelper().postJson("virtualhost/getStatistics",
params,
@@ -86,7 +85,7 @@ public class OperationTest extends HttpTestBase
@Test
public void invalidParameter() throws Exception
{
- Map<String, Object> params = Collections.singletonMap("unknown",
Collections.emptyMap());
+ Map<String, Object> params = Map.of("unknown", Map.of());
getHelper().submitRequest("virtualhost/getStatistics", "POST", params,
SC_UNPROCESSABLE_ENTITY);
}
@@ -94,7 +93,7 @@ public class OperationTest extends HttpTestBase
@Test
public void operationNotFound() throws Exception
{
- getHelper().submitRequest("virtualhost/notfound", "POST",
Collections.emptyMap(), SC_NOT_FOUND);
+ getHelper().submitRequest("virtualhost/notfound", "POST", Map.of(),
SC_NOT_FOUND);
}
@Test
@@ -102,7 +101,7 @@ public class OperationTest extends HttpTestBase
{
final HttpTestHelper brokerHelper = new
HttpTestHelper(getBrokerAdmin());
final Void response = brokerHelper.postJson("broker/performGC",
- Collections.emptyMap(),
+ Map.of(),
new TypeReference<Void>()
{
},
@@ -117,7 +116,7 @@ public class OperationTest extends HttpTestBase
try
{
getHelper().postJson("broker/performGC",
- Collections.emptyMap(),
+ Map.of(),
new TypeReference<Void>()
{
},
diff --git
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/rest/model/ReadTest.java
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/rest/model/ReadTest.java
index 8397fe6457..1afb187da4 100644
---
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/rest/model/ReadTest.java
+++
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/rest/model/ReadTest.java
@@ -20,7 +20,6 @@
*/
package org.apache.qpid.tests.http.rest.model;
-import static java.util.Collections.singletonMap;
import static jakarta.servlet.http.HttpServletResponse.SC_CREATED;
import static jakarta.servlet.http.HttpServletResponse.SC_NOT_FOUND;
import static jakarta.servlet.http.HttpServletResponse.SC_OK;
@@ -34,7 +33,6 @@ import static org.hamcrest.Matchers.oneOf;
import java.io.ByteArrayInputStream;
import java.io.File;
-import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -147,14 +145,12 @@ public class ReadTest extends HttpTestBase
{
final String hostContextKey = "myvhcontextvar";
final String hostContextValue = UUID.randomUUID().toString();
- final Map<String, Object> hostUpdateAttrs =
singletonMap(ConfiguredObject.CONTEXT,
-
singletonMap(hostContextKey, hostContextValue));
+ final Map<String, Object> hostUpdateAttrs =
Map.of(ConfiguredObject.CONTEXT, Map.of(hostContextKey, hostContextValue));
getHelper().submitRequest("virtualhost", "POST", hostUpdateAttrs,
SC_OK);
final String queueContextKey = "myqueuecontextvar";
final String queueContextValue = UUID.randomUUID().toString();
- final Map<String, Object> queueUpdateAttrs =
singletonMap(ConfiguredObject.CONTEXT,
-
singletonMap(queueContextKey, queueContextValue));
+ final Map<String, Object> queueUpdateAttrs =
Map.of(ConfiguredObject.CONTEXT, Map.of(queueContextKey, queueContextValue));
getHelper().submitRequest(QUEUE1_URL, "POST", queueUpdateAttrs, SC_OK);
final Map<String, Object> queue = getHelper().getJsonAsMap(QUEUE1_URL);
@@ -179,7 +175,7 @@ public class ReadTest extends HttpTestBase
final Map<String, Object> queueUpdateAttrs = new HashMap<>();
queueUpdateAttrs.put(ConfiguredObject.DESCRIPTION,
"${myqueuecontextvar}");
- queueUpdateAttrs.put(ConfiguredObject.CONTEXT,
singletonMap(queueContextKey, queueContextValue));
+ queueUpdateAttrs.put(ConfiguredObject.CONTEXT, Map.of(queueContextKey,
queueContextValue));
getHelper().submitRequest(QUEUE1_URL, "POST", queueUpdateAttrs, SC_OK);
@@ -312,13 +308,13 @@ public class ReadTest extends HttpTestBase
private String createLoggerAndRule(final String loggerName, final String
inclusionRuleName) throws Exception
{
final String parentUrl = String.format("virtualhostlogger/%s",
loggerName);
- Map<String, Object> parentAttrs =
Collections.singletonMap(ConfiguredObject.TYPE, VirtualHostFileLogger.TYPE);
+ Map<String, Object> parentAttrs = Map.of(ConfiguredObject.TYPE,
VirtualHostFileLogger.TYPE);
int response = getHelper().submitRequest(parentUrl, "PUT",
parentAttrs);
assertThat(response, is(oneOf(SC_CREATED, SC_OK)));
final String childUrl =
String.format("virtualhostloginclusionrule/%s/%s", loggerName,
inclusionRuleName);
- Map<String, Object> childAttrs =
Collections.singletonMap(ConfiguredObject.TYPE,
VirtualHostNameAndLevelLogInclusionRule.TYPE);
+ Map<String, Object> childAttrs = Map.of(ConfiguredObject.TYPE,
VirtualHostNameAndLevelLogInclusionRule.TYPE);
getHelper().submitRequest(childUrl, "PUT", childAttrs, SC_CREATED);
final Map<String, Object> child = getHelper().getJsonAsMap(childUrl);
diff --git
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/rest/model/UpdateTest.java
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/rest/model/UpdateTest.java
index 6f363ab159..72ea61601b 100644
---
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/rest/model/UpdateTest.java
+++
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/rest/model/UpdateTest.java
@@ -28,7 +28,6 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.MatcherAssert.assertThat;
-import java.util.Collections;
import java.util.Map;
import java.util.UUID;
@@ -56,7 +55,7 @@ public class UpdateTest extends HttpTestBase
public void update() throws Exception
{
final String newDescription = "newDescription";
- Map<String, Object> updatedAttrs =
Collections.singletonMap(ConfiguredObject.DESCRIPTION, newDescription);
+ Map<String, Object> updatedAttrs =
Map.of(ConfiguredObject.DESCRIPTION, newDescription);
getHelper().submitRequest(QUEUE_URL, "PUT", updatedAttrs, SC_OK);
final Map<String, Object> queue = getHelper().getJsonAsMap(QUEUE_URL);
@@ -68,21 +67,21 @@ public class UpdateTest extends HttpTestBase
@Test
public void typeError() throws Exception
{
- Map<String, Object> updatedAttrs =
Collections.singletonMap(Queue.MAXIMUM_QUEUE_DEPTH_MESSAGES, "notNumber");
+ Map<String, Object> updatedAttrs =
Map.of(Queue.MAXIMUM_QUEUE_DEPTH_MESSAGES, "notNumber");
getHelper().submitRequest(QUEUE_URL, "PUT", updatedAttrs,
SC_UNPROCESSABLE_ENTITY);
}
@Test
public void emptyUpdate() throws Exception
{
- getHelper().submitRequest(QUEUE_URL, "PUT", Collections.<String,
Object>emptyMap(), SC_OK);
+ getHelper().submitRequest(QUEUE_URL, "PUT", Map.of(), SC_OK);
}
@Test
public void notFound() throws Exception
{
final String queueUrl = "queue/unknown";
- getHelper().submitRequest(queueUrl, "POST", Collections.emptyMap(),
SC_NOT_FOUND);
+ getHelper().submitRequest(queueUrl, "POST", Map.of(), SC_NOT_FOUND);
}
@Test
@@ -92,7 +91,7 @@ public class UpdateTest extends HttpTestBase
String originalId = (String) before.get(ConfiguredObject.ID);
assertThat(originalId, is(notNullValue()));
- Map<String, Object> updatedAttrs =
Collections.singletonMap(ConfiguredObject.ID, UUID.randomUUID());
+ Map<String, Object> updatedAttrs = Map.of(ConfiguredObject.ID,
UUID.randomUUID());
getHelper().submitRequest(QUEUE_URL, "POST", updatedAttrs,
SC_UNPROCESSABLE_ENTITY);
final Map<String, Object> queue = getHelper().getJsonAsMap(QUEUE_URL);
diff --git
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/service/StructureTest.java
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/service/StructureTest.java
index c092b412bc..482e951000 100644
---
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/service/StructureTest.java
+++
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/service/StructureTest.java
@@ -27,7 +27,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -108,7 +107,7 @@ public class StructureTest extends HttpTestBase
String queueName = getTestName() + "Queue";
helper.submitRequest(String.format("queue/%s/%s/%s", nodeName,
hostName, queueName),
"PUT",
- Collections.singletonMap("name", queueName));
+ Map.of("name", queueName));
structure = helper.getJsonAsMap("/service/structure");
diff --git
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/userprefs/UserPreferencesRestTest.java
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/userprefs/UserPreferencesRestTest.java
index 53d31991fc..c49438c231 100644
---
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/userprefs/UserPreferencesRestTest.java
+++
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/userprefs/UserPreferencesRestTest.java
@@ -26,7 +26,6 @@ import static jakarta.servlet.http.HttpServletResponse.SC_OK;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -158,8 +157,7 @@ public class UserPreferencesRestTest extends HttpTestBase
prefAttributes.put(Preference.VALUE_ATTRIBUTE, prefValueAttributes);
String rootUrl = "virtualhost/userpreferences";
- Map<String, List<Map<String, Object>>> payload =
- Collections.singletonMap(prefType,
Collections.singletonList(prefAttributes));
+ Map<String, List<Map<String, Object>>> payload = Map.of(prefType,
List.of(prefAttributes));
getHelper().submitRequest(rootUrl, "POST", payload, SC_OK);
Map<String, List<Map<String, Object>>> allPrefs =
getHelper().getJson(rootUrl, MAP_TYPE_REF, SC_OK);
@@ -202,29 +200,26 @@ public class UserPreferencesRestTest extends HttpTestBase
Map<String, Object> pref1Attributes = new HashMap<>();
pref1Attributes.put(Preference.NAME_ATTRIBUTE, pref1Name);
pref1Attributes.put(Preference.TYPE_ATTRIBUTE, prefType1);
- pref1Attributes.put(Preference.VALUE_ATTRIBUTE,
Collections.emptyMap());
+ pref1Attributes.put(Preference.VALUE_ATTRIBUTE, Map.of());
Map<String, Object> pref2Attributes = new HashMap<>();
pref2Attributes.put(Preference.NAME_ATTRIBUTE, pref2Name);
pref2Attributes.put(Preference.TYPE_ATTRIBUTE, prefType2);
- pref2Attributes.put(Preference.VALUE_ATTRIBUTE,
Collections.emptyMap());
+ pref2Attributes.put(Preference.VALUE_ATTRIBUTE, Map.of());
Map<String, Object> payload = new HashMap<>();
- payload.put(prefType1, Collections.singletonList(pref1Attributes));
- payload.put(prefType2, Collections.singletonList(pref2Attributes));
+ payload.put(prefType1, List.of(pref1Attributes));
+ payload.put(prefType2, List.of(pref2Attributes));
String url = "virtualhost/userpreferences";
getHelper().submitRequest(url, "POST", payload, SC_OK);
Map<String, Object> pref3Attributes = new HashMap<>();
pref3Attributes.put(Preference.NAME_ATTRIBUTE, pref3Name);
pref3Attributes.put(Preference.TYPE_ATTRIBUTE, prefType2);
- pref3Attributes.put(Preference.VALUE_ATTRIBUTE,
Collections.emptyMap());
+ pref3Attributes.put(Preference.VALUE_ATTRIBUTE, Map.of());
String url2 = String.format("virtualhost/userpreferences/%s",
prefType2);
- getHelper().submitRequest(url2,
- "POST",
- Collections.singletonList(pref3Attributes),
- SC_OK);
+ getHelper().submitRequest(url2, "POST", List.of(pref3Attributes),
SC_OK);
String allUrl = "virtualhost/userpreferences";
final Map<String, Object> allMap = getHelper().getJsonAsMap(allUrl);
@@ -257,7 +252,7 @@ public class UserPreferencesRestTest extends HttpTestBase
Map<String, Object> prefAttributes = new HashMap<>();
prefAttributes.put(Preference.DESCRIPTION_ATTRIBUTE, prefDescription);
- prefAttributes.put("value", Collections.emptyMap());
+ prefAttributes.put("value", Map.of());
String fullUrl = String.format("virtualhost/userpreferences/%s/%s",
prefType, prefName);
getHelper().submitRequest(fullUrl, "PUT", prefAttributes, SC_OK);
@@ -294,12 +289,12 @@ public class UserPreferencesRestTest extends HttpTestBase
Map<String, Object> pref1Attributes = new HashMap<>();
pref1Attributes.put(Preference.NAME_ATTRIBUTE, pref1Name);
- pref1Attributes.put(Preference.VALUE_ATTRIBUTE,
Collections.emptyMap());
+ pref1Attributes.put(Preference.VALUE_ATTRIBUTE, Map.of());
pref1Attributes.put(Preference.TYPE_ATTRIBUTE, pref1Type);
Map<String, Object> pref2Attributes = new HashMap<>();
pref2Attributes.put(Preference.NAME_ATTRIBUTE, pref2Name);
- pref2Attributes.put(Preference.VALUE_ATTRIBUTE,
Collections.emptyMap());
+ pref2Attributes.put(Preference.VALUE_ATTRIBUTE, Map.of());
pref2Attributes.put(Preference.TYPE_ATTRIBUTE, pref2Type);
final Map<String, List<Map<String, Object>>> payload = new
HashMap<>();
@@ -334,12 +329,12 @@ public class UserPreferencesRestTest extends HttpTestBase
Map<String, Object> pref3Attributes = new HashMap<>();
pref3Attributes.put(Preference.NAME_ATTRIBUTE, pref3Name);
- pref3Attributes.put(Preference.VALUE_ATTRIBUTE,
Collections.emptyMap());
+ pref3Attributes.put(Preference.VALUE_ATTRIBUTE, Map.of());
pref3Attributes.put(Preference.TYPE_ATTRIBUTE, pref1Type);
Map<String, Object> pref4Attributes = new HashMap<>();
pref4Attributes.put(Preference.NAME_ATTRIBUTE, pref4Name);
- pref4Attributes.put(Preference.VALUE_ATTRIBUTE,
Collections.emptyMap());
+ pref4Attributes.put(Preference.VALUE_ATTRIBUTE, Map.of());
pref4Attributes.put(Preference.TYPE_ATTRIBUTE, pref3Type);
final Map<String, List<Map<String, Object>>> payload = new
HashMap<>();
@@ -375,8 +370,8 @@ public class UserPreferencesRestTest extends HttpTestBase
Map<String, Object> prefAttributes = new HashMap<>();
prefAttributes.put(Preference.NAME_ATTRIBUTE, prefName);
prefAttributes.put(Preference.DESCRIPTION_ATTRIBUTE, prefDescription);
- prefAttributes.put(Preference.VALUE_ATTRIBUTE, Collections.emptyMap());
- final List<Map<String, Object>> payloadCreate =
Collections.singletonList(prefAttributes);
+ prefAttributes.put(Preference.VALUE_ATTRIBUTE, Map.of());
+ final List<Map<String, Object>> payloadCreate =
List.of(prefAttributes);
getHelper().submitRequest(typeUrl, "POST", payloadCreate, SC_OK);
Map<String, Object> storedPreference =
getHelper().getJsonAsMap(fullUrl);
@@ -388,7 +383,7 @@ public class UserPreferencesRestTest extends HttpTestBase
// Update via url to type
Map<String, Object> updatePreference = new HashMap<>(storedPreference);
updatePreference.put(Preference.DESCRIPTION_ATTRIBUTE, "update 1");
- final List<Map<String, Object>> payloadUpdate1 =
Collections.singletonList(updatePreference);
+ final List<Map<String, Object>> payloadUpdate1 =
List.of(updatePreference);
getHelper().submitRequest(typeUrl, "POST", payloadUpdate1, SC_OK);
Map<String, Object> rereadPrefDetails =
getHelper().getJsonAsMap(fullUrl);
@@ -401,8 +396,7 @@ public class UserPreferencesRestTest extends HttpTestBase
// Update via url to root
updatePreference = new HashMap<>(rereadPrefDetails);
updatePreference.put(Preference.DESCRIPTION_ATTRIBUTE, "update 2");
- Map<String, List<Map<String, Object>>> payloadUpdate2 =
- Collections.singletonMap(prefType,
Collections.singletonList(updatePreference));
+ Map<String, List<Map<String, Object>>> payloadUpdate2 =
Map.of(prefType, List.of(updatePreference));
getHelper().submitRequest(rootUrl, "POST", payloadUpdate2, SC_OK);
rereadPrefDetails = getHelper().getJsonAsMap(fullUrl);
@@ -420,7 +414,7 @@ public class UserPreferencesRestTest extends HttpTestBase
Map<String, Object> prefAttributes = new HashMap<>();
prefAttributes.put(Preference.DESCRIPTION_ATTRIBUTE, prefDescription);
- prefAttributes.put(Preference.VALUE_ATTRIBUTE, Collections.emptyMap());
+ prefAttributes.put(Preference.VALUE_ATTRIBUTE, Map.of());
String fullUrl = String.format("virtualhost/userpreferences/%s/%s",
prefType, prefName);
getHelper().submitRequest(fullUrl, "PUT", prefAttributes, SC_OK);
diff --git
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/v6_1/BindingTest.java
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/v6_1/BindingTest.java
index 3f484dd2ba..8a5ef19426 100644
---
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/v6_1/BindingTest.java
+++
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/v6_1/BindingTest.java
@@ -30,7 +30,6 @@ import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.MatcherAssert.assertThat;
-import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -56,11 +55,10 @@ public class BindingTest extends HttpTestBase
@Test
public void bind() throws Exception
{
- Map<String, String> arguments =
Collections.singletonMap(AMQPFilterTypes.JMS_SELECTOR.getValue(), "1<2");
+ Map<String, String> arguments =
Map.of(AMQPFilterTypes.JMS_SELECTOR.getValue(), "1<2");
getHelper().submitRequest("/api/v6.1/binding/amq.direct/myqueue/foo",
"PUT",
- Collections.singletonMap("arguments",
- arguments),
+ Map.of("arguments", arguments),
SC_CREATED);
List<Map<String, Object>> bindings =
getHelper().getJsonAsList("queue/myqueue/getPublishingLinks");
assertThat(bindings, is(notNullValue()));
@@ -84,7 +82,7 @@ public class BindingTest extends HttpTestBase
@Test
public void get() throws Exception
{
- Map<String, String> arguments =
Collections.singletonMap(AMQPFilterTypes.JMS_SELECTOR.getValue(), "1<2");
+ Map<String, String> arguments =
Map.of(AMQPFilterTypes.JMS_SELECTOR.getValue(), "1<2");
Map<String, Object> bindOperationArguments = new HashMap<>();
bindOperationArguments.put("destination", "myqueue");
bindOperationArguments.put("bindingKey", "foo");
@@ -111,7 +109,7 @@ public class BindingTest extends HttpTestBase
@Test
public void delete() throws Exception
{
- Map<String, String> arguments =
Collections.singletonMap(AMQPFilterTypes.JMS_SELECTOR.getValue(), "1<2");
+ Map<String, String> arguments =
Map.of(AMQPFilterTypes.JMS_SELECTOR.getValue(), "1<2");
Map<String, Object> bindOperationArguments = new HashMap<>();
bindOperationArguments.put("destination", "myqueue");
bindOperationArguments.put("bindingKey", "foo");
diff --git
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/v8_0/LegacyManagementTest.java
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/v8_0/LegacyManagementTest.java
index 16397233b6..aa4a4d27ce 100644
---
a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/v8_0/LegacyManagementTest.java
+++
b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/v8_0/LegacyManagementTest.java
@@ -26,8 +26,8 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.notNullValue;
-import java.util.Collections;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import jakarta.servlet.http.HttpServletResponse;
@@ -75,8 +75,8 @@ public class LegacyManagementTest extends HttpTestBase
final Map contextMap = (Map)portContext;
assertThat(contextMap.get("qpid.security.tls.protocolAllowList"),
is(equalTo("TLSv1")));
assertThat(contextMap.get("qpid.security.tls.protocolDenyList"),
is(equalTo("SSL.*")));
-
assertThat(portAttributes.get("tlsProtocolAllowList"),is(equalTo(Collections.singletonList("TLSv1"))));
-
assertThat(portAttributes.get("tlsProtocolDenyList"),is(equalTo(Collections.singletonList("SSL.*"))));
+
assertThat(portAttributes.get("tlsProtocolAllowList"),is(equalTo(List.of("TLSv1"))));
+
assertThat(portAttributes.get("tlsProtocolDenyList"),is(equalTo(List.of("SSL.*"))));
final Map<String, Object> portAttributes8_0 =
getHelper().getJsonAsMap("/api/v8.0/port/" + getTestName());
assertThat(portAttributes8_0, is(notNullValue()));
@@ -85,8 +85,8 @@ public class LegacyManagementTest extends HttpTestBase
final Map contextMap8_0 = (Map)portContext8_0;
assertThat(contextMap8_0.get("qpid.security.tls.protocolWhiteList"),
is(equalTo("TLSv1")));
assertThat(contextMap8_0.get("qpid.security.tls.protocolBlackList"),
is(equalTo("SSL.*")));
-
assertThat(portAttributes8_0.get("tlsProtocolWhiteList"),is(equalTo(Collections.singletonList("TLSv1"))));
-
assertThat(portAttributes8_0.get("tlsProtocolBlackList"),is(equalTo(Collections.singletonList("SSL.*"))));
+
assertThat(portAttributes8_0.get("tlsProtocolWhiteList"),is(equalTo(List.of("TLSv1"))));
+
assertThat(portAttributes8_0.get("tlsProtocolBlackList"),is(equalTo(List.of("SSL.*"))));
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
