From 2a9abe0c290b9bb7487254302aae2bf6f7fe964d Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Mon, 14 Apr 2014 19:21:47 +0000 Subject: QPID-5699 : [Java Broker] Make getAttributeNames() in AbstractConfiguredObject return the names based on the annotation metadata, and make the method final git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1587290 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/qpid/server/binding/BindingImpl.java | 6 ------ .../apache/qpid/server/exchange/AbstractExchange.java | 6 ------ .../qpid/server/model/AbstractConfiguredObject.java | 7 ++----- .../apache/qpid/server/model/SystemContextImpl.java | 6 ------ .../main/java/org/apache/qpid/server/model/User.java | 3 --- .../server/model/adapter/AbstractPluginAdapter.java | 6 ------ .../qpid/server/model/adapter/BrokerAdapter.java | 6 ------ .../qpid/server/model/adapter/ConnectionAdapter.java | 7 ------- .../model/adapter/FileBasedGroupProviderImpl.java | 19 ------------------- .../adapter/FileSystemPreferencesProviderImpl.java | 6 ------ .../qpid/server/model/adapter/SessionAdapter.java | 7 ------- .../server/model/adapter/VirtualHostAliasAdapter.java | 5 ----- .../apache/qpid/server/model/port/AbstractPort.java | 6 ------ .../org/apache/qpid/server/queue/AbstractQueue.java | 6 ------ .../apache/qpid/server/queue/QueueConsumerImpl.java | 6 ------ .../apache/qpid/server/security/FileKeyStoreImpl.java | 6 ------ .../qpid/server/security/FileTrustStoreImpl.java | 6 ------ .../auth/manager/AbstractAuthenticationManager.java | 6 ------ .../PrincipalDatabaseAuthenticationManager.java | 6 ------ .../auth/manager/ScramSHA1AuthenticationManager.java | 5 ----- .../qpid/server/virtualhost/AbstractVirtualHost.java | 6 ------ .../plugins/ACLFileAccessControlProviderImpl.java | 6 ------ .../qpid/server/management/plugin/HttpManagement.java | 6 ------ .../qpid/server/jmx/JMXManagementPluginImpl.java | 6 ------ 24 files changed, 2 insertions(+), 153 deletions(-) (limited to 'qpid/java') diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java index e0fc64b6e2..4ba3c7ba68 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java @@ -265,12 +265,6 @@ public class BindingImpl return super.getAttribute(name); } - @Override - public Collection getAttributeNames() - { - return getAttributeNames(Binding.class); - } - @Override public Object setAttribute(final String name, final Object expected, final Object desired) throws IllegalStateException, AccessControlException, IllegalArgumentException diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java index e8f8c20eb5..74e772c4ba 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java @@ -860,12 +860,6 @@ public abstract class AbstractExchange> } } - @Override - public Collection getAttributeNames() - { - return getAttributeNames(getClass()); - } - @Override public Object getAttribute(final String name) { diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java index 7b2790b56d..c9e50bc3ca 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java @@ -752,12 +752,9 @@ public abstract class AbstractConfiguredObject> im } - public Collection getAttributeNames() + public final Collection getAttributeNames() { - synchronized(_attributes) - { - return new ArrayList(_attributes.keySet()); - } + return getAttributeNames(getClass()); } @Override diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/SystemContextImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/SystemContextImpl.java index 7575ad203a..589832e33b 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/SystemContextImpl.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/SystemContextImpl.java @@ -280,12 +280,6 @@ public class SystemContextImpl extends AbstractConfiguredObject getAttributeNames() - { - return getAttributeNames(getClass()); - } - @Override public Broker getBroker() { diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/User.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/User.java index 07ee51c052..139de17f2d 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/User.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/User.java @@ -21,9 +21,6 @@ package org.apache.qpid.server.model; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; import java.util.Map; @ManagedObject diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractPluginAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractPluginAdapter.java index 4c66ab26b5..8253af2614 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractPluginAdapter.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractPluginAdapter.java @@ -85,12 +85,6 @@ public abstract class AbstractPluginAdapter> extends Abstrac return Collections.emptyList(); } - @Override - public Collection getAttributeNames() - { - return getAttributeNames(Plugin.class); - } - @Override public Object getAttribute(String name) { diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java index 357d367f28..834a655f11 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java @@ -799,12 +799,6 @@ public class BrokerAdapter extends AbstractConfiguredObject imple } } - @Override - public Collection getAttributeNames() - { - return getAttributeNames(Broker.class); - } - @Override public Object getAttribute(String name) { diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java index 00834c5866..ec1aa21e81 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java @@ -213,13 +213,6 @@ public final class ConnectionAdapter extends AbstractConfiguredObject getAttributeNames() - { - return getAttributeNames(Connection.class); - } - - @Override public Collection getChildren(Class clazz) { diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java index 0ec995810b..a70f3ec0f6 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java @@ -132,12 +132,6 @@ public class FileBasedGroupProviderImpl return LifetimePolicy.PERMANENT; } - @Override - public Collection getAttributeNames() - { - return getAttributeNames(getClass()); - } - @Override public Object getAttribute(String name) { @@ -423,12 +417,6 @@ public class FileBasedGroupProviderImpl + childClass); } - @Override - public Collection getAttributeNames() - { - return getAttributeNames(Group.class); - } - @Override public Object getAttribute(String name) { @@ -502,13 +490,6 @@ public class FileBasedGroupProviderImpl } } - @Override - public Collection getAttributeNames() - { - return getAttributeNames(GroupMember.class); - } - - @Override public State getState() { diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java index db01938af6..3be3a929bf 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java @@ -100,12 +100,6 @@ public class FileSystemPreferencesProviderImpl } } - @Override - public Collection getAttributeNames() - { - return getAttributeNames(FileSystemPreferencesProviderImpl.class); - } - @Override public String getPath() { diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/SessionAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/SessionAdapter.java index 47bf9293f9..8b88d0dfc0 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/SessionAdapter.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/SessionAdapter.java @@ -108,13 +108,6 @@ final class SessionAdapter extends AbstractConfiguredObject impl return null; //TODO } - - @Override - public Collection getAttributeNames() - { - return getAttributeNames(Session.class); - } - @Override public Object getAttribute(String name) { diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAliasAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAliasAdapter.java index 7c654c566e..43b6718a0d 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAliasAdapter.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAliasAdapter.java @@ -101,9 +101,4 @@ public class VirtualHostAliasAdapter extends AbstractConfiguredObject getAttributeNames() - { - return getAttributeNames(getClass()); - } } diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java index 5464156a05..e8c445349c 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java @@ -252,12 +252,6 @@ abstract public class AbstractPort> extends AbstractCo return super.getAttribute(name); } - @Override - public Collection getAttributeNames() - { - return getAttributeNames(getClass()); - } - @Override public boolean setState(State currentState, State desiredState) { diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java index 0568e1eb3b..3f7f5f854a 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java @@ -2857,12 +2857,6 @@ public abstract class AbstractQueue } } - @Override - public Collection getAttributeNames() - { - return getAttributeNames(getClass()); - } - @Override protected void authoriseSetAttributes(ConfiguredObject modified, Set attributes) throws AccessControlException { diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java index 4426ee36b7..3070be413d 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java @@ -536,12 +536,6 @@ class QueueConsumerImpl return super.getAttribute(name); } - @Override - public Collection getAttributeNames() - { - return getAttributeNames(getClass()); - } - @Override public String toLogString() { diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java index 8316e027d1..5a657bf46a 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java @@ -100,12 +100,6 @@ public class FileKeyStoreImpl extends AbstractConfiguredObject validateKeyStoreAttributes(this); } - @Override - public Collection getAttributeNames() - { - return getAttributeNames(getClass()); - } - @Override public State getState() { diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java index 84b8b38ff1..bc242e5cc3 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java @@ -87,12 +87,6 @@ public class FileTrustStoreImpl extends AbstractConfiguredObject getAttributeNames() - { - return getAttributeNames(getClass()); - } - @Override public State getState() { diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java index a7a6ff42f1..01d517f94d 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java @@ -301,12 +301,6 @@ public abstract class AbstractAuthenticationManager getAttributeNames() - { - return getAttributeNames(getClass()); - } - @Override public Object getAttribute(final String name) { diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java index 26421437a7..b8a9fb1489 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java @@ -414,12 +414,6 @@ public abstract class PrincipalDatabaseAuthenticationManager getAttributeNames() - { - return getAttributeNames(User.class); - } - @Override public Object getAttribute(String name) { diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManager.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManager.java index c755015c33..5decd04274 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManager.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManager.java @@ -608,11 +608,6 @@ public class ScramSHA1AuthenticationManager return deleted.length == 1; } - @Override - public Collection getAttributeNames() - { - return getAttributeNames(getClass()); - } } @Override diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java index 3207e13e96..781fce70c0 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java @@ -1455,12 +1455,6 @@ public abstract class AbstractVirtualHost> exte return super.getAttribute(name); } - @Override - public Collection getAttributeNames() - { - return getAttributeNames(org.apache.qpid.server.model.VirtualHost.class); - } - @Override public Collection getSupportedExchangeTypes() { diff --git a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java index ae23a308f5..40a0b26487 100644 --- a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java +++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java @@ -116,12 +116,6 @@ public class ACLFileAccessControlProviderImpl return LifetimePolicy.PERMANENT; } - @Override - public Collection getAttributeNames() - { - return getAttributeNames(getClass()); - } - @Override public Object getAttribute(String name) { diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java index 5427d81bd5..37e85831a6 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java +++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java @@ -429,12 +429,6 @@ public class HttpManagement extends AbstractPluginAdapter implem return httpPorts; } - @Override - public Collection getAttributeNames() - { - return getAttributeNames(HttpManagement.class); - } - @Override public boolean isHttpsSaslAuthenticationEnabled() { diff --git a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java index 61bd7ab1a0..3a04ca46fb 100644 --- a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java +++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java @@ -312,12 +312,6 @@ public class JMXManagementPluginImpl } } - @Override - public Collection getAttributeNames() - { - return getAttributeNames(JMXManagementPluginImpl.class); - } - @Override protected void changeAttributes(Map attributes) { -- cgit v1.2.1