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 b78e3b3bf8 QPID-8653: [Broker-J] Code cleanup: collection type
arguments, collection factory methods, lambdas (#209)
b78e3b3bf8 is described below
commit b78e3b3bf852b3f71a6bd3cfc8f506adbf005251
Author: Daniil Kirilyuk <daniel.kiril...@gmail.com>
AuthorDate: Mon Aug 7 12:54:07 2023 +0200
QPID-8653: [Broker-J] Code cleanup: collection type arguments, collection
factory methods, lambdas (#209)
---
.../management/amqp/ManagementAddressSpace.java | 11 ++------
.../server/management/amqp/ManagementNode.java | 31 +++++++++++-----------
.../management/amqp/ManagementNodeConsumer.java | 2 +-
.../management/amqp/ManagementNodeCreator.java | 4 +--
.../server/management/amqp/ProxyMessageSource.java | 3 +--
5 files changed, 20 insertions(+), 31 deletions(-)
diff --git
a/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementAddressSpace.java
b/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementAddressSpace.java
index d3fd81361b..aebdfde12a 100644
---
a/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementAddressSpace.java
+++
b/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementAddressSpace.java
@@ -302,14 +302,7 @@ public class ManagementAddressSpace implements
NamedAddressSpace
connectionSpecificDestinations = new ConcurrentHashMap<>();
if(_connectionSpecificDestinations.putIfAbsent(connectionReference,
connectionSpecificDestinations) == null)
{
- session.getAMQPConnection().addDeleteTask(new Action()
- {
- @Override
- public void performAction(final Object object)
- {
-
_connectionSpecificDestinations.remove(connectionReference);
- }
- });
+ session.getAMQPConnection().addDeleteTask(object ->
_connectionSpecificDestinations.remove(connectionReference));
}
}
connectionSpecificDestinations.put(proxyMessageSource.getName(),
proxyMessageSource);
@@ -368,7 +361,7 @@ public class ManagementAddressSpace implements
NamedAddressSpace
@Override
public List<String> getGlobalAddressDomains()
{
- return Collections.emptyList();
+ return List.of();
}
@Override
diff --git
a/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java
b/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java
index 16d5bb5e11..787e13dba0 100644
---
a/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java
+++
b/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java
@@ -30,7 +30,6 @@ import java.security.AccessControlException;
import java.security.AccessController;
import java.text.MessageFormat;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
@@ -565,7 +564,7 @@ class ManagementNode implements MessageSource,
MessageDestination, BaseQueue
return
InternalMessage.createMapMessage(_addressSpace.getMessageStore(),
responseHeader,
-
Collections.emptyMap());
+ Map.of());
}
catch (IntegrityViolationException e)
{
@@ -726,7 +725,7 @@ class ManagementNode implements MessageSource,
MessageDestination, BaseQueue
{
ConfiguredObject parent =
-
_configuredObjectFinder.findObjectParentsFromPath(Arrays.asList(getPathElements(path)),
hierarchy, ConfiguredObjectTypeRegistry.getCategory(clazz));
+
_configuredObjectFinder.findObjectParentsFromPath(List.of(getPathElements(path)),
hierarchy, ConfiguredObjectTypeRegistry.getCategory(clazz));
if(parent == null)
{
return createFailureResponse(message,
STATUS_CODE_NOT_FOUND, "The '"+OBJECT_PATH+"' "+path+" does not identify a
valid parent");
@@ -920,7 +919,7 @@ class ManagementNode implements MessageSource,
MessageDestination, BaseQueue
Collection<Class<? extends ConfiguredObject>> ancestorCategories =
_model.getAncestorCategories(clazz);
if(ancestorCategories.contains(_managedObject.getCategoryClass()))
{
- return findDescendantById(clazz, id,
_managedObject.getCategoryClass(), Collections.singleton(_managedObject));
+ return findDescendantById(clazz, id,
_managedObject.getCategoryClass(), Set.of(_managedObject));
}
else
{
@@ -937,7 +936,7 @@ class ManagementNode implements MessageSource,
MessageDestination, BaseQueue
Collection<? extends ConfiguredObject> associated =
(Collection<? extends ConfiguredObject>) operation
.perform(_managedObject,
- Collections.emptyMap());
+ Map.of());
ConfiguredObject<?> object = findDescendantById(clazz, id,
entry.getKey(),
associated);
@@ -959,7 +958,7 @@ class ManagementNode implements MessageSource,
MessageDestination, BaseQueue
Collection<? extends ConfiguredObject> associated =
(Collection<? extends ConfiguredObject>)
operation
.perform(_managedObject,
- Collections.emptyMap());
+ Map.of());
ConfiguredObject<?> object = findDescendantById(clazz,
id,
entry.getKey(),
associated);
@@ -1134,7 +1133,7 @@ class ManagementNode implements MessageSource,
MessageDestination, BaseQueue
List<String> attributeNames;
if(attributeNameObjects == null)
{
- attributeNames = Collections.emptyList();
+ attributeNames = List.of();
}
else
{
@@ -1180,7 +1179,7 @@ class ManagementNode implements MessageSource,
MessageDestination, BaseQueue
}
else
{
- objects = Collections.emptyList();
+ objects = List.of();
}
}
else if(objects.size() + offset > 0)
@@ -1208,7 +1207,7 @@ class ManagementNode implements MessageSource,
MessageDestination, BaseQueue
}
else
{
- objects = Collections.emptyList();
+ objects = List.of();
}
}
else if(objects.size() + count > 0)
@@ -1348,7 +1347,7 @@ class ManagementNode implements MessageSource,
MessageDestination, BaseQueue
private static <C extends ConfiguredObject<?>>
Collection<ConfiguredObject<?>> getAssociatedChildren(final
ConfiguredObjectOperation<C> op, final ConfiguredObject<?> managedObject)
{
@SuppressWarnings("unchecked")
- final Collection<ConfiguredObject<?>> associated =
(Collection<ConfiguredObject<?>>) op.perform((C)managedObject,
Collections.emptyMap());
+ final Collection<ConfiguredObject<?>> associated =
(Collection<ConfiguredObject<?>>) op.perform((C)managedObject, Map.of());
return associated;
}
@@ -1356,7 +1355,7 @@ class ManagementNode implements MessageSource,
MessageDestination, BaseQueue
{
Set<String> attrNameSet = new HashSet<>();
List<String> attributeNames = new ArrayList<>();
- for(String standardAttribute : Arrays.asList(IDENTITY_ATTRIBUTE,
TYPE_ATTRIBUTE, QPID_TYPE, OBJECT_PATH))
+ for(String standardAttribute : List.of(IDENTITY_ATTRIBUTE,
TYPE_ATTRIBUTE, QPID_TYPE, OBJECT_PATH))
{
attrNameSet.add(standardAttribute);
attributeNames.add(standardAttribute);
@@ -1457,20 +1456,20 @@ class ManagementNode implements MessageSource,
MessageDestination, BaseQueue
ConfiguredObjectTypeRegistry.getCategory(clazz);
if(category == clazz)
{
- return
Collections.emptyList();
+ return List.of();
}
else
{
- return
Collections.singletonList(getAmqpName(category));
+ return
List.of(getAmqpName(category));
}
- }, Collections.<String>emptyList());
+ }, List.of());
}
private Map<String,List<String>> performGetAttributes(final Map<String,
Object> headers)
{
- return performManagementOperation(headers,
- clazz -> new
ArrayList<>(_model.getTypeRegistry().getAttributeNames(clazz)),
Collections.<String>emptyList());
+ return performManagementOperation(headers, clazz ->
+ new
ArrayList<>(_model.getTypeRegistry().getAttributeNames(clazz)), List.of());
}
diff --git
a/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNodeConsumer.java
b/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNodeConsumer.java
index 0662ea5835..8abc2d9778 100644
---
a/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNodeConsumer.java
+++
b/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNodeConsumer.java
@@ -52,7 +52,7 @@ class ManagementNodeConsumer<T extends ConsumerTarget>
implements MessageInstanc
BaseQueue
{
private final ManagementNode _managementNode;
- private final List<ManagementResponse> _queue =
Collections.synchronizedList(new ArrayList<ManagementResponse>());
+ private final List<ManagementResponse> _queue =
Collections.synchronizedList(new ArrayList<>());
private final T _target;
private final String _name;
private final UUID _identifier = UUID.randomUUID();
diff --git
a/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNodeCreator.java
b/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNodeCreator.java
index 8de2191288..de0f66dda3 100644
---
a/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNodeCreator.java
+++
b/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNodeCreator.java
@@ -22,7 +22,6 @@ package org.apache.qpid.server.management.amqp;
import org.apache.qpid.server.plugin.PluggableService;
import org.apache.qpid.server.plugin.SystemNodeCreator;
-import org.apache.qpid.server.util.Action;
@PluggableService
public class ManagementNodeCreator implements SystemNodeCreator
@@ -30,8 +29,7 @@ public class ManagementNodeCreator implements
SystemNodeCreator
@Override
public void register(final SystemNodeRegistry registry)
{
- ManagementNode managementNode = new
ManagementNode(registry.getVirtualHost(),
-
registry.getVirtualHost());
+ ManagementNode managementNode = new
ManagementNode(registry.getVirtualHost(), registry.getVirtualHost());
registry.registerSystemNode(managementNode);
}
diff --git
a/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ProxyMessageSource.java
b/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ProxyMessageSource.java
index 10bca28832..5e477d0f6e 100644
---
a/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ProxyMessageSource.java
+++
b/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ProxyMessageSource.java
@@ -23,7 +23,6 @@ package org.apache.qpid.server.management.amqp;
import java.security.AccessControlException;
import java.security.AccessController;
import java.util.Collection;
-import java.util.Collections;
import java.util.EnumSet;
import java.util.Map;
import java.util.Set;
@@ -186,7 +185,7 @@ public class ProxyMessageSource implements MessageSource,
MessageDestination
@Override
public Collection<? extends MessageInstanceConsumer> getConsumers()
{
- return _consumer == null ?
Collections.<MessageInstanceConsumer>emptySet() :
Collections.singleton(_consumer);
+ return _consumer == null ? Set.of() : Set.of(_consumer);
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
