From 41a0f87c92e29043cb4325fa8eef9841472031fc Mon Sep 17 00:00:00 2001 From: Alex Rudyy Date: Thu, 25 Sep 2014 11:44:19 +0000 Subject: QPID-6114: Remove redundant overridden getAttribute(String) method from CO and make _state field volatile git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1627524 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/qpid/server/exchange/AbstractExchange.java | 10 ---------- .../apache/qpid/server/model/AbstractConfiguredObject.java | 4 ++-- .../qpid/server/model/adapter/AbstractPluginAdapter.java | 10 ---------- .../server/model/adapter/FileBasedGroupProviderImpl.java | 13 ------------- .../model/adapter/FileSystemPreferencesProviderImpl.java | 10 ---------- .../apache/qpid/server/model/adapter/SessionAdapter.java | 10 ---------- .../org/apache/qpid/server/model/port/AbstractPort.java | 10 ---------- .../java/org/apache/qpid/server/queue/AbstractQueue.java | 11 ----------- .../org/apache/qpid/server/queue/QueueConsumerImpl.java | 6 ------ .../org/apache/qpid/server/security/FileKeyStoreImpl.java | 11 ----------- .../org/apache/qpid/server/security/FileTrustStoreImpl.java | 10 ---------- .../apache/qpid/server/security/NonJavaKeyStoreImpl.java | 11 ----------- .../apache/qpid/server/security/NonJavaTrustStoreImpl.java | 11 ----------- .../auth/manager/AbstractAuthenticationManager.java | 10 ---------- .../qpid/server/security/auth/manager/ScramAuthUser.java | 6 ------ .../apache/qpid/server/virtualhost/AbstractVirtualHost.java | 11 ----------- 16 files changed, 2 insertions(+), 152 deletions(-) (limited to 'qpid/java') 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 9b0cc48a62..fd0333f6e7 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 @@ -894,16 +894,6 @@ public abstract class AbstractExchange> return binding; } - @Override - public Object getAttribute(final String name) - { - if(ConfiguredObject.STATE.equals(name)) - { - return getState(); - } - return super.getAttribute(name); - } - @Override protected void authoriseSetAttributes(ConfiguredObject modified, Set attributes) throws AccessControlException { 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 fab9d95159..d3741cd846 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 @@ -159,7 +159,7 @@ public abstract class AbstractConfiguredObject> im @ManagedAttributeField( afterSet = "attainStateIfResolved" ) private State _desiredState; private boolean _openComplete; - private State _state = State.UNINITIALIZED; + private volatile State _state = State.UNINITIALIZED; protected static Map, ConfiguredObject> parentsMap(ConfiguredObject... parents) { @@ -953,7 +953,7 @@ public abstract class AbstractConfiguredObject> im } @Override - public Object getAttribute(String name) + public final Object getAttribute(String name) { ConfiguredObjectAttribute attr = (ConfiguredObjectAttribute) _attributeTypes.get(name); if(attr != null && (attr.isAutomated() || attr.isDerived())) 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 4d0b6ef303..3e662fac32 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 @@ -70,16 +70,6 @@ public abstract class AbstractPluginAdapter> extends Abstrac return Collections.emptyList(); } - @Override - public Object getAttribute(String name) - { - if (STATE.equals(name)) - { - return getState(); - } - return super.getAttribute(name); - } - @Override protected void authoriseSetDesiredState(State desiredState) throws AccessControlException { 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 a82c0de7e9..c96f4c0849 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 @@ -31,7 +31,6 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; import java.util.UUID; -import java.util.concurrent.atomic.AtomicReference; import org.apache.log4j.Logger; @@ -51,7 +50,6 @@ import org.apache.qpid.server.security.access.Operation; import org.apache.qpid.server.security.auth.UsernamePrincipal; import org.apache.qpid.server.security.group.FileGroupDatabase; import org.apache.qpid.server.security.group.GroupPrincipal; -import org.apache.qpid.server.util.MapValueConverter; public class FileBasedGroupProviderImpl extends AbstractConfiguredObject implements FileBasedGroupProvider @@ -197,17 +195,6 @@ public class FileBasedGroupProviderImpl return _path; } - @Override - public Object getAttribute(String name) - { - if (STATE.equals(name)) - { - return getState(); - } - - return super.getAttribute(name); - } - @Override public C addChild(Class childClass, Map attributes, ConfiguredObject... otherParents) 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 68660d8f81..f2be4fd861 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 @@ -115,16 +115,6 @@ public class FileSystemPreferencesProviderImpl return Collections.emptySet(); } - @Override - public Object getAttribute(String name) - { - if (STATE.equals(name)) - { - return getState(); - } - return super.getAttribute(name); - } - protected void onClose() { if(_store != null) 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 c3b8a8798b..7c9b439e93 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,16 +108,6 @@ final class SessionAdapter extends AbstractConfiguredObject impl return Collections.emptySet(); //TODO } - @Override - public Object getAttribute(String name) - { - if(name.equals(PRODUCER_FLOW_BLOCKED)) - { - return _session.getBlocking(); - } - return super.getAttribute(name); //TODO - Implement - } - @Override public Collection getChildren(Class clazz) { 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 fd70a96c5c..c0aa99a7d6 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 @@ -310,16 +310,6 @@ abstract public class AbstractPort> extends AbstractCo } } - @Override - public Object getAttribute(String name) - { - if(STATE.equals(name)) - { - return getState(); - } - return super.getAttribute(name); - } - @StateTransition(currentState = { State.ACTIVE, State.QUIESCED, State.ERRORED}, desiredState = State.DELETED ) private void doDelete() { 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 ca1278a97a..a5156c9073 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 @@ -573,17 +573,6 @@ public abstract class AbstractQueue> return new ArrayList(_arguments.keySet()); } - @Override - public Object getAttribute(String name) - { - if(STATE.equals(name)) - { - return State.ACTIVE; // TODO - } - - return super.getAttribute(name); - } - public String getOwner() { if(_exclusiveOwner != null) 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 0f278eda91..b33a72be10 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 @@ -513,12 +513,6 @@ class QueueConsumerImpl return _selector; } - @Override - public Object getAttribute(final String name) - { - return super.getAttribute(name); - } - @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 6e02e71cd4..08fc815fab 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 @@ -86,17 +86,6 @@ public class FileKeyStoreImpl extends AbstractConfiguredObject validateKeyStoreAttributes(this); } - @Override - public Object getAttribute(String name) - { - if(KeyStore.STATE.equals(name)) - { - return getState(); - } - - return super.getAttribute(name); - } - @StateTransition(currentState = {State.ACTIVE, State.ERRORED}, desiredState = State.DELETED) protected void doDelete() { 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 cb5aaacb07..044f15f8a7 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 @@ -202,16 +202,6 @@ public class FileTrustStoreImpl extends AbstractConfiguredObject getSecureOnlyMechanisms() { diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramAuthUser.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramAuthUser.java index 1f80a84e4f..b3de1d1f17 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramAuthUser.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramAuthUser.java @@ -139,12 +139,6 @@ class ScramAuthUser extends AbstractConfiguredObject implements U } - @Override - public Object getAttribute(final String name) - { - return super.getAttribute(name); - } - @Override public String getPassword() { 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 0dbf854c55..f52c1967f8 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 @@ -1032,17 +1032,6 @@ public abstract class AbstractVirtualHost> exte txn.commit(); } - - @Override - public Object getAttribute(String name) - { - if(STATE.equals(name)) - { - return getState(); - } - return super.getAttribute(name); - } - @Override public Collection getSupportedExchangeTypes() { -- cgit v1.2.1