Repository: incubator-brooklyn Updated Branches: refs/heads/master f517b66c2 -> a0aaf3c1e
MachineLifecycleEffectorTasks backwards compatibility Add back in the anonymous inner classes for new(Start|Stop|Restart)EffectorTask Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/0f4dcd7a Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/0f4dcd7a Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/0f4dcd7a Branch: refs/heads/master Commit: 0f4dcd7a8ebff1f5ed72d3b442a93e204a53a2df Parents: f5f0126 Author: Aled Sage <[email protected]> Authored: Fri Jul 31 22:03:39 2015 +0100 Committer: Aled Sage <[email protected]> Committed: Fri Jul 31 22:41:13 2015 +0100 ---------------------------------------------------------------------- .../software/MachineLifecycleEffectorTasks.java | 34 ++++++++++++++++++++ 1 file changed, 34 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0f4dcd7a/software/base/src/main/java/brooklyn/entity/software/MachineLifecycleEffectorTasks.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/software/MachineLifecycleEffectorTasks.java b/software/base/src/main/java/brooklyn/entity/software/MachineLifecycleEffectorTasks.java index 48bb6a4..8670140 100644 --- a/software/base/src/main/java/brooklyn/entity/software/MachineLifecycleEffectorTasks.java +++ b/software/base/src/main/java/brooklyn/entity/software/MachineLifecycleEffectorTasks.java @@ -171,6 +171,24 @@ public abstract class MachineLifecycleEffectorTasks { * Calls {@link #start(Collection)} in this class. */ public EffectorBody<Void> newStartEffectorTask() { + // TODO included anonymous inner class for backwards compatibility with persisted state. + new EffectorBody<Void>() { + @Override + public Void call(ConfigBag parameters) { + Collection<? extends Location> locations = null; + + Object locationsRaw = parameters.getStringKey(LOCATIONS.getName()); + locations = Locations.coerceToCollection(entity().getManagementContext(), locationsRaw); + + if (locations==null) { + // null/empty will mean to inherit from parent + locations = Collections.emptyList(); + } + + start(locations); + return null; + } + }; return new StartEffectorBody(); } @@ -199,6 +217,14 @@ public abstract class MachineLifecycleEffectorTasks { * @see {@link #newStartEffectorTask()} */ public EffectorBody<Void> newRestartEffectorTask() { + // TODO included anonymous inner class for backwards compatibility with persisted state. + new EffectorBody<Void>() { + @Override + public Void call(ConfigBag parameters) { + restart(parameters); + return null; + } + }; return new RestartEffectorBody(); } @@ -216,6 +242,14 @@ public abstract class MachineLifecycleEffectorTasks { * @see {@link #newStartEffectorTask()} */ public EffectorBody<Void> newStopEffectorTask() { + // TODO included anonymous inner class for backwards compatibility with persisted state. + new EffectorBody<Void>() { + @Override + public Void call(ConfigBag parameters) { + stop(parameters); + return null; + } + }; return new StopEffectorBody(); }
