From 6ad1270085d8c3c36806697c55eae530adbf5908 Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Fri, 9 May 2014 16:34:53 +0000 Subject: QPID-5574 : [Java Broker] remove redundant state transitions git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1593576 13f79535-47bb-0310-9956-ffa450edef68 --- .../qpid/server/model/AbstractConfiguredObject.java | 5 ----- .../model/adapter/FileBasedGroupProviderImpl.java | 12 ++---------- .../adapter/FileSystemPreferencesProviderImpl.java | 11 ++--------- .../apache/qpid/server/model/port/AbstractPort.java | 18 +++++++++--------- .../auth/manager/AbstractAuthenticationManager.java | 9 +-------- .../qpid/server/virtualhost/AbstractVirtualHost.java | 11 ++--------- .../plugins/ACLFileAccessControlProviderImpl.java | 9 +-------- .../qpid/server/management/plugin/HttpManagement.java | 7 ------- .../qpid/server/jmx/JMXManagementPluginImpl.java | 7 ------- 9 files changed, 17 insertions(+), 72 deletions(-) (limited to 'qpid/java') diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java index 826917a848..e67191b744 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java @@ -1097,11 +1097,6 @@ public abstract class AbstractConfiguredObject> im } - public final void quiesce() - { - setDesiredState(State.QUIESCED); - } - public final void stop() { setDesiredState(State.STOPPED); diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java index e2893e57e4..c576fa4e25 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java @@ -270,7 +270,7 @@ public class FileBasedGroupProviderImpl return _broker.getSecurityManager(); } - @StateTransition( currentState = { State.UNINITIALIZED, State.QUIESCED, State.STOPPED }, desiredState = State.ACTIVE ) + @StateTransition( currentState = { State.UNINITIALIZED, State.QUIESCED }, desiredState = State.ACTIVE ) private void activate() { try @@ -288,7 +288,7 @@ public class FileBasedGroupProviderImpl } } - @StateTransition( currentState = { State.QUIESCED, State.ACTIVE, State.STOPPED, State.ERRORED}, desiredState = State.DELETED ) + @StateTransition( currentState = { State.QUIESCED, State.ACTIVE, State.ERRORED}, desiredState = State.DELETED ) private void doDelete() { File file = new File(getPath()); @@ -304,14 +304,6 @@ public class FileBasedGroupProviderImpl _state.set(State.DELETED); } - - @StateTransition( currentState = { State.UNINITIALIZED, State.ACTIVE, State.QUIESCED}, desiredState = State.STOPPED ) - private void doStop() - { - // TODO - this seem inadequate :-) - _state.set(State.STOPPED); - } - @StateTransition( currentState = State.UNINITIALIZED, desiredState = State.QUIESCED) private void startQuiesced() { diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java index bb9d5c9ce5..7d594af9c2 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java @@ -132,13 +132,6 @@ public class FileSystemPreferencesProviderImpl return super.getAttribute(name); } - @StateTransition(currentState = { State.ACTIVE, State.QUIESCED }, desiredState = State.STOPPED) - private void doStop() - { - close(); - _state = State.STOPPED; - } - protected void onClose() { if(_store != null) @@ -157,7 +150,7 @@ public class FileSystemPreferencesProviderImpl _state = State.QUIESCED; } - @StateTransition(currentState = { State.ACTIVE, State.QUIESCED, State.STOPPED, State.ERRORED }, desiredState = State.DELETED ) + @StateTransition(currentState = { State.ACTIVE, State.QUIESCED, State.ERRORED }, desiredState = State.DELETED ) private void doDelete() { close(); @@ -172,7 +165,7 @@ public class FileSystemPreferencesProviderImpl _state = State.DELETED; } - @StateTransition(currentState = { State.QUIESCED, State.STOPPED, State.ERRORED }, desiredState = State.ACTIVE ) + @StateTransition(currentState = { State.QUIESCED, State.ERRORED }, desiredState = State.ACTIVE ) private void restart() { _store.open(); diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java index ac1944e4b9..32587c0f4e 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java @@ -293,21 +293,14 @@ abstract public class AbstractPort> extends AbstractCo return super.getAttribute(name); } - @StateTransition(currentState = { State.ACTIVE, State.QUIESCED, State.STOPPED, State.ERRORED}, desiredState = State.DELETED ) + @StateTransition(currentState = { State.ACTIVE, State.QUIESCED, State.ERRORED}, desiredState = State.DELETED ) private void doDelete() { close(); _state = State.DELETED; } - @StateTransition(currentState = { State.ACTIVE, State.QUIESCED, State.ERRORED}, desiredState = State.STOPPED ) - private void doStop() - { - close(); - _state = State.STOPPED; - } - - @StateTransition( currentState = {State.UNINITIALIZED, State.QUIESCED, State.STOPPED}, desiredState = State.ACTIVE ) + @StateTransition( currentState = {State.UNINITIALIZED, State.QUIESCED}, desiredState = State.ACTIVE ) protected void activate() { try @@ -322,6 +315,13 @@ abstract public class AbstractPort> extends AbstractCo } } + @StateTransition( currentState = State.UNINITIALIZED, desiredState = State.QUIESCED) + private void startQuiesced() + { + _state = State.QUIESCED; + } + + protected State onActivate() { // no-op: expected to be overridden by subclass diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java index bfd1d9c824..597b9e3bb1 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java @@ -180,13 +180,6 @@ public abstract class AbstractAuthenticationManager> exte return _broker.getSecurityManager(); } - @StateTransition( currentState = { State.ACTIVE, State.QUIESCED, State.ERRORED}, desiredState = State.STOPPED ) - public void doStop() - { - close(); - _state = VirtualHostState.STOPPED; - } - protected void onClose() { //Stop Connections @@ -1252,7 +1245,7 @@ public abstract class AbstractVirtualHost> exte return _housekeepingThreadCount; } - @StateTransition( currentState = { State.ACTIVE, State.QUIESCED, State.ERRORED, State.STOPPED}, desiredState = State.DELETED ) + @StateTransition( currentState = { State.ACTIVE, State.QUIESCED, State.ERRORED }, desiredState = State.DELETED ) private void doDelete() { if(_deleted.compareAndSet(false,true)) @@ -1439,7 +1432,7 @@ public abstract class AbstractVirtualHost> exte getDurableConfigurationStore().create(new ConfiguredObjectRecordImpl(record.getId(), record.getType(), record.getAttributes())); } - @StateTransition( currentState = {State.UNINITIALIZED, State.STOPPED, State.ERRORED, State.QUIESCED}, desiredState = State.ACTIVE ) + @StateTransition( currentState = {State.UNINITIALIZED, State.ERRORED, State.QUIESCED}, desiredState = State.ACTIVE ) protected void activate() { _houseKeepingTasks = new ScheduledThreadPoolExecutor(getHousekeepingThreadCount()); diff --git a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java index 0b31bdbc14..5708e27e33 100644 --- a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java +++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java @@ -140,13 +140,6 @@ public class ACLFileAccessControlProviderImpl } } - @StateTransition(currentState = {State.ACTIVE, State.QUIESCED}, desiredState = State.STOPPED) - private void doStop() - { - close(); - _state.set(State.STOPPED); - } - @Override protected void onClose() { @@ -160,7 +153,7 @@ public class ACLFileAccessControlProviderImpl _state.set(State.QUIESCED); } - @StateTransition(currentState = {State.ACTIVE, State.QUIESCED, State.STOPPED, State.ERRORED}, desiredState = State.DELETED) + @StateTransition(currentState = {State.ACTIVE, State.QUIESCED, State.ERRORED}, desiredState = State.DELETED) private void doDelete() { close(); diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java index 881d359e9b..47a62f2962 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java +++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java @@ -136,13 +136,6 @@ public class HttpManagement extends AbstractPluginAdapter implem setCurrentState(State.ACTIVE); } - @StateTransition(currentState = State.ACTIVE, desiredState = State.STOPPED) - private void doStop() - { - close(); - setCurrentState(State.STOPPED); - } - @Override protected void onClose() { diff --git a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java index 9d1cd8df59..4b4b78decc 100644 --- a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java +++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java @@ -221,13 +221,6 @@ public class JMXManagementPluginImpl return port.getAvailableProtocols().contains(Protocol.RMI); } - @StateTransition( currentState = State.ACTIVE, desiredState = State.STOPPED ) - private void doStop() - { - close(); - setCurrentState(State.STOPPED); - } - @Override protected void onClose() { -- cgit v1.2.1