Delete deprecated ManagementNodeState.UNINITIALISED
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/29c9718c Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/29c9718c Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/29c9718c Branch: refs/heads/master Commit: 29c9718c46438893b5729fd4ab46d0c762a47ded Parents: 29cbd0f Author: Aled Sage <[email protected]> Authored: Tue Jul 28 22:51:59 2015 +0100 Committer: Aled Sage <[email protected]> Committed: Sat Aug 1 00:13:31 2015 +0100 ---------------------------------------------------------------------- .../main/java/brooklyn/management/ha/ManagementNodeState.java | 2 -- .../java/brooklyn/management/ha/HighAvailabilityManagerImpl.java | 4 ---- 2 files changed, 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/29c9718c/api/src/main/java/brooklyn/management/ha/ManagementNodeState.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/brooklyn/management/ha/ManagementNodeState.java b/api/src/main/java/brooklyn/management/ha/ManagementNodeState.java index d7608bd..ac54ef2 100644 --- a/api/src/main/java/brooklyn/management/ha/ManagementNodeState.java +++ b/api/src/main/java/brooklyn/management/ha/ManagementNodeState.java @@ -21,8 +21,6 @@ package brooklyn.management.ha; import brooklyn.util.guava.Maybe; public enum ManagementNodeState { - /** @deprecated since 0.7.0 synonym for maintenance (plus, it should have been US English!) */ - UNINITIALISED, /** Node is either coming online, or is in some kind of recovery/transitioning mode */ INITIALIZING, http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/29c9718c/core/src/main/java/brooklyn/management/ha/HighAvailabilityManagerImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/management/ha/HighAvailabilityManagerImpl.java b/core/src/main/java/brooklyn/management/ha/HighAvailabilityManagerImpl.java index 96e6bea..4c631c7 100644 --- a/core/src/main/java/brooklyn/management/ha/HighAvailabilityManagerImpl.java +++ b/core/src/main/java/brooklyn/management/ha/HighAvailabilityManagerImpl.java @@ -515,7 +515,6 @@ public class HighAvailabilityManagerImpl implements HighAvailabilityManager { } } - @SuppressWarnings("deprecation") @Override public ManagementNodeState getNodeState() { ManagementNodeState myNodeState = getInternalNodeState(); @@ -524,9 +523,6 @@ public class HighAvailabilityManagerImpl implements HighAvailabilityManager { // (we may fail subsequently of course) if (myNodeState==ManagementNodeState.MASTER) return myNodeState; - // for backwards compatibility; remove in 0.8.0 - if (myNodeState==ManagementNodeState.UNINITIALISED) return ManagementNodeState.INITIALIZING; - if (!nodeStateTransitionComplete) return ManagementNodeState.INITIALIZING; return myNodeState; }
