This closes #816
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/baf80709 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/baf80709 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/baf80709 Branch: refs/heads/master Commit: baf807097f62c2dbe365102ce759dedbf1c6caad Parents: c177a7c 447283b Author: Alex Heneveld <[email protected]> Authored: Tue Oct 3 15:23:16 2017 +0100 Committer: Alex Heneveld <[email protected]> Committed: Tue Oct 3 15:23:16 2017 +0100 ---------------------------------------------------------------------- .../brooklyn/api/mgmt/ExecutionContext.java | 30 +- .../java/org/apache/brooklyn/api/mgmt/Task.java | 18 +- .../brooklyn/core/config/BasicConfigKey.java | 4 +- .../brooklyn/core/config/ConfigConstraints.java | 1 + .../brooklyn/core/effector/Effectors.java | 2 +- .../org/apache/brooklyn/core/feed/Poller.java | 41 +- .../brooklyn/core/mgmt/BrooklynTaskTags.java | 12 +- .../core/mgmt/EntityManagementUtils.java | 1 + .../mgmt/ha/HighAvailabilityManagerImpl.java | 2 +- .../internal/AbstractManagementContext.java | 5 +- .../mgmt/internal/BrooklynGarbageCollector.java | 25 +- .../mgmt/internal/EntityManagementSupport.java | 1 + .../internal/QueueingSubscriptionManager.java | 2 + .../rebind/PeriodicDeltaChangeListener.java | 4 +- .../core/mgmt/rebind/RebindManagerImpl.java | 2 +- .../AbstractConfigurationSupportInternal.java | 8 +- .../location/ssh/SshMachineLocation.java | 6 +- .../util/core/task/BasicExecutionContext.java | 345 ++++++++++++----- .../util/core/task/BasicExecutionManager.java | 372 ++++++++++++------- .../brooklyn/util/core/task/BasicTask.java | 67 ++-- .../brooklyn/util/core/task/CompoundTask.java | 4 - .../util/core/task/DynamicSequentialTask.java | 1 + .../brooklyn/util/core/task/DynamicTasks.java | 1 + .../brooklyn/util/core/task/ForwardingTask.java | 16 + .../core/task/ListenableForwardingFuture.java | 75 ---- .../brooklyn/util/core/task/ScheduledTask.java | 55 ++- .../brooklyn/util/core/task/TaskInternal.java | 16 +- .../task/TaskInternalCancellableWithMode.java | 32 ++ .../brooklyn/util/core/task/TaskTags.java | 10 +- .../apache/brooklyn/util/core/task/Tasks.java | 4 +- .../brooklyn/util/core/task/ValueResolver.java | 10 +- .../core/effector/EffectorSayHiTest.java | 20 +- .../brooklyn/core/entity/EntityConfigTest.java | 12 + .../internal/EntityExecutionManagerTest.java | 1 - .../core/mgmt/rebind/RebindFeedTest.java | 4 +- .../util/core/task/BasicTasksFutureTest.java | 58 ++- .../core/task/DynamicSequentialTaskTest.java | 17 +- .../core/task/NonBasicTaskExecutionTest.java | 8 +- .../util/core/task/ScheduledExecutionTest.java | 19 +- .../util/core/task/ValueResolverTest.java | 3 +- .../policy/ha/AbstractFailureDetector.java | 3 +- .../java/org/apache/brooklyn/test/Asserts.java | 27 +- .../brooklyn/util/collections/MutableSet.java | 14 +- .../org/apache/brooklyn/util/guava/Maybe.java | 43 ++- .../apache/brooklyn/util/repeat/Repeater.java | 25 +- 45 files changed, 954 insertions(+), 472 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/baf80709/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/HighAvailabilityManagerImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/baf80709/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AbstractManagementContext.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/baf80709/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindManagerImpl.java ----------------------------------------------------------------------
