Author: orudyy
Date: Wed Sep 24 11:16:23 2014
New Revision: 1627278
URL: http://svn.apache.org/r1627278
Log:
QPID-6114: Migrate the State member variable to AbstractConfiguredObject class
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAReplicaVirtualHost.java
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeImpl.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractPluginAdapter.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/SessionAdapter.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAliasAdapter.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaTrustStoreImpl.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramAuthUser.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/testmodel/Test2RootCategoryImpl.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/testmodel/TestChildCategoryImpl.java
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/testmodel/TestRootCategoryImpl.java
qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAReplicaVirtualHost.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAReplicaVirtualHost.java?rev=1627278&r1=1627277&r2=1627278&view=diff
==============================================================================
---
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAReplicaVirtualHost.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAReplicaVirtualHost.java
Wed Sep 24 11:16:23 2014
@@ -94,6 +94,7 @@ public class BDBHAReplicaVirtualHost ext
_dataDelivered = new StatisticsCounter("bytes-delivered-" + getName());
_messagesReceived = new StatisticsCounter("messages-received-" +
getName());
_dataReceived = new StatisticsCounter("bytes-received-" + getName());
+ setState(State.UNAVAILABLE);
}
@Override
@@ -151,12 +152,6 @@ public class BDBHAReplicaVirtualHost ext
}
@Override
- public State getState()
- {
- return State.UNAVAILABLE;
- }
-
- @Override
public Collection<String> getExchangeTypeNames()
{
return getObjectFactory().getSupportedTypes(Exchange.class);
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeImpl.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeImpl.java?rev=1627278&r1=1627277&r2=1627278&view=diff
==============================================================================
---
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeImpl.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeImpl.java
Wed Sep 24 11:16:23 2014
@@ -60,7 +60,6 @@ public class BDBHARemoteReplicationNodeI
@ManagedAttributeField(afterSet="afterSetRole")
private volatile NodeRole _role;
- private final AtomicReference<State> _state;
private final boolean _isMonitor;
private BDBHAVirtualHostNodeLogSubject _virtualHostNodeLogSubject;
private GroupLogSubject _groupLogSubject;
@@ -72,7 +71,7 @@ public class BDBHARemoteReplicationNodeI
_broker = virtualHostNode.getParent(Broker.class);
_address = (String)attributes.get(ADDRESS);
_replicatedEnvironmentFacade = replicatedEnvironmentFacade;
- _state = new AtomicReference<>(State.ACTIVE);
+ setState(State.ACTIVE);
_role = NodeRole.UNREACHABLE;
_lastKnownRole = NodeRole.UNREACHABLE;
@@ -81,12 +80,6 @@ public class BDBHARemoteReplicationNodeI
}
@Override
- public State getState()
- {
- return _state.get();
- }
-
- @Override
public String getGroupName()
{
return _replicatedEnvironmentFacade.getGroupName();
@@ -166,7 +159,7 @@ public class BDBHARemoteReplicationNodeI
try
{
_replicatedEnvironmentFacade.removeNodeFromGroup(nodeName);
- _state.set(State.DELETED);
+ setState(State.DELETED);
deleted();
}
catch(MasterStateException e)
@@ -243,14 +236,14 @@ public class BDBHARemoteReplicationNodeI
private void updateModelStateFromRole(NodeRole role)
{
- State currentState = _state.get();
+ State currentState = getState();
if (currentState == State.DELETED)
{
return;
}
boolean isActive = NodeRole.MASTER == role || NodeRole.REPLICA == role;
- _state.compareAndSet(currentState, isActive ? State.ACTIVE :
State.UNAVAILABLE);
+ setState(isActive ? State.ACTIVE : State.UNAVAILABLE);
}
@Override
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java?rev=1627278&r1=1627277&r2=1627278&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java
Wed Sep 24 11:16:23 2014
@@ -63,8 +63,6 @@ public class BindingImpl
final CopyOnWriteArrayList<StateChangeListener<BindingImpl,State>>
_stateChangeListeners =
new CopyOnWriteArrayList<StateChangeListener<BindingImpl,
State>>();
- private State _state = State.UNINITIALIZED;
-
public BindingImpl(Map<String, Object> attributes, AMQQueue queue,
ExchangeImpl exchange)
{
super(parentsMap(queue,exchange),stripEmptyArguments(enhanceWithDurable(attributes,
queue, exchange)));
@@ -227,18 +225,13 @@ public class BindingImpl
}
getEventLogger().message(_logSubject, BindingMessages.DELETED());
}
- _state = State.DELETED;
+ setState(State.DELETED);
}
@StateTransition(currentState = State.UNINITIALIZED, desiredState =
State.ACTIVE)
private void activate()
{
- _state = State.ACTIVE;
- }
-
- public State getState()
- {
- return _state;
+ setState(State.ACTIVE);
}
public void addStateChangeListener(StateChangeListener<BindingImpl,State>
listener)
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java?rev=1627278&r1=1627277&r2=1627278&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
Wed Sep 24 11:16:23 2014
@@ -107,7 +107,6 @@ public abstract class AbstractExchange<T
private final ConcurrentMap<BindingIdentifier, BindingImpl> _bindingsMap =
new ConcurrentHashMap<BindingIdentifier, BindingImpl>();
private StateChangeListener<BindingImpl, State> _bindingListener;
- private State _state = State.UNINITIALIZED;
public AbstractExchange(Map<String, Object> attributes, VirtualHostImpl
vhost)
{
@@ -760,7 +759,7 @@ public abstract class AbstractExchange<T
@StateTransition(currentState = State.UNINITIALIZED, desiredState =
State.ACTIVE)
private void activate()
{
- _state = State.ACTIVE;
+ setState(State.ACTIVE);
}
@@ -768,7 +767,7 @@ public abstract class AbstractExchange<T
private void doDeleteBeforeInitialize()
{
preSetAlternateExchange();
- _state = State.DELETED;
+ setState(State.DELETED);
}
@@ -779,7 +778,7 @@ public abstract class AbstractExchange<T
{
_virtualHost.removeExchange(this,true);
preSetAlternateExchange();
- _state = State.DELETED;
+ setState(State.DELETED);
}
catch (ExchangeIsAlternateException | RequiredExchangeException e)
{
@@ -788,12 +787,6 @@ public abstract class AbstractExchange<T
}
@Override
- public State getState()
- {
- return _state;
- }
-
- @Override
public <C extends ConfiguredObject> Collection<C> getChildren(final
Class<C> clazz)
{
if(org.apache.qpid.server.model.Binding.class.isAssignableFrom(clazz))
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java?rev=1627278&r1=1627277&r2=1627278&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
Wed Sep 24 11:16:23 2014
@@ -159,6 +159,7 @@ public abstract class AbstractConfigured
@ManagedAttributeField( afterSet = "attainStateIfResolved" )
private State _desiredState;
private boolean _openComplete;
+ private State _state = State.UNINITIALIZED;
protected static Map<Class<? extends ConfiguredObject>,
ConfiguredObject<?>> parentsMap(ConfiguredObject<?>... parents)
{
@@ -839,7 +840,7 @@ public abstract class AbstractConfigured
setAttributes(Collections.<String,
Object>singletonMap(DESIRED_STATE,
desiredState));
- if (setState(desiredState))
+ if (getState() == desiredState)
{
notifyStateChanged(state,
desiredState);
return desiredState;
@@ -853,12 +854,15 @@ public abstract class AbstractConfigured
});
}
- /**
- * @return true when the state has been successfully updated to
desiredState or false otherwise
- */
- protected boolean setState(State desiredState)
+ @Override
+ public State getState()
+ {
+ return _state;
+ }
+
+ protected void setState(State state)
{
- return getState() == desiredState;
+ _state = state;
}
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java?rev=1627278&r1=1627277&r2=1627278&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java
Wed Sep 24 11:16:23 2014
@@ -75,7 +75,7 @@ public abstract class AbstractSystemConf
}
@Override
- protected boolean setState(final State desiredState)
+ protected void setState(final State desiredState)
{
throw new IllegalArgumentException("Cannot change the state of the
SystemContext object");
}
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractPluginAdapter.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractPluginAdapter.java?rev=1627278&r1=1627277&r2=1627278&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractPluginAdapter.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractPluginAdapter.java
Wed Sep 24 11:16:23 2014
@@ -36,7 +36,6 @@ import org.apache.qpid.server.security.a
public abstract class AbstractPluginAdapter<X extends Plugin<X>> extends
AbstractConfiguredObject<X> implements Plugin<X>
{
private Broker _broker;
- private State _state = State.UNINITIALIZED;
protected AbstractPluginAdapter(Map<String, Object> attributes, Broker
broker)
{
@@ -66,17 +65,6 @@ public abstract class AbstractPluginAdap
}
@Override
- public State getState()
- {
- return _state;
- }
-
- protected void setCurrentState(State state)
- {
- _state = state;
- }
-
- @Override
public <C extends ConfiguredObject> Collection<C> getChildren(Class<C>
clazz)
{
return Collections.emptyList();
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java?rev=1627278&r1=1627277&r2=1627278&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
Wed Sep 24 11:16:23 2014
@@ -99,8 +99,6 @@ public class BrokerAdapter extends Abstr
@ManagedAttributeField
private String _confidentialConfigurationEncryptionProvider;
- private State _state = State.UNINITIALIZED;
-
@ManagedObjectFactoryConstructor
public BrokerAdapter(Map<String, Object> attributes,
SystemConfig parent)
@@ -273,7 +271,7 @@ public class BrokerAdapter extends Abstr
_eventLogger.message(BrokerMessages.MANAGEMENT_MODE(BrokerOptions.MANAGEMENT_MODE_USER_NAME,
_brokerOptions.getManagementModePassword()));
}
- _state = State.ACTIVE;
+ setState(State.ACTIVE);
}
private void initialiseStatisticsReporting()
@@ -500,11 +498,6 @@ public class BrokerAdapter extends Abstr
return virtualHostNode;
}
- public State getState()
- {
- return _state;
- }
-
@Override
public long getBytesIn()
{
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java?rev=1627278&r1=1627277&r2=1627278&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java
Wed Sep 24 11:16:23 2014
@@ -52,8 +52,6 @@ public final class ConnectionAdapter ext
private final AtomicBoolean _underlyingClosed = new AtomicBoolean(false);
private AMQConnectionModel _underlyingConnection;
- private State _state = State.ACTIVE;
-
public ConnectionAdapter(final AMQConnectionModel conn)
{
super(parentsMap(conn.getVirtualHost()),createAttributes(conn));
@@ -73,6 +71,7 @@ public final class ConnectionAdapter ext
conn.addDeleteTask(_underlyingConnectionDeleteTask);
conn.addSessionListener(this);
+ setState(State.ACTIVE);
}
private static Map<String, Object> createAttributes(final
AMQConnectionModel _connection)
@@ -161,7 +160,7 @@ public final class ConnectionAdapter ext
{
closeUnderlyingConnection();
deleted();
- _state = State.DELETED;
+ setState(State.DELETED);
}
@Override
@@ -170,11 +169,6 @@ public final class ConnectionAdapter ext
closeUnderlyingConnection();
}
- public State getState()
- {
- return _state;
- }
-
@Override
public <C extends ConfiguredObject> C addChild(Class<C> childClass,
Map<String, Object> attributes, ConfiguredObject... otherParents)
{
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java?rev=1627278&r1=1627277&r2=1627278&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
Wed Sep 24 11:16:23 2014
@@ -61,7 +61,6 @@ public class FileBasedGroupProviderImpl
private static Logger LOGGER =
Logger.getLogger(FileBasedGroupProviderImpl.class);
private final Broker<?> _broker;
- private AtomicReference<State> _state;
private FileGroupDatabase _groupDatabase;
@@ -76,9 +75,6 @@ public class FileBasedGroupProviderImpl
_broker = broker;
-
- State state = MapValueConverter.getEnumAttribute(State.class, STATE,
attributes, State.UNINITIALIZED);
- _state = new AtomicReference<State>(state);
}
public void onValidate()
@@ -202,13 +198,6 @@ public class FileBasedGroupProviderImpl
}
@Override
- public State getState()
- {
- return _state.get();
- }
-
-
- @Override
public Object getAttribute(String name)
{
if (STATE.equals(name))
@@ -277,11 +266,11 @@ public class FileBasedGroupProviderImpl
try
{
_groupDatabase.setGroupFile(getPath());
- _state.set(State.ACTIVE);
+ setState(State.ACTIVE);
}
catch(IOException | RuntimeException e)
{
- _state.set(State.ERRORED);
+ setState(State.ERRORED);
if (_broker.isManagementMode())
{
LOGGER.warn("Failed to activate group provider: " + getName(),
e);
@@ -302,13 +291,13 @@ public class FileBasedGroupProviderImpl
}
deleted();
- _state.set(State.DELETED);
+ setState(State.DELETED);
}
@StateTransition( currentState = State.UNINITIALIZED, desiredState =
State.QUIESCED)
private void startQuiesced()
{
- _state.set(State.QUIESCED);
+ setState(State.QUIESCED);
}
public Set<Principal> getGroupPrincipalsForUser(String username)
@@ -364,21 +353,12 @@ public class FileBasedGroupProviderImpl
private class GroupAdapter extends AbstractConfiguredObject<GroupAdapter>
implements Group<GroupAdapter>
{
- private State _state = State.UNINITIALIZED;
public GroupAdapter(Map<String, Object> attributes)
{
super(parentsMap(FileBasedGroupProviderImpl.this), attributes);
}
-
- @Override
- public State getState()
- {
- return _state;
- }
-
-
@Override
public void onValidate()
{
@@ -392,7 +372,7 @@ public class FileBasedGroupProviderImpl
@StateTransition( currentState = State.UNINITIALIZED, desiredState =
State.ACTIVE )
private void activate()
{
- _state = State.ACTIVE;
+ setState(State.ACTIVE);
}
@Override
@@ -476,15 +456,13 @@ public class FileBasedGroupProviderImpl
getSecurityManager().authoriseGroupOperation(Operation.DELETE,
getName());
_groupDatabase.removeGroup(getName());
deleted();
- _state = State.DELETED;
+ setState(State.DELETED);
}
private class GroupMemberAdapter extends
AbstractConfiguredObject<GroupMemberAdapter> implements
GroupMember<GroupMemberAdapter>
{
- private State _state = State.UNINITIALIZED;
-
public GroupMemberAdapter(Map<String, Object> attrMap)
{
// TODO - need to relate to the User object
@@ -513,12 +491,6 @@ public class FileBasedGroupProviderImpl
}
@Override
- public State getState()
- {
- return _state;
- }
-
- @Override
public <C extends ConfiguredObject> Collection<C> getChildren(
Class<C> clazz)
{
@@ -528,7 +500,7 @@ public class FileBasedGroupProviderImpl
@StateTransition(currentState = State.UNINITIALIZED, desiredState
= State.ACTIVE)
private void activate()
{
- _state = State.ACTIVE;
+ setState(State.ACTIVE);
}
@StateTransition(currentState = State.ACTIVE, desiredState =
State.DELETED)
@@ -538,7 +510,7 @@ public class FileBasedGroupProviderImpl
_groupDatabase.removeUserFromGroup(getName(),
GroupAdapter.this.getName());
deleted();
- _state = State.DELETED;
+ setState(State.DELETED);
}
}
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java?rev=1627278&r1=1627277&r2=1627278&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java
Wed Sep 24 11:16:23 2014
@@ -60,7 +60,6 @@ public class FileSystemPreferencesProvid
private static final Logger LOGGER =
Logger.getLogger(FileSystemPreferencesProviderImpl.class);
private final AuthenticationProvider<? extends AuthenticationProvider>
_authenticationProvider;
- private State _state = State.UNINITIALIZED;
private FileSystemPreferencesStore _store;
@@ -86,11 +85,11 @@ public class FileSystemPreferencesProvid
createStoreIfNotExist();
_store.open();
_open = true;
- _state = State.ACTIVE;
+ setState(State.ACTIVE);
}
catch( RuntimeException e )
{
- _state = State.ERRORED;
+ setState(State.ERRORED);
}
}
@@ -111,12 +110,6 @@ public class FileSystemPreferencesProvid
}
@Override
- public State getState()
- {
- return _state;
- }
-
- @Override
public <C extends ConfiguredObject> Collection<C> getChildren(Class<C>
clazz)
{
return Collections.emptySet();
@@ -147,7 +140,7 @@ public class FileSystemPreferencesProvid
{
_store.close();
}
- _state = State.QUIESCED;
+ setState(State.QUIESCED);
}
@StateTransition(currentState = { State.ACTIVE, State.QUIESCED,
State.ERRORED }, desiredState = State.DELETED )
@@ -162,14 +155,14 @@ public class FileSystemPreferencesProvid
_authenticationProvider.setPreferencesProvider(null);
}
- _state = State.DELETED;
+ setState(State.DELETED);
}
@StateTransition(currentState = { State.QUIESCED, State.ERRORED },
desiredState = State.ACTIVE )
private void restart()
{
_store.open();
- _state = State.ACTIVE;
+ setState(State.ACTIVE);
}
@Override
@@ -210,7 +203,7 @@ public class FileSystemPreferencesProvid
super.changeAttributes(attributes);
// if provider was previously in ERRORED state then set its state to
ACTIVE
- if(_state == State.ERRORED)
+ if(getState() == State.ERRORED)
{
onOpen();
}
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/SessionAdapter.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/SessionAdapter.java?rev=1627278&r1=1627277&r2=1627278&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/SessionAdapter.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/SessionAdapter.java
Wed Sep 24 11:16:23 2014
@@ -42,8 +42,6 @@ final class SessionAdapter extends Abstr
{
// Attributes
private final AMQSessionModel _session;
- private State _state = State.ACTIVE;
-
public SessionAdapter(final ConnectionAdapter connectionAdapter,
final AMQSessionModel session)
@@ -75,7 +73,7 @@ final class SessionAdapter extends Abstr
deleted();
}
});
-
+ setState(State.ACTIVE);
}
private static Map<String, Object> createAttributes(final AMQSessionModel
session)
@@ -110,11 +108,6 @@ final class SessionAdapter extends Abstr
return Collections.emptySet(); //TODO
}
- public State getState()
- {
- return _state;
- }
-
@Override
public Object getAttribute(String name)
{
@@ -188,8 +181,8 @@ final class SessionAdapter extends Abstr
@StateTransition(currentState = State.ACTIVE, desiredState = State.DELETED)
private void doDelete()
{
- _state = State.DELETED;
deleted();
+ setState(State.DELETED);
}
}
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAliasAdapter.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAliasAdapter.java?rev=1627278&r1=1627277&r2=1627278&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAliasAdapter.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAliasAdapter.java
Wed Sep 24 11:16:23 2014
@@ -45,6 +45,7 @@ public class VirtualHostAliasAdapter ext
super(parentsMap(virtualHost,port), createAttributes(virtualHost,
port));
_vhost = virtualHost;
_port = port;
+ setState(State.ACTIVE);
}
private static Map<String, Object> createAttributes(final VirtualHost
virtualHost, final Port port)
@@ -75,12 +76,6 @@ public class VirtualHostAliasAdapter ext
}
@Override
- public State getState()
- {
- return State.ACTIVE; // TODO - Implement
- }
-
- @Override
public <C extends ConfiguredObject> Collection<C> getChildren(Class<C>
clazz)
{
return Collections.emptySet();
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java?rev=1627278&r1=1627277&r2=1627278&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java
Wed Sep 24 11:16:23 2014
@@ -118,7 +118,6 @@ abstract public class AbstractPort<X ext
}
private final Broker<?> _broker;
- private State _state = State.UNINITIALIZED;
@ManagedAttributeField
private int _port;
@@ -299,13 +298,6 @@ abstract public class AbstractPort<X ext
}
@Override
- public State getState()
- {
- return _state;
- }
-
-
- @Override
public <C extends ConfiguredObject> Collection<C> getChildren(Class<C>
clazz)
{
if(clazz == Connection.class)
@@ -332,7 +324,7 @@ abstract public class AbstractPort<X ext
private void doDelete()
{
close();
- _state = State.DELETED;
+ setState(State.DELETED);
}
@StateTransition( currentState = {State.UNINITIALIZED, State.QUIESCED},
desiredState = State.ACTIVE )
@@ -340,11 +332,11 @@ abstract public class AbstractPort<X ext
{
try
{
- _state = onActivate();
+ setState(onActivate());
}
catch (RuntimeException e)
{
- _state = State.ERRORED;
+ setState(State.ERRORED);
LOGGER.error("Unable to active port '" + getName() + "'of type " +
getType() + " on port " + getPort(),
e);
}
@@ -353,7 +345,7 @@ abstract public class AbstractPort<X ext
@StateTransition( currentState = State.UNINITIALIZED, desiredState =
State.QUIESCED)
private void startQuiesced()
{
- _state = State.QUIESCED;
+ setState(State.QUIESCED);
}
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java?rev=1627278&r1=1627277&r2=1627278&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
Wed Sep 24 11:16:23 2014
@@ -241,8 +241,6 @@ public abstract class AbstractQueue<X ex
@ManagedAttributeField
private long _maximumMessageTtl;
-
- private State _state = State.UNINITIALIZED;
private final AtomicBoolean _recovering = new AtomicBoolean(true);
private final ConcurrentLinkedQueue<EnqueueRequest> _postRecoveryQueue =
new ConcurrentLinkedQueue<>();
@@ -2814,14 +2812,14 @@ public abstract class AbstractQueue<X ex
@StateTransition(currentState = State.UNINITIALIZED, desiredState =
State.ACTIVE)
private void activate()
{
- _state = State.ACTIVE;
+ setState(State.ACTIVE);
}
@StateTransition(currentState = State.UNINITIALIZED, desiredState =
State.DELETED)
private void doDeleteBeforeInitialize()
{
preSetAlternateExchange();
- _state = State.DELETED;
+ setState(State.DELETED);
}
@StateTransition(currentState = State.ACTIVE, desiredState = State.DELETED)
@@ -2829,7 +2827,7 @@ public abstract class AbstractQueue<X ex
{
_virtualHost.removeQueue(this);
preSetAlternateExchange();
- _state = State.DELETED;
+ setState(State.DELETED);
}
@@ -2876,12 +2874,6 @@ public abstract class AbstractQueue<X ex
}
@Override
- public State getState()
- {
- return _state;
- }
-
- @Override
public <C extends ConfiguredObject> Collection<C> getChildren(final
Class<C> clazz)
{
if(clazz == Binding.class)
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java?rev=1627278&r1=1627277&r2=1627278&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java
Wed Sep 24 11:16:23 2014
@@ -289,6 +289,7 @@ class QueueConsumerImpl
_target.queueEmpty();
}
+ @Override
public State getState()
{
return STATE_MAP.get(_target.getState());
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java?rev=1627278&r1=1627277&r2=1627278&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java
Wed Sep 24 11:16:23 2014
@@ -45,6 +45,7 @@ import org.apache.qpid.server.model.Mana
import org.apache.qpid.server.model.ManagedObjectFactoryConstructor;
import org.apache.qpid.server.model.Port;
import org.apache.qpid.server.model.State;
+import org.apache.qpid.server.model.StateTransition;
import org.apache.qpid.server.security.access.Operation;
import org.apache.qpid.server.util.ServerScopedRuntimeException;
import org.apache.qpid.transport.network.security.ssl.QpidClientX509KeyManager;
@@ -86,12 +87,6 @@ public class FileKeyStoreImpl extends Ab
}
@Override
- public State getState()
- {
- return State.ACTIVE;
- }
-
- @Override
public Object getAttribute(String name)
{
if(KeyStore.STATE.equals(name))
@@ -102,27 +97,28 @@ public class FileKeyStoreImpl extends Ab
return super.getAttribute(name);
}
- @Override
- protected boolean setState(State desiredState)
+ @StateTransition(currentState = {State.ACTIVE, State.ERRORED},
desiredState = State.DELETED)
+ protected void doDelete()
{
- if(desiredState == State.DELETED)
- {
- // verify that it is not in use
- String storeName = getName();
+ // verify that it is not in use
+ String storeName = getName();
- Collection<Port> ports = new ArrayList<Port>(_broker.getPorts());
- for (Port port : ports)
+ Collection<Port> ports = new ArrayList<Port>(_broker.getPorts());
+ for (Port port : ports)
+ {
+ if (port.getKeyStore() == this)
{
- if (port.getKeyStore() == this)
- {
- throw new IntegrityViolationException("Key store '" +
storeName + "' can't be deleted as it is in use by a port:" + port.getName());
- }
+ throw new IntegrityViolationException("Key store '" +
storeName + "' can't be deleted as it is in use by a port:" + port.getName());
}
- deleted();
- return true;
}
+ deleted();
+ setState(State.DELETED);
+ }
- return false;
+ @StateTransition(currentState = {State.UNINITIALIZED, State.ERRORED},
desiredState = State.ACTIVE)
+ protected void doActivate()
+ {
+ setState(State.ACTIVE);
}
@Override
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java?rev=1627278&r1=1627277&r2=1627278&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java
Wed Sep 24 11:16:23 2014
@@ -44,6 +44,7 @@ import org.apache.qpid.server.model.Mana
import org.apache.qpid.server.model.ManagedObjectFactoryConstructor;
import org.apache.qpid.server.model.Port;
import org.apache.qpid.server.model.State;
+import org.apache.qpid.server.model.StateTransition;
import org.apache.qpid.server.model.TrustStore;
import org.apache.qpid.server.security.access.Operation;
import
org.apache.qpid.server.security.auth.manager.SimpleLDAPAuthenticationManager;
@@ -85,60 +86,56 @@ public class FileTrustStoreImpl extends
}
}
- @Override
- public State getState()
+ @StateTransition(currentState = {State.ACTIVE, State.ERRORED},
desiredState = State.DELETED)
+ protected void doDelete()
{
- return State.ACTIVE;
- }
+ // verify that it is not in use
+ String storeName = getName();
- @Override
- protected boolean setState(State desiredState)
- {
- if(desiredState == State.DELETED)
+ Collection<Port<?>> ports = new ArrayList<Port<?>>(_broker.getPorts());
+ for (Port port : ports)
{
- // verify that it is not in use
- String storeName = getName();
-
- Collection<Port<?>> ports = new
ArrayList<Port<?>>(_broker.getPorts());
- for (Port port : ports)
+ Collection<TrustStore> trustStores = port.getTrustStores();
+ if(trustStores != null)
{
- Collection<TrustStore> trustStores = port.getTrustStores();
- if(trustStores != null)
+ for (TrustStore store : trustStores)
{
- for (TrustStore store : trustStores)
+ if(storeName.equals(store.getAttribute(TrustStore.NAME)))
{
-
if(storeName.equals(store.getAttribute(TrustStore.NAME)))
- {
- throw new IntegrityViolationException("Trust store
'"
- + storeName
- + "' can't
be deleted as it is in use by a port: "
- +
port.getName());
- }
+ throw new IntegrityViolationException("Trust store '"
+ + storeName
+ + "' can't be deleted as it is in use by a
port: "
+ + port.getName());
}
}
}
+ }
- Collection<AuthenticationProvider> authenticationProviders = new
ArrayList<AuthenticationProvider>(_broker.getAuthenticationProviders());
- for (AuthenticationProvider authProvider : authenticationProviders)
+ Collection<AuthenticationProvider> authenticationProviders = new
ArrayList<AuthenticationProvider>(_broker.getAuthenticationProviders());
+ for (AuthenticationProvider authProvider : authenticationProviders)
+ {
+
if(authProvider.getAttributeNames().contains(SimpleLDAPAuthenticationManager.TRUST_STORE))
{
-
if(authProvider.getAttributeNames().contains(SimpleLDAPAuthenticationManager.TRUST_STORE))
- {
- Object attributeType =
authProvider.getAttribute(AuthenticationProvider.TYPE);
- Object attributeValue =
authProvider.getAttribute(SimpleLDAPAuthenticationManager.TRUST_STORE);
- if
(SimpleLDAPAuthenticationManager.PROVIDER_TYPE.equals(attributeType)
+ Object attributeType =
authProvider.getAttribute(AuthenticationProvider.TYPE);
+ Object attributeValue =
authProvider.getAttribute(SimpleLDAPAuthenticationManager.TRUST_STORE);
+ if
(SimpleLDAPAuthenticationManager.PROVIDER_TYPE.equals(attributeType)
&& storeName.equals(attributeValue))
- {
- throw new IntegrityViolationException("Trust store '"
- + storeName
- + "' can't be
deleted as it is in use by an authentication manager: "
- +
authProvider.getName());
- }
+ {
+ throw new IntegrityViolationException("Trust store '"
+ + storeName
+ + "' can't be deleted as it is in use by an
authentication manager: "
+ + authProvider.getName());
}
}
- deleted();
- return true;
}
- return false;
+ deleted();
+ setState(State.DELETED);
+ }
+
+ @StateTransition(currentState = {State.UNINITIALIZED, State.ERRORED},
desiredState = State.ACTIVE)
+ protected void doActivate()
+ {
+ setState(State.ACTIVE);
}
@Override
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java?rev=1627278&r1=1627277&r2=1627278&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java
Wed Sep 24 11:16:23 2014
@@ -70,6 +70,7 @@ import org.apache.qpid.server.model.Mana
import org.apache.qpid.server.model.ManagedObjectFactoryConstructor;
import org.apache.qpid.server.model.Port;
import org.apache.qpid.server.model.State;
+import org.apache.qpid.server.model.StateTransition;
import org.apache.qpid.server.security.access.Operation;
import org.apache.qpid.server.util.urlstreamhandler.data.Handler;
@@ -183,12 +184,6 @@ public class NonJavaKeyStoreImpl extends
}
@Override
- public State getState()
- {
- return State.ACTIVE;
- }
-
- @Override
public Object getAttribute(String name)
{
if (KeyStore.STATE.equals(name))
@@ -199,30 +194,31 @@ public class NonJavaKeyStoreImpl extends
return super.getAttribute(name);
}
- @Override
- protected boolean setState(State desiredState)
+ @StateTransition(currentState = {State.ACTIVE, State.ERRORED},
desiredState = State.DELETED)
+ protected void doDelete()
{
- if (desiredState == State.DELETED)
- {
- // verify that it is not in use
- String storeName = getName();
+ // verify that it is not in use
+ String storeName = getName();
- Collection<Port> ports = new ArrayList<Port>(_broker.getPorts());
- for (Port port : ports)
+ Collection<Port> ports = new ArrayList<Port>(_broker.getPorts());
+ for (Port port : ports)
+ {
+ if (port.getKeyStore() == this)
{
- if (port.getKeyStore() == this)
- {
- throw new IntegrityViolationException("Key store '"
- + storeName
- + "' can't be
deleted as it is in use by a port:"
- + port.getName());
- }
+ throw new IntegrityViolationException("Key store '"
+ + storeName
+ + "' can't be deleted as it is in use by a port:"
+ + port.getName());
}
- deleted();
- return true;
}
+ deleted();
+ setState(State.DELETED);
+ }
- return false;
+ @StateTransition(currentState = {State.UNINITIALIZED, State.ERRORED},
desiredState = State.ACTIVE)
+ protected void doActivate()
+ {
+ setState(State.ACTIVE);
}
@Override
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaTrustStoreImpl.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaTrustStoreImpl.java?rev=1627278&r1=1627277&r2=1627278&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaTrustStoreImpl.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaTrustStoreImpl.java
Wed Sep 24 11:16:23 2014
@@ -49,6 +49,7 @@ import org.apache.log4j.Logger;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.model.AbstractConfiguredObject;
+import org.apache.qpid.server.model.AuthenticationProvider;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.IntegrityViolationException;
@@ -58,7 +59,10 @@ import org.apache.qpid.server.model.Mana
import org.apache.qpid.server.model.ManagedObjectFactoryConstructor;
import org.apache.qpid.server.model.Port;
import org.apache.qpid.server.model.State;
+import org.apache.qpid.server.model.StateTransition;
+import org.apache.qpid.server.model.TrustStore;
import org.apache.qpid.server.security.access.Operation;
+import
org.apache.qpid.server.security.auth.manager.SimpleLDAPAuthenticationManager;
import org.apache.qpid.server.util.urlstreamhandler.data.Handler;
@ManagedObject( category = false )
@@ -168,12 +172,6 @@ public class NonJavaTrustStoreImpl
}
@Override
- public State getState()
- {
- return State.ACTIVE;
- }
-
- @Override
public Object getAttribute(String name)
{
if (KeyStore.STATE.equals(name))
@@ -184,30 +182,56 @@ public class NonJavaTrustStoreImpl
return super.getAttribute(name);
}
- @Override
- protected boolean setState(State desiredState)
+ @StateTransition(currentState = {State.ACTIVE, State.ERRORED},
desiredState = State.DELETED)
+ protected void doDelete()
{
- if (desiredState == State.DELETED)
+ // verify that it is not in use
+ String storeName = getName();
+
+ Collection<Port<?>> ports = new ArrayList<Port<?>>(_broker.getPorts());
+ for (Port port : ports)
{
- // verify that it is not in use
- String storeName = getName();
+ Collection<TrustStore> trustStores = port.getTrustStores();
+ if(trustStores != null)
+ {
+ for (TrustStore store : trustStores)
+ {
+ if(storeName.equals(store.getAttribute(TrustStore.NAME)))
+ {
+ throw new IntegrityViolationException("Trust store '"
+ + storeName
+ + "' can't be deleted as it is in use by a
port: "
+ + port.getName());
+ }
+ }
+ }
+ }
- Collection<Port> ports = new ArrayList<Port>(_broker.getPorts());
- for (Port port : ports)
+ Collection<AuthenticationProvider> authenticationProviders = new
ArrayList<AuthenticationProvider>(_broker.getAuthenticationProviders());
+ for (AuthenticationProvider authProvider : authenticationProviders)
+ {
+
if(authProvider.getAttributeNames().contains(SimpleLDAPAuthenticationManager.TRUST_STORE))
{
- if (port.getKeyStore() == this)
+ Object attributeType =
authProvider.getAttribute(AuthenticationProvider.TYPE);
+ Object attributeValue =
authProvider.getAttribute(SimpleLDAPAuthenticationManager.TRUST_STORE);
+ if
(SimpleLDAPAuthenticationManager.PROVIDER_TYPE.equals(attributeType)
+ && storeName.equals(attributeValue))
{
- throw new IntegrityViolationException("Key store '"
- + storeName
- + "' can't be
deleted as it is in use by a port:"
- + port.getName());
+ throw new IntegrityViolationException("Trust store '"
+ + storeName
+ + "' can't be deleted as it is in use by an
authentication manager: "
+ + authProvider.getName());
}
}
- deleted();
- return true;
}
+ deleted();
+ setState(State.DELETED);
+ }
- return false;
+ @StateTransition(currentState = {State.UNINITIALIZED, State.ERRORED},
desiredState = State.ACTIVE)
+ protected void doActivate()
+ {
+ setState(State.ACTIVE);
}
@Override
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java?rev=1627278&r1=1627277&r2=1627278&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java
Wed Sep 24 11:16:23 2014
@@ -27,7 +27,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.atomic.AtomicReference;
import org.apache.log4j.Logger;
@@ -56,7 +55,6 @@ public abstract class AbstractAuthentica
private final Broker _broker;
private PreferencesProvider _preferencesProvider;
- private AtomicReference<State> _state = new
AtomicReference<State>(State.UNINITIALIZED);
@ManagedAttributeField
private List<String> _secureOnlyMechanisms;
@@ -139,12 +137,6 @@ public abstract class AbstractAuthentica
throw new IllegalConfigurationException("Cannot associate " + user +
" with authentication provider " + this);
}
- @Override
- public State getState()
- {
- return _state.get();
- }
-
@SuppressWarnings("unchecked")
@Override
public <C extends ConfiguredObject> C addChild(Class<C> childClass,
Map<String, Object> attributes, ConfiguredObject... otherParents)
@@ -185,7 +177,7 @@ public abstract class AbstractAuthentica
@StateTransition( currentState = State.UNINITIALIZED, desiredState =
State.QUIESCED )
protected void startQuiesced()
{
- _state.set(State.QUIESCED);
+ setState(State.QUIESCED);
}
@StateTransition( currentState = { State.UNINITIALIZED, State.QUIESCED,
State.QUIESCED }, desiredState = State.ACTIVE )
@@ -193,11 +185,11 @@ public abstract class AbstractAuthentica
{
try
{
- _state.set(State.ACTIVE);
+ setState(State.ACTIVE);
}
catch(RuntimeException e)
{
- _state.set(State.ERRORED);
+ setState(State.ERRORED);
if (_broker.isManagementMode())
{
LOGGER.warn("Failed to activate authentication provider: " +
getName(), e);
@@ -234,16 +226,10 @@ public abstract class AbstractAuthentica
}
deleted();
- _state.set(State.DELETED);
+ setState(State.DELETED);
}
-
- protected boolean updateState(State from, State to)
- {
- return _state.compareAndSet(from, to);
- }
-
@Override
public Object getAttribute(final String name)
{
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java?rev=1627278&r1=1627277&r2=1627278&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
Wed Sep 24 11:16:23 2014
@@ -117,7 +117,7 @@ public abstract class PrincipalDatabaseA
}
catch(IllegalConfigurationException e)
{
- updateState(getState(), State.ERRORED);
+ setState(State.ERRORED);
}
}
@@ -378,7 +378,7 @@ public abstract class PrincipalDatabaseA
{
initialise();
// if provider was previously in ERRORED state then set its
state to ACTIVE
- updateState(State.ERRORED, State.ACTIVE);
+ setState(State.ACTIVE);
}
catch(RuntimeException e)
{
@@ -396,8 +396,6 @@ public abstract class PrincipalDatabaseA
{
private final Principal _user;
- private State _state = State.UNINITIALIZED;
-
@ManagedAttributeField
private String _password;
@@ -447,13 +445,6 @@ public abstract class PrincipalDatabaseA
}
}
-
- @Override
- public State getState()
- {
- return _state;
- }
-
@Override
public boolean changeAttribute(String name, Object expected, Object
desired)
throws IllegalStateException, AccessControlException,
IllegalArgumentException
@@ -469,7 +460,7 @@ public abstract class PrincipalDatabaseA
@StateTransition(currentState = State.UNINITIALIZED, desiredState =
State.ACTIVE)
private void activate()
{
- _state = State.ACTIVE;
+ setState(State.ACTIVE);
}
@StateTransition(currentState = State.ACTIVE, desiredState =
State.DELETED)
@@ -485,7 +476,7 @@ public abstract class PrincipalDatabaseA
preferencesProvider.deletePreferences(userName);
}
deleted();
- _state = State.DELETED;
+ setState(State.DELETED);
}
catch (AccountNotFoundException e)
{
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramAuthUser.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramAuthUser.java?rev=1627278&r1=1627277&r2=1627278&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramAuthUser.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramAuthUser.java
Wed Sep 24 11:16:23 2014
@@ -59,7 +59,7 @@ class ScramAuthUser extends AbstractConf
{
throw new IllegalArgumentException("Scram SHA1 user names are
restricted to characters in the ASCII charset");
}
-
+ setState(State.ACTIVE);
}
@Override
@@ -168,12 +168,6 @@ class ScramAuthUser extends AbstractConf
}
@Override
- public State getState()
- {
- return State.ACTIVE;
- }
-
- @Override
public <C extends ConfiguredObject> Collection<C> getChildren(final
Class<C> clazz)
{
return Collections.emptySet();
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java?rev=1627278&r1=1627277&r2=1627278&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
Wed Sep 24 11:16:23 2014
@@ -114,8 +114,6 @@ public abstract class AbstractVirtualHos
private final SystemNodeRegistry _systemNodeRegistry = new
SystemNodeRegistry();
- private final AtomicReference<State> _state = new
AtomicReference<>(State.UNINITIALIZED);
-
private final StatisticsCounter _messagesDelivered, _dataDelivered,
_messagesReceived, _dataReceived;
private final Map<String, LinkRegistry> _linkRegistry = new
HashMap<String, LinkRegistry>();
@@ -263,9 +261,9 @@ public abstract class AbstractVirtualHos
private void checkVHostStateIsActive()
{
- if (_state.get() != State.ACTIVE)
+ if (getState() != State.ACTIVE)
{
- throw new IllegalStateException("The virtual host state of " +
_state.get()
+ throw new IllegalStateException("The virtual host state of " +
getState()
+ " does not permit this
operation.");
}
}
@@ -351,16 +349,6 @@ public abstract class AbstractVirtualHos
}
@Override
- public State getState()
- {
- if(_deleted.get())
- {
- return State.DELETED;
- }
- return _state.get();
- }
-
- @Override
public <C extends ConfiguredObject> Collection<C> getChildren(Class<C>
clazz)
{
if(clazz == VirtualHostAlias.class)
@@ -1157,8 +1145,7 @@ public abstract class AbstractVirtualHos
closeChildren();
shutdownHouseKeeping();
closeMessageStore();
- _state.set(State.STOPPED);
-
+ setState(State.STOPPED);
}
@StateTransition( currentState = { State.ACTIVE, State.ERRORED },
desiredState = State.DELETED )
@@ -1183,6 +1170,7 @@ public abstract class AbstractVirtualHos
}
}
deleted();
+ setState(State.DELETED);
}
}
@@ -1419,8 +1407,8 @@ public abstract class AbstractVirtualHos
}
finally
{
- _state.set(finalState);
- reportIfError(_state.get());
+ setState(finalState);
+ reportIfError(getState());
}
}
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java?rev=1627278&r1=1627277&r2=1627278&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java
Wed Sep 24 11:16:23 2014
@@ -76,7 +76,6 @@ public abstract class AbstractVirtualHos
}
private final Broker<?> _broker;
- private final AtomicReference<State> _state = new
AtomicReference<State>(State.UNINITIALIZED);
private final EventLogger _eventLogger;
private DurableConfigurationStore _durableConfigurationStore;
@@ -106,12 +105,6 @@ public abstract class AbstractVirtualHos
}
@Override
- public State getState()
- {
- return _state.get();
- }
-
- @Override
public LifetimePolicy getLifetimePolicy()
{
return LifetimePolicy.PERMANENT;
@@ -124,11 +117,11 @@ public abstract class AbstractVirtualHos
try
{
activate();
- _state.set(State.ACTIVE);
+ setState(State.ACTIVE);
}
catch(RuntimeException e)
{
- _state.set(State.ERRORED);
+ setState(State.ERRORED);
if (_broker.isManagementMode())
{
LOGGER.warn("Failed to make " + this + " active.", e);
@@ -187,7 +180,7 @@ public abstract class AbstractVirtualHos
@StateTransition( currentState = { State.ACTIVE, State.STOPPED,
State.ERRORED}, desiredState = State.DELETED )
protected void doDelete()
{
- _state.set(State.DELETED);
+ setState(State.DELETED);
deleteVirtualHostIfExists();
close();
deleted();
@@ -213,7 +206,7 @@ public abstract class AbstractVirtualHos
{
closeChildren();
closeConfigurationStore();
- _state.set(stoppedState);
+ setState(stoppedState);
}
@Override
Modified:
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/testmodel/Test2RootCategoryImpl.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/testmodel/Test2RootCategoryImpl.java?rev=1627278&r1=1627277&r2=1627278&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/testmodel/Test2RootCategoryImpl.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/testmodel/Test2RootCategoryImpl.java
Wed Sep 24 11:16:23 2014
@@ -74,12 +74,6 @@ public class Test2RootCategoryImpl exten
}
@Override
- protected boolean setState(final State desiredState)
- {
- return false;
- }
-
- @Override
public String getAutomatedPersistedValue()
{
return _automatedPersistedValue;
@@ -121,12 +115,6 @@ public class Test2RootCategoryImpl exten
return _mapValue;
}
- @Override
- public State getState()
- {
- return null;
- }
-
public static Collection<String> functionGeneratedValidValues()
{
return Collections.singleton("generated");
Modified:
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/testmodel/TestChildCategoryImpl.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/testmodel/TestChildCategoryImpl.java?rev=1627278&r1=1627277&r2=1627278&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/testmodel/TestChildCategoryImpl.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/testmodel/TestChildCategoryImpl.java
Wed Sep 24 11:16:23 2014
@@ -52,14 +52,6 @@ public class TestChildCategoryImpl
}
@Override
- public State getState()
- {
- return null;
- }
-
-
-
- @Override
public String getValidValueNotInterpolated()
{
return _validValueNotInterpolated;
Modified:
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/testmodel/TestRootCategoryImpl.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/testmodel/TestRootCategoryImpl.java?rev=1627278&r1=1627277&r2=1627278&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/testmodel/TestRootCategoryImpl.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/testmodel/TestRootCategoryImpl.java
Wed Sep 24 11:16:23 2014
@@ -72,11 +72,6 @@ public class TestRootCategoryImpl extend
super(parentsMap(), attributes, taskExecutor);
}
- @Override
- protected boolean setState(final State desiredState)
- {
- return false;
- }
@Override
public String getAutomatedPersistedValue()
@@ -109,12 +104,6 @@ public class TestRootCategoryImpl extend
}
@Override
- public State getState()
- {
- return null;
- }
-
- @Override
public String getValidValue()
{
return _validValue;
Modified:
qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java?rev=1627278&r1=1627277&r2=1627278&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java
(original)
+++
qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java
Wed Sep 24 11:16:23 2014
@@ -49,8 +49,6 @@ public class ACLFileAccessControlProvide
protected DefaultAccessControl _accessControl;
protected final Broker _broker;
- private AtomicReference<State> _state = new
AtomicReference<>(State.UNINITIALIZED);
-
@ManagedAttributeField
private String _path;
@@ -98,12 +96,6 @@ public class ACLFileAccessControlProvide
}
@Override
- public State getState()
- {
- return _state.get();
- }
-
- @Override
public <C extends ConfiguredObject> Collection<C> getChildren(Class<C>
clazz)
{
return Collections.emptySet();
@@ -116,18 +108,18 @@ public class ACLFileAccessControlProvide
if(_broker.isManagementMode())
{
- _state.set(_accessControl.validate() ? State.QUIESCED :
State.ERRORED);
+ setState(_accessControl.validate() ? State.QUIESCED :
State.ERRORED);
}
else
{
try
{
_accessControl.open();
- _state.set(State.ACTIVE);
+ setState(State.ACTIVE);
}
catch (RuntimeException e)
{
- _state.set(State.ERRORED);
+ setState(State.ERRORED);
if (_broker.isManagementMode())
{
LOGGER.warn("Failed to activate ACL provider: " +
getName(), e);
@@ -150,14 +142,14 @@ public class ACLFileAccessControlProvide
@StateTransition(currentState = State.UNINITIALIZED, desiredState =
State.QUIESCED)
private void startQuiesced()
{
- _state.set(State.QUIESCED);
+ setState(State.QUIESCED);
}
@StateTransition(currentState = {State.ACTIVE, State.QUIESCED,
State.ERRORED}, desiredState = State.DELETED)
private void doDelete()
{
close();
- _state.set(State.DELETED);
+ setState(State.DELETED);
deleted();
}
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java?rev=1627278&r1=1627277&r2=1627278&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
Wed Sep 24 11:16:23 2014
@@ -140,7 +140,7 @@ public class HttpManagement extends Abst
}
getBroker().getEventLogger().message(ManagementConsoleMessages.READY(OPERATIONAL_LOGGING_NAME));
- setCurrentState(State.ACTIVE);
+ setState(State.ACTIVE);
}
@Override
Modified:
qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java?rev=1627278&r1=1627277&r2=1627278&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java
Wed Sep 24 11:16:23 2014
@@ -172,7 +172,7 @@ public class JMXManagementPluginImpl
new
LoggingManagementMBean(LoggingManagementFacade.getCurrentInstance(),
_objectRegistry);
}
_objectRegistry.start();
- setCurrentState(State.ACTIVE);
+ setState(State.ACTIVE);
_allowPortActivation = false;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
