Delete deprecated RebindManager.rebind() methods Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/deb7c6b6 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/deb7c6b6 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/deb7c6b6
Branch: refs/heads/master Commit: deb7c6b6226a1c7ee24139a939763b549ac752c1 Parents: 036de3c Author: Aled Sage <[email protected]> Authored: Tue Sep 26 12:36:32 2017 +0100 Committer: Aled Sage <[email protected]> Committed: Mon Oct 2 06:08:30 2017 +0100 ---------------------------------------------------------------------- .../brooklyn/api/mgmt/rebind/RebindManager.java | 7 ------- .../internal/NonDeploymentManagementContext.java | 15 --------------- .../brooklyn/core/mgmt/rebind/RebindManagerImpl.java | 15 --------------- 3 files changed, 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/deb7c6b6/api/src/main/java/org/apache/brooklyn/api/mgmt/rebind/RebindManager.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/brooklyn/api/mgmt/rebind/RebindManager.java b/api/src/main/java/org/apache/brooklyn/api/mgmt/rebind/RebindManager.java index 4e1125b..0052066 100644 --- a/api/src/main/java/org/apache/brooklyn/api/mgmt/rebind/RebindManager.java +++ b/api/src/main/java/org/apache/brooklyn/api/mgmt/rebind/RebindManager.java @@ -59,13 +59,6 @@ public interface RebindManager { @VisibleForTesting public BrooklynMementoPersister getPersister(); - /** @deprecated since 0.7; use {@link #rebind(ClassLoader, RebindExceptionHandler, ManagementNodeState)} */ @Deprecated - public List<Application> rebind(); - - /** @deprecated since 0.7; use {@link #rebind(ClassLoader, RebindExceptionHandler, ManagementNodeState)} */ @Deprecated - public List<Application> rebind(ClassLoader classLoader); - /** @deprecated since 0.7; use {@link #rebind(ClassLoader, RebindExceptionHandler, ManagementNodeState)} */ @Deprecated - public List<Application> rebind(ClassLoader classLoader, RebindExceptionHandler exceptionHandler); /** Causes this management context to rebind, loading data from the given backing store. * use wisely, as this can cause local entities to be completely lost, or will throw in many other situations. * in general it may be invoked for a new node becoming {@link ManagementNodeState#MASTER} http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/deb7c6b6/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/NonDeploymentManagementContext.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/NonDeploymentManagementContext.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/NonDeploymentManagementContext.java index 2e9238f..1e630f6 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/NonDeploymentManagementContext.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/NonDeploymentManagementContext.java @@ -536,21 +536,6 @@ public class NonDeploymentManagementContext implements ManagementContextInternal } @Override - public List<Application> rebind() { - throw new IllegalStateException("Non-deployment context "+NonDeploymentManagementContext.this+" is not valid for this operation."); - } - - @Override - public List<Application> rebind(ClassLoader classLoader) { - throw new IllegalStateException("Non-deployment context "+NonDeploymentManagementContext.this+" is not valid for this operation."); - } - - @Override - public List<Application> rebind(ClassLoader classLoader, RebindExceptionHandler exceptionHandler) { - throw new IllegalStateException("Non-deployment context "+NonDeploymentManagementContext.this+" is not valid for this operation."); - } - - @Override public List<Application> rebind(ClassLoader classLoader, RebindExceptionHandler exceptionHandler, ManagementNodeState mode) { throw new IllegalStateException("Non-deployment context "+NonDeploymentManagementContext.this+" is not valid for this operation."); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/deb7c6b6/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindManagerImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindManagerImpl.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindManagerImpl.java index d605753..dfccb64 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindManagerImpl.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindManagerImpl.java @@ -485,21 +485,6 @@ public class RebindManagerImpl implements RebindManager { } @Override - public List<Application> rebind() { - return rebind(null, null, null); - } - - @Override - public List<Application> rebind(final ClassLoader classLoader) { - return rebind(classLoader, null, null); - } - - @Override - public List<Application> rebind(final ClassLoader classLoader, final RebindExceptionHandler exceptionHandler) { - return rebind(classLoader, exceptionHandler, null); - } - - @Override public List<Application> rebind(ClassLoader classLoaderO, RebindExceptionHandler exceptionHandlerO, ManagementNodeState modeO) { final ClassLoader classLoader = classLoaderO!=null ? classLoaderO : managementContext.getCatalogClassLoader();
