You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by dr...@apache.org on 2017/10/02 12:49:57 UTC
[06/10] brooklyn-server git commit: Delete deprecated
RebindManager.forcePersistNow()
Delete deprecated RebindManager.forcePersistNow()
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/fca6f141
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/fca6f141
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/fca6f141
Branch: refs/heads/master
Commit: fca6f141ede640455b210d800561ba2e8904753a
Parents: 25a4f92
Author: Aled Sage <al...@gmail.com>
Authored: Tue Sep 26 12:57:16 2017 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Mon Oct 2 06:08:30 2017 +0100
----------------------------------------------------------------------
.../org/apache/brooklyn/api/mgmt/rebind/RebindManager.java | 7 +------
.../core/mgmt/internal/NonDeploymentManagementContext.java | 4 ----
.../apache/brooklyn/core/mgmt/rebind/RebindManagerImpl.java | 6 ------
.../brooklyn/core/mgmt/rebind/RebindFeedWithHaTest.java | 3 +--
.../launcher/CleanOrphanedLocationsIntegrationTest.java | 2 +-
5 files changed, 3 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/fca6f141/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 0052066..e87a577 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
@@ -100,12 +100,7 @@ public interface RebindManager {
@VisibleForTesting
/** waits for any needed or pending writes to complete */
public void waitForPendingComplete(Duration duration, boolean canTrigger) throws InterruptedException, TimeoutException;
- /** Forcibly performs persistence, in the foreground
- * @deprecated since 0.7.0; use {@link #forcePersistNow(boolean, PersistenceExceptionHandler)},
- * default parameter here is false to mean incremental, with null/default exception handler */
- @Deprecated
- @VisibleForTesting
- public void forcePersistNow();
+
/** Forcibly performs persistence, in the foreground, either full (all entities) or incremental;
* if no exception handler specified, the default one from the persister is used.
* <p>
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/fca6f141/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 1e630f6..bf2c498 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
@@ -575,10 +575,6 @@ public class NonDeploymentManagementContext implements ManagementContextInternal
throw new IllegalStateException("Non-deployment context "+NonDeploymentManagementContext.this+" is not valid for this operation.");
}
@Override
- public void forcePersistNow() {
- throw new IllegalStateException("Non-deployment context "+NonDeploymentManagementContext.this+" is not valid for this operation.");
- }
- @Override
public void forcePersistNow(boolean full, PersistenceExceptionHandler exceptionHandler) {
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/fca6f141/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 dfccb64..4cf2b0f 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
@@ -455,12 +455,6 @@ public class RebindManagerImpl implements RebindManager {
@Override
@VisibleForTesting
- public void forcePersistNow() {
- forcePersistNow(false, null);
- }
-
- @Override
- @VisibleForTesting
public void forcePersistNow(boolean full, PersistenceExceptionHandler exceptionHandler) {
if (persistenceStoreAccess == null || persistenceRealChangeListener == null) {
LOG.info("Skipping forced persist; no persistence mechanism available");
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/fca6f141/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindFeedWithHaTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindFeedWithHaTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindFeedWithHaTest.java
index a38a873..5f534f9 100644
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindFeedWithHaTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindFeedWithHaTest.java
@@ -31,7 +31,6 @@ import org.apache.brooklyn.api.mgmt.ha.HighAvailabilityMode;
import org.apache.brooklyn.api.sensor.AttributeSensor;
import org.apache.brooklyn.api.sensor.Feed;
import org.apache.brooklyn.core.entity.EntityAsserts;
-import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext;
import org.apache.brooklyn.core.test.entity.TestApplication;
import org.apache.brooklyn.core.test.entity.TestEntity;
import org.apache.brooklyn.util.core.http.BetterMockWebServer;
@@ -90,7 +89,7 @@ public class RebindFeedWithHaTest extends RebindTestFixtureWithApp {
EntityAsserts.assertAttributeEqualsEventually(origEntity, SENSOR_INT, 200);
EntityAsserts.assertAttributeEqualsEventually(origEntity, SENSOR_STRING, "{\"foo\":\"myfoo\"}");
assertEquals(origEntity.feeds().getFeeds().size(), 1);
- origManagementContext.getRebindManager().forcePersistNow();
+ origManagementContext.getRebindManager().forcePersistNow(false, null);
List<Task<?>> tasksBefore = ((BasicExecutionManager)origManagementContext.getExecutionManager()).getAllTasks();
log.info("tasks before disabling HA, "+tasksBefore.size()+": "+tasksBefore);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/fca6f141/launcher/src/test/java/org/apache/brooklyn/launcher/CleanOrphanedLocationsIntegrationTest.java
----------------------------------------------------------------------
diff --git a/launcher/src/test/java/org/apache/brooklyn/launcher/CleanOrphanedLocationsIntegrationTest.java b/launcher/src/test/java/org/apache/brooklyn/launcher/CleanOrphanedLocationsIntegrationTest.java
index 09d938d..2722450 100644
--- a/launcher/src/test/java/org/apache/brooklyn/launcher/CleanOrphanedLocationsIntegrationTest.java
+++ b/launcher/src/test/java/org/apache/brooklyn/launcher/CleanOrphanedLocationsIntegrationTest.java
@@ -138,7 +138,7 @@ public class CleanOrphanedLocationsIntegrationTest extends AbstractCleanOrphaned
PersistenceExceptionHandler persistenceExceptionHandler = PersistenceExceptionHandlerImpl.builder().build();
((RebindManagerImpl) rebindManager).setPeriodicPersistPeriod(Duration.ONE_SECOND);
rebindManager.setPersister(persister, persistenceExceptionHandler);
- ((RebindManagerImpl) rebindManager).forcePersistNow();
+ rebindManager.forcePersistNow(false, null);
}
@Test