You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2018/01/30 12:03:42 UTC
[2/2] qpid-broker-j git commit: QPID-8066: [Model] Refactor object
delete so that an object's children delete themselves too
QPID-8066: [Model] Refactor object delete so that an object's children delete themselves too
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/96a4e131
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/96a4e131
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/96a4e131
Branch: refs/heads/master
Commit: 96a4e13194095ba5cf08e1b8f886afb6c8b0adf2
Parents: 06e577d
Author: Keith Wall <kw...@apache.org>
Authored: Wed Jan 24 12:25:08 2018 +0000
Committer: Keith Wall <kw...@apache.org>
Committed: Tue Jan 30 12:00:29 2018 +0000
----------------------------------------------------------------------
.../BDBHARemoteReplicationNodeImpl.java | 81 +++++---
.../berkeleydb/BDBHAVirtualHostNodeImpl.java | 88 ++++-----
.../qpid/server/exchange/AbstractExchange.java | 62 +++---
.../server/model/AbstractConfiguredObject.java | 193 ++++++++++++++-----
.../apache/qpid/server/model/BrokerImpl.java | 23 ++-
.../adapter/FileBasedGroupProviderImpl.java | 54 +++---
.../qpid/server/model/port/AbstractPort.java | 16 +-
.../qpid/server/model/port/AmqpPortImpl.java | 28 ++-
.../apache/qpid/server/queue/AbstractQueue.java | 62 +++---
.../qpid/server/queue/QueueConsumerImpl.java | 15 +-
.../qpid/server/security/AbstractKeyStore.java | 52 +++--
.../server/security/AbstractTrustStore.java | 106 +++++-----
.../AllowAllAccessControlProviderImpl.java | 18 +-
.../AutoGeneratedSelfSignedKeyStoreImpl.java | 27 ---
.../qpid/server/security/FileKeyStoreImpl.java | 6 -
.../server/security/FileTrustStoreImpl.java | 6 -
.../ManagedPeerCertificateTrustStoreImpl.java | 6 -
.../server/security/NonJavaKeyStoreImpl.java | 6 -
.../server/security/NonJavaTrustStoreImpl.java | 6 -
.../security/SiteSpecificTrustStoreImpl.java | 6 -
.../access/AbstractAccessControlProvider.java | 20 +-
.../manager/AbstractAuthenticationManager.java | 88 +++------
.../security/auth/manager/ManagedUser.java | 11 +-
.../PrincipalDatabaseAuthenticationManager.java | 36 ++--
.../qpid/server/security/group/GroupImpl.java | 9 -
.../server/security/group/GroupMemberImpl.java | 9 -
.../security/group/GroupProviderImpl.java | 9 -
...dryDashboardManagementGroupProviderImpl.java | 7 -
.../server/session/AbstractAMQPSession.java | 12 +-
.../VirtualHostStoreUpgraderAndRecoverer.java | 22 ---
.../transport/AbstractAMQPConnection.java | 33 +---
.../server/virtualhost/AbstractVirtualHost.java | 41 ++--
.../AbstractVirtualHostAlias.java | 18 --
.../AbstractStandardVirtualHostNode.java | 24 +++
.../AbstractVirtualHostNode.java | 69 +------
.../RedirectingVirtualHostNodeImpl.java | 50 ++---
.../hierarchy/AbstractConfiguredObjectTest.java | 69 +++++++
.../hierarchy/TestAbstractCarImpl.java | 105 ++++++++++
.../hierarchy/TestAbstractEngineImpl.java | 10 +-
.../model/testmodels/hierarchy/TestCar.java | 4 +-
.../testmodels/hierarchy/TestKitCarImpl.java | 49 +----
.../hierarchy/TestStandardCarImpl.java | 52 +----
.../lifecycle/AbstractConfiguredObjectTest.java | 3 +-
.../ManagedAuthenticationManagerTestBase.java | 24 +++
.../server/logging/logback/AbstractLogger.java | 16 +-
.../AbstractNameAndLevelLogInclusionRule.java | 18 +-
.../AbstractPredicateLogInclusionRule.java | 18 +-
.../qpid/systest/rest/ConnectionRestTest.java | 14 +-
.../systest/rest/VirtualHostLoggerRestTest.java | 38 ++++
test-profiles/JavaTransientExcludes | 1 +
50 files changed, 864 insertions(+), 876 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/96a4e131/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeImpl.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeImpl.java b/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeImpl.java
index d19cb48..9afb795 100644
--- a/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeImpl.java
+++ b/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeImpl.java
@@ -30,8 +30,8 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
-import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.SettableFuture;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -45,7 +45,6 @@ import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.IllegalStateTransitionException;
import org.apache.qpid.server.model.ManagedAttributeField;
import org.apache.qpid.server.model.State;
-import org.apache.qpid.server.model.StateTransition;
import org.apache.qpid.server.store.berkeleydb.replication.ReplicatedEnvironmentFacade;
import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
import org.apache.qpid.server.util.ServerScopedRuntimeException;
@@ -69,6 +68,7 @@ public class BDBHARemoteReplicationNodeImpl extends AbstractConfiguredObject<BDB
private BDBHAVirtualHostNodeLogSubject _virtualHostNodeLogSubject;
private GroupLogSubject _groupLogSubject;
private volatile NodeRole _lastKnownRole;
+ private volatile boolean _nodeLeft = false;
public BDBHARemoteReplicationNodeImpl(BDBHAVirtualHostNode<?> virtualHostNode, Map<String, Object> attributes, ReplicatedEnvironmentFacade replicatedEnvironmentFacade)
{
@@ -117,52 +117,58 @@ public class BDBHARemoteReplicationNodeImpl extends AbstractConfiguredObject<BDB
}
@Override
- public void deleted()
- {
- super.deleted();
- }
-
- @Override
public String toString()
{
return getClass().getSimpleName() + "[id=" + getId() + ", name=" + getName() + ", address=" + getAddress()
+ ", state=" + getState() + ", role=" + getRole() + "]";
}
- @StateTransition(currentState = {State.ACTIVE, State.UNAVAILABLE}, desiredState = State.DELETED)
- private ListenableFuture<Void> doDelete()
+ @Override
+ protected ListenableFuture<Void> onDelete()
{
- String nodeName = getName();
+ if (!_nodeLeft)
+ {
+ SettableFuture<Void> future = SettableFuture.create();
- getEventLogger().message(_virtualHostNodeLogSubject, HighAvailabilityMessages.DELETED());
+ String nodeName = getName();
- boolean deletionAllowed;
- try
- {
- deletionAllowed = _replicatedEnvironmentFacade.removeNodeFromGroup(nodeName);
- }
- catch (ServerScopedRuntimeException e)
- {
- throw e;
- }
- catch (RuntimeException e)
- {
- throw new IllegalStateTransitionException("Unexpected exception on node '" + nodeName + "' deletion", e);
- }
+ boolean deletionAllowed;
+ try
+ {
+ getEventLogger().message(_virtualHostNodeLogSubject, HighAvailabilityMessages.DELETED());
+ deletionAllowed = _replicatedEnvironmentFacade.removeNodeFromGroup(nodeName);
+ if (deletionAllowed)
+ {
+ future.set(null);
+ }
+ else
+ {
+ future.setException(new IllegalStateTransitionException(String.format(
+ "Node '%s' cannot be deleted when role is a master",
+ nodeName)));
+ }
+ }
+ catch (ServerScopedRuntimeException e)
+ {
+ future.setException(e);
+ throw e;
+ }
+ catch (RuntimeException e)
+ {
+ future.setException(new IllegalStateTransitionException(String.format(
+ "Unexpected exception on node '%s' deletion",
+ nodeName), e));
+ }
- if (deletionAllowed)
- {
- setState(State.DELETED);
- deleted();
+ return future;
}
else
{
- throw new IllegalStateTransitionException("Node '" + nodeName + "' cannot be deleted when role is a master");
+ return super.onDelete();
}
-
- return Futures.immediateFuture(null);
}
+ @SuppressWarnings("unchecked")
protected void afterSetRole()
{
try
@@ -270,4 +276,15 @@ public class BDBHARemoteReplicationNodeImpl extends AbstractConfiguredObject<BDB
{
return _broker.getEventLogger();
}
+
+ void setNodeLeft(final boolean nodeLeft)
+ {
+ _nodeLeft = nodeLeft;
+ }
+
+ @Override
+ protected ListenableFuture<Void> deleteNoChecks()
+ {
+ return super.deleteNoChecks();
+ }
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/96a4e131/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java b/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
index 97565df..3680db5 100644
--- a/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
+++ b/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
@@ -153,7 +153,7 @@ public class BDBHAVirtualHostNodeImpl extends AbstractVirtualHostNode<BDBHAVirtu
@ManagedAttributeField(afterSet = "postSetPermittedNodes")
private List<String> _permittedNodes;
- private boolean _isClosed;
+ private volatile boolean _isClosedOrDeleted;
@ManagedObjectFactoryConstructor(conditionallyAvailable = true, condition = "org.apache.qpid.server.JECheck#isAvailable()")
public BDBHAVirtualHostNodeImpl(Map<String, Object> attributes, Broker<?> broker)
@@ -435,54 +435,45 @@ public class BDBHAVirtualHostNodeImpl extends AbstractVirtualHostNode<BDBHAVirtu
}
@Override
- @StateTransition( currentState = { State.ACTIVE, State.STOPPED, State.ERRORED}, desiredState = State.DELETED )
- protected ListenableFuture<Void> doDelete()
+ protected ListenableFuture<Void> beforeDelete()
{
+ _isClosedOrDeleted = true;
+ return super.beforeDelete();
+ }
- // get helpers before close. on close all children are closed and not available anymore
+ @Override
+ protected ListenableFuture<Void> onDelete()
+ {
final Set<InetSocketAddress> helpers = getRemoteNodeAddresses();
- return doAfter(super.doDelete(),new Runnable()
- {
- @Override
- public void run()
- {
- if (getConfigurationStore() != null)
- {
- getEventLogger().message(getVirtualHostNodeLogSubject(), HighAvailabilityMessages.DELETED());
- }
-
- if (getState() == State.DELETED && !helpers.isEmpty())
- {
- try
- {
- new ReplicationGroupAdmin(_groupName, helpers).removeMember(getName());
- }
- catch(DatabaseException e)
- {
- LOGGER.warn("The deletion of node " + this + " on remote nodes failed due to: " + e.getMessage()
- + ". To finish deletion a removal of the node from any of remote nodes (" + helpers + ") is required.");
- }
- }
- }
- });
+ return doAfterAlways(closeVirtualHostIfExists(),
+ () -> {
+ closeEnvironment();
- }
+ DurableConfigurationStore configurationStore = getConfigurationStore();
+ if (configurationStore != null)
+ {
+ configurationStore.closeConfigurationStore();
+ configurationStore.onDelete(BDBHAVirtualHostNodeImpl.this);
+ getEventLogger().message(getVirtualHostNodeLogSubject(), HighAvailabilityMessages.DELETED());
+ }
- @Override
- protected ListenableFuture<Void> deleteVirtualHostIfExists()
- {
- ReplicatedEnvironmentFacade replicatedEnvironmentFacade = getReplicatedEnvironmentFacade();
- if (replicatedEnvironmentFacade != null && replicatedEnvironmentFacade.isMaster()
- && replicatedEnvironmentFacade.getNumberOfElectableGroupMembers() == 1)
- {
- return super.deleteVirtualHostIfExists();
- }
- else
- {
- return closeVirtualHostIfExist();
- }
+ if (!helpers.isEmpty())
+ {
+ try
+ {
+ new ReplicationGroupAdmin(_groupName, helpers).removeMember(getName());
+ }
+ catch(DatabaseException e)
+ {
+ LOGGER.warn(String.format(
+ "The deletion of node %s on remote nodes failed due to: %s. To finish deletion a "
+ + "removal of the node from any of remote nodes (%s) is required.",
+ this, e.getMessage(), helpers));
+ }
+ }
+ });
}
private Set<InetSocketAddress> getRemoteNodeAddresses()
@@ -759,7 +750,7 @@ public class BDBHAVirtualHostNodeImpl extends AbstractVirtualHostNode<BDBHAVirtu
@Override
protected ListenableFuture<Void> beforeClose()
{
- _isClosed = true;
+ _isClosedOrDeleted = true;
return super.beforeClose();
}
@@ -784,7 +775,7 @@ public class BDBHAVirtualHostNodeImpl extends AbstractVirtualHostNode<BDBHAVirtu
@Override
public void stateChange(StateChangeEvent stateChangeEvent) throws RuntimeException
{
- if (_isClosed)
+ if (_isClosedOrDeleted)
{
LOGGER.debug("Ignoring state transition into state {} because VHN is already closed or closing", stateChangeEvent.getState());
}
@@ -797,7 +788,7 @@ public class BDBHAVirtualHostNodeImpl extends AbstractVirtualHostNode<BDBHAVirtu
catch (RuntimeException e)
{
// Ignore exception when VHN is closed or closing
- if (!_isClosed)
+ if (!_isClosedOrDeleted)
{
throw e;
}
@@ -1118,8 +1109,11 @@ public class BDBHAVirtualHostNodeImpl extends AbstractVirtualHostNode<BDBHAVirtu
BDBHARemoteReplicationNodeImpl remoteNode = getChildByName(BDBHARemoteReplicationNodeImpl.class, node.getName());
if (remoteNode != null)
{
- remoteNode.deleted();
- getEventLogger().message(getGroupLogSubject(), HighAvailabilityMessages.REMOVED(remoteNode.getName(), remoteNode.getAddress()));
+ remoteNode.setNodeLeft(true);
+ doAfter(remoteNode.deleteNoChecks(),
+ () -> getEventLogger().message(getGroupLogSubject(),
+ HighAvailabilityMessages.REMOVED(remoteNode.getName(),
+ remoteNode.getAddress())));
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/96a4e131/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java b/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
index 6227384..1645f32 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
@@ -168,6 +168,12 @@ public abstract class AbstractExchange<T extends AbstractExchange<T>>
super.validateChange(proxyForValidation, changedAttributes);
validateOrCreateAlternateBinding(((Exchange<?>) proxyForValidation), false);
+
+ if (changedAttributes.contains(ConfiguredObject.DESIRED_STATE) && proxyForValidation.getDesiredState() == State.DELETED)
+ {
+ doChecks();
+ }
+
}
private boolean isReservedExchangeName(String name)
@@ -291,18 +297,8 @@ public abstract class AbstractExchange<T extends AbstractExchange<T>>
_deleteTaskList.add(new DeleteDeleteTask(lifetimeObject, deleteExchangeTask));
}
- private void deleteWithChecks()
+ private void performDelete()
{
- if(hasReferrers())
- {
- throw new MessageDestinationIsAlternateException(getName());
- }
-
- if(isReservedExchangeName(getName()))
- {
- throw new RequiredExchangeException(getName());
- }
-
if(_closed.compareAndSet(false,true))
{
performDeleteTasks();
@@ -326,14 +322,19 @@ public abstract class AbstractExchange<T extends AbstractExchange<T>>
}
getEventLogger().message(_logSubject, ExchangeMessages.DELETED());
+ }
+ }
- deleted();
-
-
+ private void doChecks()
+ {
+ if(hasReferrers())
+ {
+ throw new MessageDestinationIsAlternateException(getName());
}
- else
+
+ if(isReservedExchangeName(getName()))
{
- deleted();
+ throw new RequiredExchangeException(getName());
}
}
@@ -906,32 +907,15 @@ public abstract class AbstractExchange<T extends AbstractExchange<T>>
return Futures.immediateFuture(null);
}
- @SuppressWarnings("unused")
- @StateTransition(currentState = State.UNINITIALIZED, desiredState = State.DELETED)
- private ListenableFuture<Void> doDeleteBeforeInitialize()
- {
- preSetAlternateBinding();
- setState(State.DELETED);
- return Futures.immediateFuture(null);
- }
-
- @SuppressWarnings("unused")
- @StateTransition(currentState = State.ACTIVE, desiredState = State.DELETED)
- private ListenableFuture<Void> doDelete()
+ @Override
+ protected ListenableFuture<Void> onDelete()
{
- try
- {
- deleteWithChecks();
- preSetAlternateBinding();
- setState(State.DELETED);
- return Futures.immediateFuture(null);
- }
- catch(MessageDestinationIsAlternateException | RequiredExchangeException e)
+ if (getState() != State.UNINITIALIZED)
{
- // let management know about constraint violations
- // in order to report error back to caller
- return Futures.immediateFailedFuture(e);
+ performDelete();
}
+ preSetAlternateBinding();
+ return super.onDelete();
}
public static final class BindingIdentifier
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/96a4e131/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java b/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
index 3b01324..f6bbb78 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
@@ -1697,49 +1697,17 @@ public abstract class AbstractConfiguredObject<X extends ConfiguredObject<X>> im
}
else
{
- Map<String, Object> attributes = Collections.singletonMap(ConfiguredObject.DESIRED_STATE, desiredState);
- ConfiguredObject<?> proxyForValidation = createProxyForValidation(attributes);
- authoriseSetAttributes(proxyForValidation, attributes);
- validateChange(proxyForValidation, attributes.keySet());
-
if (desiredState == State.DELETED)
{
- // for DELETED state we should invoke transition method first to make sure that object can be deleted.
- // If method results in exception being thrown due to various integrity violations
- // then object cannot be deleted without prior resolving of integrity violations.
- // The state transition should be disallowed.
- if (desiredState != currentDesiredState)
- {
- if(_parent instanceof AbstractConfiguredObject)
- {
- ((AbstractConfiguredObject<?>)_parent).validateChildDelete(AbstractConfiguredObject.this);
- }
- else if (_parent instanceof AbstractConfiguredObjectProxy)
- {
- ((AbstractConfiguredObjectProxy)_parent).validateChildDelete(AbstractConfiguredObject.this);
- }
-
-
- return doAfter(attainState(desiredState), new Runnable()
- {
- @Override
- public void run()
- {
- // state transition notification should be already issued.
- // changing attribute value and notifying listeners about attribute change
- // in case when any listener relies on attribute change rather then on state change
- changeAttribute(ConfiguredObject.DESIRED_STATE, desiredState);
- attributeSet(ConfiguredObject.DESIRED_STATE, currentDesiredState, desiredState);
- }
- });
- }
- else
- {
- return Futures.immediateFuture(null);
- }
+ return deleteAsync();
}
else
{
+ Map<String, Object> attributes = Collections.singletonMap(ConfiguredObject.DESIRED_STATE, desiredState);
+ ConfiguredObject<?> proxyForValidation = createProxyForValidation(attributes);
+ authoriseSetAttributes(proxyForValidation, attributes);
+ validateChange(proxyForValidation, attributes.keySet());
+
if (changeAttribute(ConfiguredObject.DESIRED_STATE, desiredState))
{
attributeSet(ConfiguredObject.DESIRED_STATE, currentDesiredState, desiredState);
@@ -2246,7 +2214,133 @@ public abstract class AbstractConfiguredObject<X extends ConfiguredObject<X>> im
@Override
public final ListenableFuture<Void> deleteAsync()
{
- return setDesiredState(State.DELETED);
+ final State currentDesiredState = getDesiredState();
+
+ if (currentDesiredState == State.DELETED)
+ {
+ return Futures.immediateFuture(null);
+ }
+
+ Map<String, Object> attributes = Collections.singletonMap(ConfiguredObject.DESIRED_STATE, State.DELETED);
+ ConfiguredObject<?> proxyForValidation = createProxyForValidation(attributes);
+ authoriseSetAttributes(proxyForValidation, attributes);
+ validateChange(proxyForValidation, attributes.keySet());
+
+ // for DELETED state we should invoke transition method first to make sure that object can be deleted.
+ // If method results in exception being thrown due to various integrity violations
+ // then object cannot be deleted without prior resolving of integrity violations.
+ // The state transition should be disallowed.
+
+ if(_parent instanceof AbstractConfiguredObject<?>)
+ {
+ ((AbstractConfiguredObject<?>)_parent).validateChildDelete(AbstractConfiguredObject.this);
+ }
+ else if (_parent instanceof AbstractConfiguredObjectProxy)
+ {
+ ((AbstractConfiguredObjectProxy)_parent).validateChildDelete(AbstractConfiguredObject.this);
+ }
+
+ return deleteNoChecks();
+ }
+
+ protected ListenableFuture<Void> deleteNoChecks()
+ {
+ final String simpleClassName = AbstractConfiguredObject.this.getClass().getSimpleName();
+ final SettableFuture<Void> returnFuture = SettableFuture.create();
+ final State currentDesiredState = getDesiredState();
+
+ final ChainedListenableFuture<Void> future =
+ doAfter(beforeDelete(), this::deleteChildren).then(this::onDelete)
+ .then(() -> {
+ final State currentState = getState();
+ setState(State.DELETED);
+ notifyStateChanged(currentState, State.DELETED);
+ changeAttribute(ConfiguredObject.DESIRED_STATE, State.DELETED);
+ attributeSet(ConfiguredObject.DESIRED_STATE, currentDesiredState, State.DELETED);
+ unregister(true);
+
+ LOGGER.debug("Delete {} : {}",
+ simpleClassName,
+ getName());
+ return Futures.immediateFuture(null);
+ });
+ addFutureCallback(future, new FutureCallback<Void>()
+ {
+ @Override
+ public void onSuccess(final Void result)
+ {
+ returnFuture.set(null);
+ }
+
+ @Override
+ public void onFailure(final Throwable t)
+ {
+ returnFuture.setException(t);
+ }
+ }, MoreExecutors.directExecutor());
+
+ return returnFuture;
+ }
+
+ protected final ListenableFuture<Void> deleteChildren()
+ {
+ // If this object manages its own child-storage then don't propagate the delete. The rationale
+ // is that deleting the object will delete the storage that contains the children. Telling each
+ // child and their children to delete themselves would generate unnecessary 'delete' work in the
+ // child-storage (which also might fail).
+ if (managesChildStorage())
+ {
+ return Futures.immediateFuture(null);
+ }
+
+ final List<ListenableFuture<Void>> childDeleteFutures = new ArrayList<>();
+
+ applyToChildren(child -> {
+
+ final ListenableFuture<Void> childDeleteFuture;
+ if (child instanceof AbstractConfiguredObject<?>)
+ {
+ childDeleteFuture = ((AbstractConfiguredObject<?>) child).deleteNoChecks();
+ }
+ else if (child instanceof AbstractConfiguredObjectProxy)
+ {
+ childDeleteFuture = ((AbstractConfiguredObjectProxy) child).deleteNoChecks();
+ }
+ else
+ {
+ childDeleteFuture = Futures.immediateFuture(null);
+ }
+
+ addFutureCallback(childDeleteFuture, new FutureCallback<Void>()
+ {
+ @Override
+ public void onSuccess(final Void result)
+ {
+ }
+
+ @Override
+ public void onFailure(final Throwable t)
+ {
+ LOGGER.error("Exception occurred while deleting {} : {}",
+ child.getClass().getSimpleName(), child.getName(), t);
+ }
+ }, getTaskExecutor());
+ childDeleteFutures.add(childDeleteFuture);
+ });
+
+ ListenableFuture<List<Void>> combinedFuture = Futures.allAsList(childDeleteFutures);
+
+ return Futures.transform(combinedFuture, input -> null, getTaskExecutor());
+ }
+
+ protected ListenableFuture<Void> beforeDelete()
+ {
+ return Futures.immediateFuture(null);
+ }
+
+ protected ListenableFuture<Void> onDelete()
+ {
+ return Futures.immediateFuture(null);
}
public final void start()
@@ -2259,8 +2353,7 @@ public abstract class AbstractConfiguredObject<X extends ConfiguredObject<X>> im
return setDesiredState(State.ACTIVE);
}
-
- protected void deleted()
+ private void deleted()
{
unregister(true);
}
@@ -3677,7 +3770,7 @@ public abstract class AbstractConfiguredObject<X extends ConfiguredObject<X>> im
@Override
public void handleException(RuntimeException exception, ConfiguredObject<?> source)
{
- if(source instanceof AbstractConfiguredObject)
+ if(source instanceof AbstractConfiguredObject<?>)
{
((AbstractConfiguredObject)source).handleExceptionOnOpen(exception);
}
@@ -3710,7 +3803,19 @@ public abstract class AbstractConfiguredObject<X extends ConfiguredObject<X>> im
if (source.getState() != State.DELETED)
{
// TODO - RG - This isn't right :-(
- source.deleteAsync();
+ if (source instanceof AbstractConfiguredObject)
+ {
+ ((AbstractConfiguredObject) source).deleteNoChecks();
+ }
+ else if (source instanceof AbstractConfiguredObjectProxy)
+ {
+ ((AbstractConfiguredObjectProxy) source).deleteNoChecks();
+ }
+ else
+ {
+ source.deleteAsync();
+ }
+
}
}
finally
@@ -3760,5 +3865,7 @@ public abstract class AbstractConfiguredObject<X extends ConfiguredObject<X>> im
ListenableFuture getAttainStateFuture();
void forceUpdateAllSecureAttributes();
+
+ ListenableFuture<Void> deleteNoChecks();
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/96a4e131/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java b/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
index ad11a7b..7119d00 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/BrokerImpl.java
@@ -230,15 +230,16 @@ public class BrokerImpl extends AbstractContainer<BrokerImpl> implements Broker<
String modelVersion = (String) getActualAttributes().get(Broker.MODEL_VERSION);
if (modelVersion == null)
{
- deleted();
- throw new IllegalConfigurationException("Broker " + Broker.MODEL_VERSION + " must be specified");
+ deleteNoChecks();
+ throw new IllegalConfigurationException(String.format("Broker %s must be specified", Broker.MODEL_VERSION));
}
if (!MODEL_VERSION_PATTERN.matcher(modelVersion).matches())
{
- deleted();
- throw new IllegalConfigurationException("Broker " + Broker.MODEL_VERSION + " is specified in incorrect format: "
- + modelVersion);
+ deleteNoChecks();
+ throw new IllegalConfigurationException(String.format("Broker %s is specified in incorrect format: %s",
+ Broker.MODEL_VERSION,
+ modelVersion));
}
int versionSeparatorPosition = modelVersion.indexOf(".");
@@ -248,15 +249,17 @@ public class BrokerImpl extends AbstractContainer<BrokerImpl> implements Broker<
if (majorModelVersion != BrokerModel.MODEL_MAJOR_VERSION || minorModelVersion > BrokerModel.MODEL_MINOR_VERSION)
{
- deleted();
- throw new IllegalConfigurationException("The model version '" + modelVersion
- + "' in configuration is incompatible with the broker model version '" + BrokerModel.MODEL_VERSION + "'");
+ deleteNoChecks();
+ throw new IllegalConfigurationException(String.format(
+ "The model version '%s' in configuration is incompatible with the broker model version '%s'",
+ modelVersion,
+ BrokerModel.MODEL_VERSION));
}
if(!isDurable())
{
- deleted();
- throw new IllegalArgumentException(getClass().getSimpleName() + " must be durable");
+ deleteNoChecks();
+ throw new IllegalArgumentException(String.format("%s must be durable", getClass().getSimpleName()));
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/96a4e131/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java b/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
index 60eeb57..f592c76 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
@@ -264,28 +264,23 @@ public class FileBasedGroupProviderImpl
return Futures.immediateFuture(null);
}
- @StateTransition( currentState = { State.QUIESCED, State.ACTIVE, State.ERRORED}, desiredState = State.DELETED )
- private ListenableFuture<Void> doDelete()
+ @Override
+ protected ListenableFuture<Void> onDelete()
{
- return doAfterAlways(closeAsync(),
- new Runnable()
- {
- @Override
- public void run()
- {
- File file = new File(getPath());
- if (file.exists())
- {
- if (!file.delete())
- {
- throw new IllegalConfigurationException("Cannot delete group file");
- }
- }
-
- deleted();
- setState(State.DELETED);
- }
- });
+ // We manage the storage children so we close (so they may free any resources) them rather than deleting them
+ return doAfterAlways(closeChildren(),
+ () -> {
+ File file = new File(getPath());
+ if (file.exists())
+ {
+ if (!file.delete())
+ {
+ throw new IllegalConfigurationException(String.format(
+ "Cannot delete group file '%s'",
+ file));
+ }
+ }
+ });
}
@StateTransition( currentState = State.UNINITIALIZED, desiredState = State.QUIESCED)
@@ -382,13 +377,12 @@ public class FileBasedGroupProviderImpl
}
}
- @StateTransition( currentState = State.ACTIVE, desiredState = State.DELETED )
- private ListenableFuture<Void> doDelete()
+ @Override
+ protected ListenableFuture<Void> onDelete()
{
_groupDatabase.removeGroup(getName());
- deleted();
- setState(State.DELETED);
- return Futures.immediateFuture(null);
+ return super.onDelete();
+
}
private class GroupMemberAdapter extends AbstractConfiguredObject<GroupMemberAdapter> implements
@@ -424,13 +418,11 @@ public class FileBasedGroupProviderImpl
return Futures.immediateFuture(null);
}
- @StateTransition(currentState = State.ACTIVE, desiredState = State.DELETED)
- private ListenableFuture<Void> doDelete()
+ @Override
+ protected ListenableFuture<Void> onDelete()
{
_groupDatabase.removeUserFromGroup(getName(), GroupAdapter.this.getName());
- deleted();
- setState(State.DELETED);
- return Futures.immediateFuture(null);
+ return super.onDelete();
}
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/96a4e131/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java b/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java
index c77611e..45efb41 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java
@@ -368,19 +368,11 @@ public abstract class AbstractPort<X extends AbstractPort<X>> extends AbstractCo
return getChildren(Connection.class);
}
- @StateTransition(currentState = { State.ACTIVE, State.QUIESCED, State.ERRORED}, desiredState = State.DELETED )
- private ListenableFuture<Void> doDelete()
+ @Override
+ protected ListenableFuture<Void> onDelete()
{
- return doAfterAlways(closeAsync(), new Runnable()
- {
- @Override
- public void run()
- {
- deleted();
- setState(State.DELETED);
- _eventLogger.message(PortMessages.DELETE(getType(), getName()));
- }
- });
+ _eventLogger.message(PortMessages.DELETE(getType(), getName()));
+ return super.onDelete();
}
@StateTransition( currentState = {State.UNINITIALIZED, State.QUIESCED, State.ERRORED}, desiredState = State.ACTIVE )
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/96a4e131/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java b/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java
index 4a9eb02..f2b1c26 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java
@@ -70,7 +70,6 @@ import org.apache.qpid.server.transport.AcceptingTransport;
import org.apache.qpid.server.transport.PortBindFailureException;
import org.apache.qpid.server.transport.TransportProvider;
import org.apache.qpid.server.transport.network.security.ssl.SSLUtil;
-import org.apache.qpid.server.util.PortUtil;
import org.apache.qpid.server.util.ServerScopedRuntimeException;
public class AmqpPortImpl extends AbstractPort<AmqpPortImpl> implements AmqpPort<AmqpPortImpl>
@@ -95,7 +94,7 @@ public class AmqpPortImpl extends AbstractPort<AmqpPortImpl> implements AmqpPort
private final AtomicBoolean _connectionCountWarningGiven = new AtomicBoolean();
private final Container<?> _container;
- private final AtomicBoolean _closing = new AtomicBoolean();
+ private final AtomicBoolean _closingOrDeleting = new AtomicBoolean();
private AcceptingTransport _transport;
private SSLContext _sslContext;
@@ -276,13 +275,33 @@ public class AmqpPortImpl extends AbstractPort<AmqpPortImpl> implements AmqpPort
@Override
protected ListenableFuture<Void> beforeClose()
{
- _closing.set(true);
+ _closingOrDeleting.set(true);
return Futures.immediateFuture(null);
}
@Override
protected ListenableFuture<Void> onClose()
{
+ closeTransport();
+ return Futures.immediateFuture(null);
+ }
+
+ @Override
+ protected ListenableFuture<Void> beforeDelete()
+ {
+ _closingOrDeleting.set(true);
+ return super.beforeDelete();
+ }
+
+ @Override
+ protected ListenableFuture<Void> onDelete()
+ {
+ closeTransport();
+ return super.onDelete();
+ }
+
+ private void closeTransport()
+ {
if (_transport != null)
{
for(Transport transport : getTransports())
@@ -292,7 +311,6 @@ public class AmqpPortImpl extends AbstractPort<AmqpPortImpl> implements AmqpPort
_transport.close();
}
- return Futures.immediateFuture(null);
}
@Override
@@ -551,7 +569,7 @@ public class AmqpPortImpl extends AbstractPort<AmqpPortImpl> implements AmqpPort
public boolean canAcceptNewConnection(final SocketAddress remoteSocketAddress)
{
String addressString = remoteSocketAddress.toString();
- if (_closing.get())
+ if (_closingOrDeleting.get())
{
_container.getEventLogger().message(new PortLogSubject(this),
PortMessages.CONNECTION_REJECTED_CLOSED(addressString));
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/96a4e131/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java b/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
index 09ec51c..d8c2c89 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
@@ -196,7 +196,7 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
private AtomicBoolean _stopped = new AtomicBoolean(false);
private final AtomicBoolean _deleted = new AtomicBoolean(false);
- private final SettableFuture<Integer> _deleteFuture = SettableFuture.create();
+ private final SettableFuture<Integer> _deleteQueueDepthFuture = SettableFuture.create();
private final List<Action<? super X>> _deleteTaskList = new CopyOnWriteArrayList<>();
@@ -1787,16 +1787,20 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
@Override
public ListenableFuture<Integer> deleteAndReturnCountAsync()
{
- // Check access
- authorise(Operation.DELETE);
-
- if(hasReferrers())
- {
- throw new MessageDestinationIsAlternateException(getName());
- }
+ return Futures.transformAsync(deleteAsync(), v -> _deleteQueueDepthFuture, getTaskExecutor());
+ }
+ private ListenableFuture<Integer> performDelete()
+ {
if (_deleted.compareAndSet(false, true))
{
+ if (getState() == State.UNINITIALIZED)
+ {
+ preSetAlternateBinding();
+ _deleteQueueDepthFuture.set(0);
+ return _deleteQueueDepthFuture;
+ }
+
final int queueDepthMessages = getQueueDepthMessages();
for(MessageSender sender : _linkedSenders.keySet())
@@ -1829,21 +1833,17 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
_queueHouseKeepingTask.cancel();
performQueueDeleteTasks();
- deleted();
//Log Queue Deletion
getEventLogger().message(_logSubject, QueueMessages.DELETED(getId().toString()));
-
- _deleteFuture.set(queueDepthMessages);
- setState(State.DELETED);
+ _deleteQueueDepthFuture.set(queueDepthMessages);
}
catch(Throwable e)
{
- _deleteFuture.setException(e);
+ _deleteQueueDepthFuture.setException(e);
}
-
}
- return _deleteFuture;
+ return _deleteQueueDepthFuture;
}
private void routeToAlternate(List<QueueEntry> entries)
@@ -2958,30 +2958,12 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
return Futures.immediateFuture(null);
}
- @StateTransition(currentState = State.UNINITIALIZED, desiredState = State.DELETED)
- private ListenableFuture<Void> doDeleteBeforeInitialize()
- {
- preSetAlternateBinding();
- setState(State.DELETED);
- return Futures.immediateFuture(null);
- }
-
- @StateTransition(currentState = State.ACTIVE, desiredState = State.DELETED)
- private ListenableFuture<Void> doDelete()
+ @Override
+ protected ListenableFuture<Void> onDelete()
{
- ListenableFuture<Integer> removeFuture = deleteAndReturnCountAsync();
- return doAfter(removeFuture, new Runnable()
- {
- @Override
- public void run()
- {
-
- }
- });
-
+ return Futures.transform(performDelete(), i -> null, getTaskExecutor());
}
-
@Override
public ExclusivityPolicy getExclusive()
{
@@ -3116,6 +3098,14 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
{
validateOrCreateAlternateBinding(queue, false);
}
+
+ if (changedAttributes.contains(ConfiguredObject.DESIRED_STATE) && proxyForValidation.getDesiredState() == State.DELETED)
+ {
+ if(hasReferrers())
+ {
+ throw new MessageDestinationIsAlternateException(getName());
+ }
+ }
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/96a4e131/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java b/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java
index 0972a1a..e6974e7 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java
@@ -37,13 +37,13 @@ import com.google.common.util.concurrent.ListenableFuture;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.server.filter.SelectorParsingException;
import org.apache.qpid.server.consumer.ConsumerOption;
import org.apache.qpid.server.consumer.ConsumerTarget;
import org.apache.qpid.server.filter.FilterManager;
import org.apache.qpid.server.filter.Filterable;
import org.apache.qpid.server.filter.JMSSelectorFilter;
import org.apache.qpid.server.filter.MessageFilter;
+import org.apache.qpid.server.filter.SelectorParsingException;
import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.logging.LogSubject;
import org.apache.qpid.server.logging.messages.SubscriptionMessages;
@@ -242,16 +242,9 @@ class QueueConsumerImpl<T extends ConsumerTarget>
_waitingOnCreditMessageListener.remove();
return doAfter(_target.consumerRemoved(this),
- new Runnable()
- {
- @Override
- public void run()
- {
- _queue.unregisterConsumer(QueueConsumerImpl.this);
-
- deleted();
- }
- });
+ () -> {
+ _queue.unregisterConsumer(QueueConsumerImpl.this);
+ }).then(this::deleteNoChecks);
}
else
{
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/96a4e131/broker-core/src/main/java/org/apache/qpid/server/security/AbstractKeyStore.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/AbstractKeyStore.java b/broker-core/src/main/java/org/apache/qpid/server/security/AbstractKeyStore.java
index 21a9564..453399a 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/security/AbstractKeyStore.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/security/AbstractKeyStore.java
@@ -27,6 +27,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.Map;
+import java.util.Set;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
@@ -79,6 +80,31 @@ public abstract class AbstractKeyStore<X extends AbstractKeyStore<X>>
}
@Override
+ protected void validateChange(final ConfiguredObject<?> proxyForValidation, final Set<String> changedAttributes)
+ {
+ super.validateChange(proxyForValidation, changedAttributes);
+
+ if (changedAttributes.contains(ConfiguredObject.DESIRED_STATE) && proxyForValidation.getDesiredState() == State.DELETED)
+ {
+ // verify that it is not in use
+ String storeName = getName();
+
+ Collection<Port> ports = new ArrayList<>(getBroker().getPorts());
+ for (Port port : ports)
+ {
+ if (port.getKeyStore() == this)
+ {
+ throw new IntegrityViolationException(String.format(
+ "Key store '%s' can't be deleted as it is in use by a port: %s",
+ storeName,
+ port.getName()));
+ }
+ }
+ }
+
+ }
+
+ @Override
protected ListenableFuture<Void> onClose()
{
if(_checkExpiryTaskFuture != null)
@@ -129,25 +155,6 @@ public abstract class AbstractKeyStore<X extends AbstractKeyStore<X>>
}
}
- protected final ListenableFuture<Void> deleteIfNotInUse()
- {
- // verify that it is not in use
- String storeName = getName();
-
- Collection<Port> ports = new ArrayList<>(getBroker().getPorts());
- for (Port port : ports)
- {
- if (port.getKeyStore() == this)
- {
- throw new IntegrityViolationException("Key store '" + storeName + "' can't be deleted as it is in use by a port:" + port.getName());
- }
- }
- deleted();
- setState(State.DELETED);
- getEventLogger().message(KeyStoreMessages.DELETE(getName()));
- return Futures.immediateFuture(null);
- }
-
protected abstract void checkCertificateExpiry();
protected void checkCertificatesExpiry(final long currentTime,
@@ -178,6 +185,13 @@ public abstract class AbstractKeyStore<X extends AbstractKeyStore<X>>
}
@Override
+ protected ListenableFuture<Void> onDelete()
+ {
+ getEventLogger().message(KeyStoreMessages.DELETE(getName()));
+ return super.onDelete();
+ }
+
+ @Override
public final int getCertificateExpiryWarnPeriod()
{
try
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/96a4e131/broker-core/src/main/java/org/apache/qpid/server/security/AbstractTrustStore.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/AbstractTrustStore.java b/broker-core/src/main/java/org/apache/qpid/server/security/AbstractTrustStore.java
index 2530e55..fe4655a 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/security/AbstractTrustStore.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/security/AbstractTrustStore.java
@@ -107,6 +107,62 @@ public abstract class AbstractTrustStore<X extends AbstractTrustStore<X>>
return _eventLogger;
}
+
+ @Override
+ protected void validateChange(final ConfiguredObject<?> proxyForValidation, final Set<String> changedAttributes)
+ {
+ super.validateChange(proxyForValidation, changedAttributes);
+
+ if (changedAttributes.contains(ConfiguredObject.DESIRED_STATE)
+ && proxyForValidation.getDesiredState() == State.DELETED)
+ {
+ // verify that it is not in use
+ String storeName = getName();
+
+ Collection<Port<?>> ports = new ArrayList<>(_broker.getPorts());
+ for (Port<?> port : ports)
+ {
+ Collection<TrustStore> trustStores = port.getTrustStores();
+ if (trustStores != null)
+ {
+ for (TrustStore store : trustStores)
+ {
+ if (storeName.equals(store.getAttribute(TrustStore.NAME)))
+ {
+ throw new IntegrityViolationException(String.format(
+ "Trust store '%s' can't be deleted as it is in use by a port: %s",
+ storeName,
+ port.getName()));
+ }
+ }
+ }
+ }
+
+ Collection<AuthenticationProvider> authenticationProviders =
+ new ArrayList<>(_broker.getAuthenticationProviders());
+ for (AuthenticationProvider authProvider : authenticationProviders)
+ {
+ TrustStore otherTrustStore = null;
+ if (authProvider instanceof SimpleLDAPAuthenticationManager)
+ {
+ otherTrustStore = ((SimpleLDAPAuthenticationManager) authProvider).getTrustStore();
+ }
+ else if (authProvider instanceof OAuth2AuthenticationProvider)
+ {
+ otherTrustStore = ((OAuth2AuthenticationProvider) authProvider).getTrustStore();
+ }
+
+ if (otherTrustStore == this)
+ {
+ throw new IntegrityViolationException(String.format(
+ "Trust store '%s' can't be deleted as it is in use by an authentication manager: '%s'",
+ getName(),
+ authProvider.getName()));
+ }
+ }
+ }
+ }
+
@Override
protected ListenableFuture<Void> onClose()
{
@@ -152,55 +208,11 @@ public abstract class AbstractTrustStore<X extends AbstractTrustStore<X>>
}
}
- final ListenableFuture<Void> deleteIfNotInUse()
+ @Override
+ protected ListenableFuture<Void> onDelete()
{
- // verify that it is not in use
- String storeName = getName();
-
- Collection<Port<?>> ports = new ArrayList<>(_broker.getPorts());
- for (Port<?> port : ports)
- {
- 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<AuthenticationProvider> authenticationProviders = new ArrayList<>(_broker.getAuthenticationProviders());
- for (AuthenticationProvider authProvider : authenticationProviders)
- {
- TrustStore otherTrustStore = null;
- if (authProvider instanceof SimpleLDAPAuthenticationManager)
- {
- otherTrustStore = ((SimpleLDAPAuthenticationManager) authProvider).getTrustStore();
- }
- else if (authProvider instanceof OAuth2AuthenticationProvider)
- {
- otherTrustStore = ((OAuth2AuthenticationProvider) authProvider).getTrustStore();
- }
-
- if (otherTrustStore == this)
- {
- throw new IntegrityViolationException(String.format(
- "Trust store '%s' can't be deleted as it is in use by an authentication manager: '%s'",
- getName(),
- authProvider.getName()));
- }
- }
- deleted();
- setState(State.DELETED);
_eventLogger.message(TrustStoreMessages.DELETE(getName()));
- return Futures.immediateFuture(null);
+ return super.onDelete();
}
private void checkCertificateExpiry()
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/96a4e131/broker-core/src/main/java/org/apache/qpid/server/security/AllowAllAccessControlProviderImpl.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/AllowAllAccessControlProviderImpl.java b/broker-core/src/main/java/org/apache/qpid/server/security/AllowAllAccessControlProviderImpl.java
index 2ce0179..02237c8 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/security/AllowAllAccessControlProviderImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/security/AllowAllAccessControlProviderImpl.java
@@ -84,21 +84,11 @@ public class AllowAllAccessControlProviderImpl extends AbstractConfiguredObject<
return Futures.immediateFuture(null);
}
- @StateTransition(currentState = {State.ACTIVE, State.QUIESCED, State.ERRORED}, desiredState = State.DELETED)
- @SuppressWarnings("unused")
- private ListenableFuture<Void> doDelete()
+ @Override
+ protected ListenableFuture<Void> onDelete()
{
- return doAfterAlways(closeAsync(),
- new Runnable()
- {
- @Override
- public void run()
- {
- setState(State.DELETED);
- deleted();
- _broker.getEventLogger().message(AccessControlMessages.DELETE(getName()));
- }
- });
+ _broker.getEventLogger().message(AccessControlMessages.DELETE(getName()));
+ return super.onDelete();
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/96a4e131/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStoreImpl.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStoreImpl.java b/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStoreImpl.java
index 4757904..244d802 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStoreImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStoreImpl.java
@@ -42,10 +42,8 @@ import java.security.cert.CertificateException;
import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate;
import java.security.spec.InvalidKeySpecException;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.Calendar;
-import java.util.Collection;
import java.util.Collections;
import java.util.Date;
import java.util.HashSet;
@@ -65,10 +63,8 @@ import org.apache.qpid.server.logging.messages.KeyStoreMessages;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.Content;
import org.apache.qpid.server.model.CustomRestHeaders;
-import org.apache.qpid.server.model.IntegrityViolationException;
import org.apache.qpid.server.model.ManagedAttributeField;
import org.apache.qpid.server.model.ManagedObjectFactoryConstructor;
-import org.apache.qpid.server.model.Port;
import org.apache.qpid.server.model.RestContentHeader;
import org.apache.qpid.server.model.State;
import org.apache.qpid.server.model.StateTransition;
@@ -245,29 +241,6 @@ public class AutoGeneratedSelfSignedKeyStoreImpl
}
}
- @StateTransition(currentState = {State.UNINITIALIZED, State.ACTIVE, State.ERRORED}, desiredState = State.DELETED)
- protected ListenableFuture<Void> doDelete()
- {
- // verify that it is not in use
- String storeName = getName();
-
- Collection<Port> ports = new ArrayList<>(_broker.getPorts());
- for (Port port : ports)
- {
- if (port.getKeyStore() == this)
- {
- throw new IntegrityViolationException("Key store '"
- + storeName
- + "' can't be deleted as it is in use by a port:"
- + port.getName());
- }
- }
- deleted();
- setState(State.DELETED);
- _eventLogger.message(KeyStoreMessages.DELETE(getName()));
- return Futures.immediateFuture(null);
- }
-
private void generatePrivateKeyAndCertificate()
{
try
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/96a4e131/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java b/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java
index 33090d0..0912e0f 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java
@@ -98,12 +98,6 @@ public class FileKeyStoreImpl extends AbstractKeyStore<FileKeyStoreImpl> impleme
validateKeyStoreAttributes(this);
}
- @StateTransition(currentState = {State.ACTIVE, State.ERRORED}, desiredState = State.DELETED)
- protected ListenableFuture<Void> doDelete()
- {
- return deleteIfNotInUse();
- }
-
@StateTransition(currentState = {State.UNINITIALIZED, State.ERRORED}, desiredState = State.ACTIVE)
protected ListenableFuture<Void> doActivate()
{
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/96a4e131/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java b/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java
index 527b668..7c2be97 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java
@@ -97,12 +97,6 @@ public class FileTrustStoreImpl extends AbstractTrustStore<FileTrustStoreImpl> i
}
}
- @StateTransition(currentState = {State.ACTIVE, State.ERRORED}, desiredState = State.DELETED)
- protected ListenableFuture<Void> doDelete()
- {
- return deleteIfNotInUse();
- }
-
@StateTransition(currentState = {State.UNINITIALIZED, State.ERRORED}, desiredState = State.ACTIVE)
protected ListenableFuture<Void> doActivate()
{
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/96a4e131/broker-core/src/main/java/org/apache/qpid/server/security/ManagedPeerCertificateTrustStoreImpl.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/ManagedPeerCertificateTrustStoreImpl.java b/broker-core/src/main/java/org/apache/qpid/server/security/ManagedPeerCertificateTrustStoreImpl.java
index 8e02d32..5361ba0 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/security/ManagedPeerCertificateTrustStoreImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/security/ManagedPeerCertificateTrustStoreImpl.java
@@ -91,12 +91,6 @@ public class ManagedPeerCertificateTrustStoreImpl
return storedCertificates.toArray(new Certificate[storedCertificates.size()]);
}
- @StateTransition(currentState = {State.ACTIVE, State.ERRORED}, desiredState = State.DELETED)
- protected ListenableFuture<Void> doDelete()
- {
- return deleteIfNotInUse();
- }
-
@StateTransition(currentState = {State.UNINITIALIZED, State.ERRORED}, desiredState = State.ACTIVE)
protected ListenableFuture<Void> doActivate()
{
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/96a4e131/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java b/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java
index ff84694..8beaf19 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java
@@ -166,12 +166,6 @@ public class NonJavaKeyStoreImpl extends AbstractKeyStore<NonJavaKeyStoreImpl> i
validateKeyStoreAttributes(this);
}
- @StateTransition(currentState = {State.ACTIVE, State.ERRORED}, desiredState = State.DELETED)
- protected ListenableFuture<Void> doDelete()
- {
- return deleteIfNotInUse();
- }
-
@StateTransition(currentState = {State.UNINITIALIZED, State.ERRORED}, desiredState = State.ACTIVE)
protected ListenableFuture<Void> doActivate()
{
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/96a4e131/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaTrustStoreImpl.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaTrustStoreImpl.java b/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaTrustStoreImpl.java
index 287ca58..be0836e 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaTrustStoreImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaTrustStoreImpl.java
@@ -110,12 +110,6 @@ public class NonJavaTrustStoreImpl
validateTrustStoreAttributes(this);
}
- @StateTransition(currentState = {State.ACTIVE, State.ERRORED}, desiredState = State.DELETED)
- protected ListenableFuture<Void> doDelete()
- {
- return deleteIfNotInUse();
- }
-
@StateTransition(currentState = {State.UNINITIALIZED, State.ERRORED}, desiredState = State.ACTIVE)
protected ListenableFuture<Void> doActivate()
{
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/96a4e131/broker-core/src/main/java/org/apache/qpid/server/security/SiteSpecificTrustStoreImpl.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/SiteSpecificTrustStoreImpl.java b/broker-core/src/main/java/org/apache/qpid/server/security/SiteSpecificTrustStoreImpl.java
index 952c74e..09029de 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/security/SiteSpecificTrustStoreImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/security/SiteSpecificTrustStoreImpl.java
@@ -164,12 +164,6 @@ public class SiteSpecificTrustStoreImpl
return x509Certificate == null ? new Certificate[0] : new Certificate[]{x509Certificate};
}
- @StateTransition(currentState = {State.ACTIVE, State.ERRORED}, desiredState = State.DELETED)
- protected ListenableFuture<Void> doDelete()
- {
- return deleteIfNotInUse();
- }
-
@StateTransition(currentState = {State.UNINITIALIZED, State.ERRORED}, desiredState = State.ACTIVE)
protected ListenableFuture<Void> doActivate()
{
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/96a4e131/broker-core/src/main/java/org/apache/qpid/server/security/access/AbstractAccessControlProvider.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/access/AbstractAccessControlProvider.java b/broker-core/src/main/java/org/apache/qpid/server/security/access/AbstractAccessControlProvider.java
index ca0dca2..95ffa70 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/security/access/AbstractAccessControlProvider.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/security/access/AbstractAccessControlProvider.java
@@ -35,7 +35,6 @@ import org.apache.qpid.server.model.Container;
import org.apache.qpid.server.model.ManagedAttributeField;
import org.apache.qpid.server.model.State;
import org.apache.qpid.server.model.StateTransition;
-import org.apache.qpid.server.security.AccessControl;
public abstract class AbstractAccessControlProvider<X extends AbstractAccessControlProvider<X,Y,T>, Y extends CommonAccessControlProvider<Y>, T extends EventLoggerProvider & ConfiguredObject<?>>
@@ -82,24 +81,13 @@ public abstract class AbstractAccessControlProvider<X extends AbstractAccessCont
return Futures.immediateFuture(null);
}
- @StateTransition(currentState = {State.ACTIVE, State.QUIESCED, State.ERRORED}, desiredState = State.DELETED)
- @SuppressWarnings("unused")
- private ListenableFuture<Void> doDelete()
+ @Override
+ protected ListenableFuture<Void> onDelete()
{
- return doAfterAlways(closeAsync(),
- new Runnable()
- {
- @Override
- public void run()
- {
- setState(State.DELETED);
- deleted();
- getEventLogger().message(AccessControlMessages.DELETE(getName()));
- }
- });
+ getEventLogger().message(AccessControlMessages.DELETE(getName()));
+ return super.onDelete();
}
-
@Override
protected void logOperation(final String operation)
{
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/96a4e131/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java b/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java
index d4bbe76..5b8b219 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java
@@ -27,10 +27,8 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.SettableFuture;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -38,6 +36,7 @@ import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.logging.messages.AuthenticationProviderMessages;
import org.apache.qpid.server.model.AbstractConfiguredObject;
import org.apache.qpid.server.model.AuthenticationProvider;
+import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.Container;
import org.apache.qpid.server.model.IntegrityViolationException;
import org.apache.qpid.server.model.ManagedAttributeField;
@@ -82,6 +81,28 @@ public abstract class AbstractAuthenticationManager<T extends AbstractAuthentica
}
@Override
+ protected void validateChange(final ConfiguredObject<?> proxyForValidation, final Set<String> changedAttributes)
+ {
+ super.validateChange(proxyForValidation, changedAttributes);
+
+ if (changedAttributes.contains(ConfiguredObject.DESIRED_STATE) && proxyForValidation.getDesiredState() == State.DELETED)
+ {
+ String providerName = getName();
+ // verify that provider is not in use
+ Collection<Port> ports = new ArrayList<>(_container.getChildren(Port.class));
+ for (Port<?> port : ports)
+ {
+ if (port.getAuthenticationProvider() == this)
+ {
+ throw new IntegrityViolationException(String.format("Authentication provider '%s' is set on port %s",
+ providerName,
+ port.getName()));
+ }
+ }
+ }
+ }
+
+ @Override
public List<String> getAvailableMechanisms(boolean secure)
{
List<String> mechanisms = getMechanisms();
@@ -130,66 +151,11 @@ public abstract class AbstractAuthenticationManager<T extends AbstractAuthentica
return Futures.immediateFuture(null);
}
- @StateTransition( currentState = { State.ACTIVE, State.QUIESCED, State.ERRORED}, desiredState = State.DELETED)
- protected ListenableFuture<Void> doDelete()
- {
-
- String providerName = getName();
-
- // verify that provider is not in use
- Collection<Port> ports = new ArrayList<>(_container.getChildren(Port.class));
- for (Port<?> port : ports)
- {
- if(port.getAuthenticationProvider() == this)
- {
- throw new IntegrityViolationException("Authentication provider '" + providerName + "' is set on port " + port.getName());
- }
- }
-
- return performDelete();
- }
-
- private ListenableFuture<Void> performDelete()
+ @Override
+ protected ListenableFuture<Void> onDelete()
{
- final SettableFuture<Void> futureResult = SettableFuture.create();
- addFutureCallback(closeAsync(), new FutureCallback<Void>()
- {
- @Override
- public void onSuccess(final Void result)
- {
- try
- {
- tidyUp();
- futureResult.set(null);
- }
- catch (Exception e)
- {
- futureResult.setException(e);
- }
- }
-
- @Override
- public void onFailure(final Throwable t)
- {
- try
- {
- tidyUp();
- }
- finally
- {
- futureResult.setException(t);
- }
- }
-
- private void tidyUp()
- {
- deleted();
- setState(State.DELETED);
- _eventLogger.message(AuthenticationProviderMessages.DELETE(getName()));
- }
- }, getTaskExecutor());
-
- return futureResult;
+ _eventLogger.message(AuthenticationProviderMessages.DELETE(getName()));
+ return super.onDelete();
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/96a4e131/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ManagedUser.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ManagedUser.java b/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ManagedUser.java
index b00edd9..d7987f3 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ManagedUser.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ManagedUser.java
@@ -24,9 +24,6 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import javax.security.auth.login.AccountNotFoundException;
-
-import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import org.apache.qpid.server.logging.messages.AuthenticationProviderMessages;
@@ -36,7 +33,6 @@ import org.apache.qpid.server.model.ManagedAttributeField;
import org.apache.qpid.server.model.ManagedObject;
import org.apache.qpid.server.model.ManagedObjectFactoryConstructor;
import org.apache.qpid.server.model.State;
-import org.apache.qpid.server.model.StateTransition;
import org.apache.qpid.server.model.User;
@ManagedObject( category = false, type = ManagedUser.MANAGED_USER_TYPE)
@@ -75,12 +71,11 @@ class ManagedUser extends AbstractConfiguredObject<ManagedUser> implements User<
}
}
- @StateTransition(currentState = {State.ACTIVE}, desiredState = State.DELETED)
- private ListenableFuture<Void> doDelete()
+ @Override
+ protected ListenableFuture<Void> onDelete()
{
_authenticationManager.getUserMap().remove(getName());
- deleted();
- return Futures.immediateFuture(null);
+ return super.onDelete();
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/96a4e131/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java b/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
index 9716d33..af1affc 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
@@ -233,17 +233,17 @@ public abstract class PrincipalDatabaseAuthenticationManager<T extends Principal
}
@Override
- @StateTransition( currentState = { State.ACTIVE, State.QUIESCED, State.ERRORED, State.UNINITIALIZED}, desiredState = State.DELETED)
- public ListenableFuture<Void> doDelete()
+ protected ListenableFuture<Void> onDelete()
{
- File file = new File(_path);
- if (file.exists() && file.isFile())
- {
- file.delete();
- }
- deleted();
- setState(State.DELETED);
- return Futures.immediateFuture(null);
+ // We manage the storage children so we close (so they may free any resources) them rather than deleting them
+ return doAfterAlways(closeChildren(),
+ () -> {
+ File file = new File(_path);
+ if (file.exists() && file.isFile())
+ {
+ file.delete();
+ }
+ });
}
@Override
@@ -331,7 +331,7 @@ public abstract class PrincipalDatabaseAuthenticationManager<T extends Principal
}
catch (RuntimeException e)
{
- principalAdapter.deleteAsync();
+ principalAdapter.deleteNoChecks();
throw e;
}
_userMap.put(p, principalAdapter);
@@ -450,8 +450,8 @@ public abstract class PrincipalDatabaseAuthenticationManager<T extends Principal
return Futures.immediateFuture(null);
}
- @StateTransition(currentState = State.ACTIVE, desiredState = State.DELETED)
- private ListenableFuture<Void> doDelete()
+ @Override
+ protected ListenableFuture<Void> onDelete()
{
try
{
@@ -462,9 +462,13 @@ public abstract class PrincipalDatabaseAuthenticationManager<T extends Principal
{
// pass
}
- deleted();
- setState(State.DELETED);
- return Futures.immediateFuture(null);
+ return super.onDelete();
+ }
+
+ @Override
+ protected ListenableFuture<Void> deleteNoChecks()
+ {
+ return super.deleteNoChecks();
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/96a4e131/broker-core/src/main/java/org/apache/qpid/server/security/group/GroupImpl.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/group/GroupImpl.java b/broker-core/src/main/java/org/apache/qpid/server/security/group/GroupImpl.java
index dc35562..218f712 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/security/group/GroupImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/security/group/GroupImpl.java
@@ -52,13 +52,4 @@ public class GroupImpl extends AbstractConfiguredObject<GroupImpl> implements Gr
setState(State.ACTIVE);
return Futures.immediateFuture(null);
}
-
-
- @StateTransition(currentState = {State.ACTIVE}, desiredState = State.DELETED)
- private ListenableFuture<Void> doDelete()
- {
- deleted();
- return Futures.immediateFuture(null);
- }
-
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/96a4e131/broker-core/src/main/java/org/apache/qpid/server/security/group/GroupMemberImpl.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/group/GroupMemberImpl.java b/broker-core/src/main/java/org/apache/qpid/server/security/group/GroupMemberImpl.java
index c0d0c92..f5f99a6 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/security/group/GroupMemberImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/security/group/GroupMemberImpl.java
@@ -51,13 +51,4 @@ public class GroupMemberImpl extends AbstractConfiguredObject<GroupMemberImpl> i
setState(State.ACTIVE);
return Futures.immediateFuture(null);
}
-
-
- @StateTransition(currentState = {State.ACTIVE}, desiredState = State.DELETED)
- private ListenableFuture<Void> doDelete()
- {
- deleted();
- return Futures.immediateFuture(null);
- }
-
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/96a4e131/broker-core/src/main/java/org/apache/qpid/server/security/group/GroupProviderImpl.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/group/GroupProviderImpl.java b/broker-core/src/main/java/org/apache/qpid/server/security/group/GroupProviderImpl.java
index 891bf7c..dfd55da 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/security/group/GroupProviderImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/security/group/GroupProviderImpl.java
@@ -96,13 +96,4 @@ public class GroupProviderImpl extends AbstractConfiguredObject<GroupProviderImp
setState(State.ACTIVE);
return Futures.immediateFuture(null);
}
-
-
- @StateTransition(currentState = {State.ACTIVE}, desiredState = State.DELETED)
- private ListenableFuture<Void> doDelete()
- {
- deleted();
- return Futures.immediateFuture(null);
- }
-
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/96a4e131/broker-core/src/main/java/org/apache/qpid/server/security/group/cloudfoundry/CloudFoundryDashboardManagementGroupProviderImpl.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/group/cloudfoundry/CloudFoundryDashboardManagementGroupProviderImpl.java b/broker-core/src/main/java/org/apache/qpid/server/security/group/cloudfoundry/CloudFoundryDashboardManagementGroupProviderImpl.java
index 6a6130e..88659b5 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/security/group/cloudfoundry/CloudFoundryDashboardManagementGroupProviderImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/security/group/cloudfoundry/CloudFoundryDashboardManagementGroupProviderImpl.java
@@ -271,13 +271,6 @@ public class CloudFoundryDashboardManagementGroupProviderImpl extends AbstractCo
return Futures.immediateFuture(null);
}
- @StateTransition(currentState = {State.ACTIVE}, desiredState = State.DELETED)
- private ListenableFuture<Void> doDelete()
- {
- deleted();
- return Futures.immediateFuture(null);
- }
-
@Override
public URI getCloudFoundryEndpointURI()
{
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/96a4e131/broker-core/src/main/java/org/apache/qpid/server/session/AbstractAMQPSession.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/session/AbstractAMQPSession.java b/broker-core/src/main/java/org/apache/qpid/server/session/AbstractAMQPSession.java
index b68ed7f..6ca5e5e 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/session/AbstractAMQPSession.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/session/AbstractAMQPSession.java
@@ -33,7 +33,6 @@ import java.util.concurrent.atomic.AtomicInteger;
import javax.security.auth.Subject;
import com.google.common.base.Supplier;
-import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.MoreExecutors;
@@ -54,7 +53,6 @@ import org.apache.qpid.server.model.LifetimePolicy;
import org.apache.qpid.server.model.NamedAddressSpace;
import org.apache.qpid.server.model.Session;
import org.apache.qpid.server.model.State;
-import org.apache.qpid.server.model.StateTransition;
import org.apache.qpid.server.protocol.PublishAuthorisationCache;
import org.apache.qpid.server.security.SecurityToken;
import org.apache.qpid.server.transport.AMQPConnection;
@@ -99,7 +97,7 @@ public abstract class AbstractAMQPSession<S extends AbstractAMQPSession<S, X>,
public void performAction(final S object)
{
removeDeleteTask(this);
- deleteAsync();
+ deleteNoChecks();
}
};
_subject = new Subject(false, _connection.getSubject().getPrincipals(),
@@ -186,13 +184,11 @@ public abstract class AbstractAMQPSession<S extends AbstractAMQPSession<S, X>,
_taskList.remove(task);
}
- @StateTransition(currentState = State.ACTIVE, desiredState = State.DELETED)
- private ListenableFuture<Void> doDelete()
+ @Override
+ protected ListenableFuture<Void> onDelete()
{
- deleted();
- setState(State.DELETED);
removeDeleteTask(_deleteModelTask);
- return Futures.immediateFuture(null);
+ return super.onDelete();
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org