Add TaskBuilder.displayName; deprecate TaskBuilder.name Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/f4533edb Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/f4533edb Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/f4533edb
Branch: refs/heads/master Commit: f4533edb6bc17de165813192c063d7b5c27f02d3 Parents: 147f9ec Author: Aled Sage <[email protected]> Authored: Thu Aug 20 12:27:43 2015 +0100 Committer: Aled Sage <[email protected]> Committed: Thu Aug 20 12:32:18 2015 +0100 ---------------------------------------------------------------------- .../brooklyn/core/effector/EffectorTasks.java | 4 ++-- .../org/apache/brooklyn/core/feed/Poller.java | 2 +- .../brooklyn/core/mgmt/EntityManagementUtils.java | 6 +++--- .../core/mgmt/ha/HighAvailabilityManagerImpl.java | 2 +- .../core/mgmt/internal/BrooklynShutdownHooks.java | 2 +- .../mgmt/rebind/PeriodicDeltaChangeListener.java | 2 +- .../core/mgmt/rebind/RebindManagerImpl.java | 2 +- .../core/objs/proxy/InternalEntityFactory.java | 2 +- .../core/sensor/DependentConfiguration.java | 8 ++++---- .../brooklyn/entity/group/DynamicGroupImpl.java | 2 +- .../brooklyn/location/ssh/SshMachineLocation.java | 2 +- .../brooklyn/util/core/file/ArchiveTasks.java | 2 +- .../util/core/task/BasicExecutionContext.java | 4 ++-- .../apache/brooklyn/util/core/task/BasicTask.java | 2 +- .../util/core/task/DynamicSequentialTask.java | 2 +- .../brooklyn/util/core/task/DynamicTasks.java | 4 ++-- .../brooklyn/util/core/task/TaskBuilder.java | 18 +++++++++++++----- .../org/apache/brooklyn/util/core/task/Tasks.java | 12 ++++++------ .../brooklyn/util/core/task/ValueResolver.java | 2 +- .../util/core/task/ssh/SshFetchTaskWrapper.java | 2 +- .../util/core/task/ssh/SshPutTaskWrapper.java | 2 +- .../brooklyn/util/core/task/ssh/SshTasks.java | 2 +- .../internal/AbstractProcessTaskFactory.java | 2 +- .../brooklyn/core/effector/EffectorTaskTest.java | 12 ++++++------ .../core/entity/trait/FailingEntityImpl.java | 2 +- .../core/entity/trait/StartableMethodsTest.java | 2 +- .../mgmt/internal/EntityExecutionManagerTest.java | 8 ++++---- .../policy/autoscaling/AutoScalerPolicy.java | 2 +- .../apache/brooklyn/entity/salt/SaltTasks.java | 4 ++-- .../brooklynnode/BrooklynEntityMirrorImpl.java | 2 +- .../entity/brooklynnode/BrooklynNodeImpl.java | 2 +- .../BrooklynClusterUpgradeEffectorBody.java | 2 +- .../effector/BrooklynNodeUpgradeEffectorBody.java | 10 +++++----- .../apache/brooklyn/entity/chef/ChefTasks.java | 4 ++-- .../software/base/SameServerEntityImpl.java | 6 +++--- .../entity/software/base/SoftwareProcessImpl.java | 6 +++--- .../lifecycle/MachineLifecycleEffectorTasks.java | 2 +- .../software/base/lifecycle/ScriptHelper.java | 2 +- .../system_service/InitdServiceInstaller.java | 2 +- .../system_service/SystemServiceEnricher.java | 6 +++--- .../entity/database/mysql/MySqlClusterImpl.java | 4 ++-- .../nosql/couchbase/CouchbaseClusterImpl.java | 2 +- .../nosql/couchbase/CouchbaseNodeSshDriver.java | 2 +- .../entity/proxy/AbstractControllerImpl.java | 2 +- .../entity/webapp/DynamicWebAppClusterImpl.java | 10 +++++----- .../brooklyn/spi/dsl/methods/DslComponent.java | 6 +++--- 46 files changed, 98 insertions(+), 90 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4533edb/core/src/main/java/org/apache/brooklyn/core/effector/EffectorTasks.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/effector/EffectorTasks.java b/core/src/main/java/org/apache/brooklyn/core/effector/EffectorTasks.java index 39eb79b..e990bac 100644 --- a/core/src/main/java/org/apache/brooklyn/core/effector/EffectorTasks.java +++ b/core/src/main/java/org/apache/brooklyn/core/effector/EffectorTasks.java @@ -155,10 +155,10 @@ public class EffectorTasks { private TaskBuilder<T> builder; public ParameterTask(ConfigKey<T> p) { this.p = p; - this.builder = Tasks.<T>builder().name("parameter "+p); + this.builder = Tasks.<T>builder().displayName("parameter "+p); } public ParameterTask<T> name(String taskName) { - builder.name(taskName); + builder.displayName(taskName); return this; } @Override http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4533edb/core/src/main/java/org/apache/brooklyn/core/feed/Poller.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/feed/Poller.java b/core/src/main/java/org/apache/brooklyn/core/feed/Poller.java index fd50ebd..d57f826 100644 --- a/core/src/main/java/org/apache/brooklyn/core/feed/Poller.java +++ b/core/src/main/java/org/apache/brooklyn/core/feed/Poller.java @@ -134,7 +134,7 @@ public class Poller<V> { started = true; for (final Callable<?> oneOffJob : oneOffJobs) { - Task<?> task = Tasks.builder().dynamic(false).body((Callable<Object>) oneOffJob).name("Poll").description("One-time poll job "+oneOffJob).build(); + Task<?> task = Tasks.builder().dynamic(false).body((Callable<Object>) oneOffJob).displayName("Poll").description("One-time poll job "+oneOffJob).build(); oneOffTasks.add(((EntityInternal)entity).getExecutionContext().submit(task)); } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4533edb/core/src/main/java/org/apache/brooklyn/core/mgmt/EntityManagementUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/EntityManagementUtils.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/EntityManagementUtils.java index 49e1c1c..1391dc4 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/EntityManagementUtils.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/EntityManagementUtils.java @@ -196,7 +196,7 @@ public class EntityManagementUtils { int size = children.size(); childrenCountString = size+" "+(size!=1 ? "children" : "child"); - TaskBuilder<List<String>> taskM = Tasks.<List<String>>builder().name("add children") + TaskBuilder<List<String>> taskM = Tasks.<List<String>>builder().displayName("add children") .dynamic(true) .tag(BrooklynTaskTags.NON_TRANSIENT_TASK_TAG) .body(new Callable<List<String>>() { @@ -205,7 +205,7 @@ public class EntityManagementUtils { }}) .description("Add and start "+childrenCountString); - TaskBuilder<?> taskS = Tasks.builder().parallel(true).name("add (parallel)").description("Start each new entity"); + TaskBuilder<?> taskS = Tasks.builder().parallel(true).displayName("add (parallel)").description("Start each new entity"); // autostart if requested for (Entity child: children) { @@ -213,7 +213,7 @@ public class EntityManagementUtils { taskS.add(Effectors.invocation(child, Startable.START, ImmutableMap.of("locations", ImmutableList.of()))); } else { // include a task, just to give feedback in the GUI - taskS.add(Tasks.builder().name("create").description("Skipping start (not a Startable Entity)") + taskS.add(Tasks.builder().displayName("create").description("Skipping start (not a Startable Entity)") .body(new Runnable() { public void run() {} }) .tag(BrooklynTaskTags.tagForTargetEntity(child)) .build()); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4533edb/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/HighAvailabilityManagerImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/HighAvailabilityManagerImpl.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/HighAvailabilityManagerImpl.java index 95e5ef1..0d8de30 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/HighAvailabilityManagerImpl.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/HighAvailabilityManagerImpl.java @@ -557,7 +557,7 @@ public class HighAvailabilityManagerImpl implements HighAvailabilityManager { }; Callable<Task<?>> taskFactory = new Callable<Task<?>>() { @Override public Task<?> call() { - return Tasks.builder().dynamic(false).body(job).name("HA poller task").tag(BrooklynTaskTags.TRANSIENT_TASK_TAG) + return Tasks.builder().dynamic(false).body(job).displayName("HA poller task").tag(BrooklynTaskTags.TRANSIENT_TASK_TAG) .description("polls HA status to see whether this node should promote").build(); } }; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4533edb/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/BrooklynShutdownHooks.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/BrooklynShutdownHooks.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/BrooklynShutdownHooks.java index eaebcfb..677a4f6 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/BrooklynShutdownHooks.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/BrooklynShutdownHooks.java @@ -216,7 +216,7 @@ public class BrooklynShutdownHooks { for (Entity entityToStop: entitiesToStop) { final Entity entity = entityToStop; if (!Entities.isManaged(entity)) continue; - Task<Object> t = Tasks.builder().dynamic(false).name("destroying "+entity).body(new Runnable() { + Task<Object> t = Tasks.builder().dynamic(false).displayName("destroying "+entity).body(new Runnable() { @Override public void run() { Entities.destroy(entity); } }).build(); stops.add( ((EntityInternal)entity).getExecutionContext().submit(t) ); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4533edb/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/PeriodicDeltaChangeListener.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/PeriodicDeltaChangeListener.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/PeriodicDeltaChangeListener.java index 78e668a..21f7719 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/PeriodicDeltaChangeListener.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/PeriodicDeltaChangeListener.java @@ -207,7 +207,7 @@ public class PeriodicDeltaChangeListener implements ChangeListener { Callable<Task<?>> taskFactory = new Callable<Task<?>>() { @Override public Task<Void> call() { - return Tasks.<Void>builder().dynamic(false).name("periodic-persister").body(new Callable<Void>() { + return Tasks.<Void>builder().dynamic(false).displayName("periodic-persister").body(new Callable<Void>() { public Void call() { persistNowSafely(); return null; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4533edb/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 52b984a..dccd91a 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 @@ -302,7 +302,7 @@ public class RebindManagerImpl implements RebindManager { Callable<Task<?>> taskFactory = new Callable<Task<?>>() { @Override public Task<Void> call() { - return Tasks.<Void>builder().dynamic(false).name("rebind (periodic run").body(new Callable<Void>() { + return Tasks.<Void>builder().dynamic(false).displayName("rebind (periodic run").body(new Callable<Void>() { public Void call() { try { rebind(null, null, mode); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4533edb/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalEntityFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalEntityFactory.java b/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalEntityFactory.java index c5d1c80..9547c9d 100644 --- a/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalEntityFactory.java +++ b/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalEntityFactory.java @@ -279,7 +279,7 @@ public class InternalEntityFactory extends InternalFactory { * of the parent entity creating this child entity * (note however such subtasks are currently filtered based on parent entity so is excluded). */ - ((EntityInternal)entity).getExecutionContext().submit(Tasks.builder().dynamic(false).name("Entity initialization") + ((EntityInternal)entity).getExecutionContext().submit(Tasks.builder().dynamic(false).displayName("Entity initialization") .tag(BrooklynTaskTags.tagForContextEntity(entity)) .tag(BrooklynTaskTags.TRANSIENT_TASK_TAG) .body(new Runnable() { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4533edb/core/src/main/java/org/apache/brooklyn/core/sensor/DependentConfiguration.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/sensor/DependentConfiguration.java b/core/src/main/java/org/apache/brooklyn/core/sensor/DependentConfiguration.java index b909856..d4f32d8 100644 --- a/core/src/main/java/org/apache/brooklyn/core/sensor/DependentConfiguration.java +++ b/core/src/main/java/org/apache/brooklyn/core/sensor/DependentConfiguration.java @@ -676,7 +676,7 @@ public class DependentConfiguration { validate(); return Tasks.<V>builder().dynamic(false) - .name("waiting on "+sensor.getName()) + .displayName("waiting on "+sensor.getName()) .description("Waiting on sensor "+sensor.getName()+" from "+source) .tag("attributeWhenReady") .body(new WaitInTaskForAttributeReady<T,V>(this)) @@ -795,7 +795,7 @@ public class DependentConfiguration { tasks.add(builder.build()); } final Task<List<V>> parallelTask = Tasks.<List<V>>builder().parallel(true).addAll(tasks) - .name(name) + .displayName(name) .description(descriptionBase+ (builder.timeout!=null ? ", timeout "+builder.timeout : "")) .build(); @@ -804,13 +804,13 @@ public class DependentConfiguration { // V2 should be the right type in normal operations return (Task<V2>) parallelTask; } else { - return Tasks.<V2>builder().name(name).description(descriptionBase) + return Tasks.<V2>builder().displayName(name).description(descriptionBase) .tag("attributeWhenReady") .body(new Callable<V2>() { @Override public V2 call() throws Exception { List<V> prePostProgress = DynamicTasks.queue(parallelTask).get(); return DynamicTasks.queue( - Tasks.<V2>builder().name("post-processing").description("Applying "+postProcessFromMultiple) + Tasks.<V2>builder().displayName("post-processing").description("Applying "+postProcessFromMultiple) .body(Functionals.callable(postProcessFromMultiple, prePostProgress)) .build()).get(); } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4533edb/core/src/main/java/org/apache/brooklyn/entity/group/DynamicGroupImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/entity/group/DynamicGroupImpl.java b/core/src/main/java/org/apache/brooklyn/entity/group/DynamicGroupImpl.java index 5e7e166..61f1437 100644 --- a/core/src/main/java/org/apache/brooklyn/entity/group/DynamicGroupImpl.java +++ b/core/src/main/java/org/apache/brooklyn/entity/group/DynamicGroupImpl.java @@ -164,7 +164,7 @@ public class DynamicGroupImpl extends AbstractGroupImpl implements DynamicGroup } setChangeListener = new MyEntitySetChangeListener(); ((ManagementContextInternal) getManagementContext()).addEntitySetListener(setChangeListener); - Task<Object> rescan = Tasks.builder().name("rescan entities").body( + Task<Object> rescan = Tasks.builder().displayName("rescan entities").body( new Runnable() { @Override public void run() { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4533edb/core/src/main/java/org/apache/brooklyn/location/ssh/SshMachineLocation.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/ssh/SshMachineLocation.java b/core/src/main/java/org/apache/brooklyn/location/ssh/SshMachineLocation.java index ddcfcac..27f87f9 100644 --- a/core/src/main/java/org/apache/brooklyn/location/ssh/SshMachineLocation.java +++ b/core/src/main/java/org/apache/brooklyn/location/ssh/SshMachineLocation.java @@ -425,7 +425,7 @@ public class SshMachineLocation extends AbstractLocation implements MachineLocat Callable<Task<?>> cleanupTaskFactory = new Callable<Task<?>>() { @Override public Task<Void> call() { return Tasks.<Void>builder().dynamic(false).tag(BrooklynTaskTags.TRANSIENT_TASK_TAG) - .name("ssh-location cache cleaner").body(new Callable<Void>() { + .displayName("ssh-location cache cleaner").body(new Callable<Void>() { @Override public Void call() { try { if (sshPoolCacheOrNull != null) sshPoolCacheOrNull.cleanUp(); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4533edb/core/src/main/java/org/apache/brooklyn/util/core/file/ArchiveTasks.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/util/core/file/ArchiveTasks.java b/core/src/main/java/org/apache/brooklyn/util/core/file/ArchiveTasks.java index d73526e..51f38e7 100644 --- a/core/src/main/java/org/apache/brooklyn/util/core/file/ArchiveTasks.java +++ b/core/src/main/java/org/apache/brooklyn/util/core/file/ArchiveTasks.java @@ -41,7 +41,7 @@ public class ArchiveTasks { return new TaskFactory<TaskAdaptable<?>>() { @Override public TaskAdaptable<?> newTask() { - return Tasks.<Void>builder().name("deploying "+Urls.getBasename(archiveUrl)).description("installing "+archiveUrl+" and unpacking to "+destDir).body(new Runnable() { + return Tasks.<Void>builder().displayName("deploying "+Urls.getBasename(archiveUrl)).description("installing "+archiveUrl+" and unpacking to "+destDir).body(new Runnable() { @Override public void run() { boolean unpacked = ArchiveUtils.deploy(resolver, props, archiveUrl, machine, destDir, allowNonarchivesOrKeepArchiveAfterDeploy, optionalTmpDir, optionalDestFile); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4533edb/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionContext.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionContext.java b/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionContext.java index 74d4ac3..13dda46 100644 --- a/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionContext.java +++ b/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionContext.java @@ -133,7 +133,7 @@ public class BasicExecutionContext extends AbstractExecutionContext { // so wrap it in a task running in this context to keep a reference to the child // (this matters when we are navigating in the GUI; without it we lose the reference to the child // when browsing in the context of the parent) - return submit(Tasks.<T>builder().name("Cross-context execution: "+t.getDescription()).dynamic(true).body(new Callable<T>() { + return submit(Tasks.<T>builder().displayName("Cross-context execution: "+t.getDescription()).dynamic(true).body(new Callable<T>() { public T call() { return DynamicTasks.get(t); } @@ -145,7 +145,7 @@ public class BasicExecutionContext extends AbstractExecutionContext { } else { // as above, but here we are definitely not a child (what we are submitting isn't even a task) // (will only come here if properties defines tags including a target entity, which probably never happens) - submit(Tasks.<T>builder().name("Cross-context execution").dynamic(true).body(new Callable<T>() { + submit(Tasks.<T>builder().displayName("Cross-context execution").dynamic(true).body(new Callable<T>() { public T call() { if (task instanceof Callable) { return DynamicTasks.queue( Tasks.<T>builder().dynamic(false).body((Callable<T>)task).build() ).getUnchecked(); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4533edb/core/src/main/java/org/apache/brooklyn/util/core/task/BasicTask.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/BasicTask.java b/core/src/main/java/org/apache/brooklyn/util/core/task/BasicTask.java index 365ce3a..0c26dd1 100644 --- a/core/src/main/java/org/apache/brooklyn/util/core/task/BasicTask.java +++ b/core/src/main/java/org/apache/brooklyn/util/core/task/BasicTask.java @@ -856,7 +856,7 @@ public class BasicTask<T> implements TaskInternal<T> { } private static <T> Task<T> newGoneTaskFor(Task<?> task) { - Task<T> t = Tasks.<T>builder().dynamic(false).name(task.getDisplayName()) + Task<T> t = Tasks.<T>builder().dynamic(false).displayName(task.getDisplayName()) .description("Details of the original task "+task+" have been forgotten.") .body(Callables.returning((T)null)).build(); ((BasicTask<T>)t).ignoreIfNotRun(); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4533edb/core/src/main/java/org/apache/brooklyn/util/core/task/DynamicSequentialTask.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/DynamicSequentialTask.java b/core/src/main/java/org/apache/brooklyn/util/core/task/DynamicSequentialTask.java index d649f3c..b7985c8 100644 --- a/core/src/main/java/org/apache/brooklyn/util/core/task/DynamicSequentialTask.java +++ b/core/src/main/java/org/apache/brooklyn/util/core/task/DynamicSequentialTask.java @@ -257,7 +257,7 @@ public class DynamicSequentialTask<T> extends BasicTask<T> implements HasTaskChi // optimisation would either use newTaskEndCallback property on task to submit // or use some kind of single threaded executor for the queued tasks Task<List<Object>> secondaryJobMaster = Tasks.<List<Object>>builder().dynamic(false) - .name("DST manager (internal)") + .displayName("DST manager (internal)") // TODO marking it transient helps it be GC'd sooner, // but ideally we wouldn't have this, // or else it would be a child http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4533edb/core/src/main/java/org/apache/brooklyn/util/core/task/DynamicTasks.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/DynamicTasks.java b/core/src/main/java/org/apache/brooklyn/util/core/task/DynamicTasks.java index b2791b3..52ec88d 100644 --- a/core/src/main/java/org/apache/brooklyn/util/core/task/DynamicTasks.java +++ b/core/src/main/java/org/apache/brooklyn/util/core/task/DynamicTasks.java @@ -264,12 +264,12 @@ public class DynamicTasks { /** @see #queue(org.apache.brooklyn.api.mgmt.TaskAdaptable) */ public static <T> Task<T> queue(String name, Callable<T> job) { - return DynamicTasks.queue(Tasks.<T>builder().name(name).body(job).build()); + return DynamicTasks.queue(Tasks.<T>builder().displayName(name).body(job).build()); } /** @see #queue(org.apache.brooklyn.api.mgmt.TaskAdaptable) */ public static <T> Task<T> queue(String name, Runnable job) { - return DynamicTasks.queue(Tasks.<T>builder().name(name).body(job).build()); + return DynamicTasks.queue(Tasks.<T>builder().displayName(name).body(job).build()); } /** queues the task if needed, i.e. if it is not yet submitted (so it will run), http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4533edb/core/src/main/java/org/apache/brooklyn/util/core/task/TaskBuilder.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/TaskBuilder.java b/core/src/main/java/org/apache/brooklyn/util/core/task/TaskBuilder.java index 93b6a54..1a60212 100644 --- a/core/src/main/java/org/apache/brooklyn/util/core/task/TaskBuilder.java +++ b/core/src/main/java/org/apache/brooklyn/util/core/task/TaskBuilder.java @@ -38,7 +38,7 @@ import com.google.common.collect.Iterables; /** Convenience for creating tasks; note that DynamicSequentialTask is the default */ public class TaskBuilder<T> { - String name = null; + String displayName = null; String description = null; Callable<T> body = null; Boolean swallowChildrenFailures = null; @@ -51,9 +51,17 @@ public class TaskBuilder<T> { public static <T> TaskBuilder<T> builder() { return new TaskBuilder<T>(); } - + + /** + * @deprecated since 0.8.0; use {@link #displayName(String)} + */ + @Deprecated public TaskBuilder<T> name(String name) { - this.name = name; + return displayName(name); + } + + public TaskBuilder<T> displayName(String displayName) { + this.displayName = displayName; return this; } @@ -130,7 +138,7 @@ public class TaskBuilder<T> { @SuppressWarnings({ "unchecked", "rawtypes" }) public Task<T> build() { MutableMap<String, Object> taskFlags = MutableMap.copyOf(flags); - if (name!=null) taskFlags.put("displayName", name); + if (displayName!=null) taskFlags.put("displayName", displayName); if (description!=null) taskFlags.put("description", description); if (!tags.isEmpty()) taskFlags.put("tags", tags); @@ -178,6 +186,6 @@ public class TaskBuilder<T> { @Override public String toString() { - return super.toString()+"["+name+"]"; + return super.toString()+"["+displayName+"]"; } } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4533edb/core/src/main/java/org/apache/brooklyn/util/core/task/Tasks.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/Tasks.java b/core/src/main/java/org/apache/brooklyn/util/core/task/Tasks.java index 8152adf..3dae7ab 100644 --- a/core/src/main/java/org/apache/brooklyn/util/core/task/Tasks.java +++ b/core/src/main/java/org/apache/brooklyn/util/core/task/Tasks.java @@ -195,7 +195,7 @@ public class Tasks { return parallelInternal(name, asTasks(Iterables.toArray(tasks, TaskAdaptable.class))); } private static Task<List<?>> parallelInternal(String name, Task<?>[] tasks) { - return Tasks.<List<?>>builder().name(name).parallel(true).add(tasks).build(); + return Tasks.<List<?>>builder().displayName(name).parallel(true).add(tasks).build(); } public static Task<List<?>> sequential(TaskAdaptable<?> ...tasks) { @@ -217,13 +217,13 @@ public class Tasks { return sequential(name, asTasks(Iterables.toArray(tasks, TaskAdaptable.class))); } private static Task<List<?>> sequentialInternal(String name, Task<?>[] tasks) { - return Tasks.<List<?>>builder().name(name).parallel(false).add(tasks).build(); + return Tasks.<List<?>>builder().displayName(name).parallel(false).add(tasks).build(); } private static TaskFactory<?> sequentialInternal(final String name, final TaskFactory<?> ...taskFactories) { return new TaskFactory<TaskAdaptable<?>>() { @Override public TaskAdaptable<?> newTask() { - TaskBuilder<List<?>> tb = Tasks.<List<?>>builder().name(name).parallel(false); + TaskBuilder<List<?>> tb = Tasks.<List<?>>builder().displayName(name).parallel(false); for (TaskFactory<?> tf: taskFactories) tb.add(tf.newTask().asTask()); return tb.build(); @@ -334,7 +334,7 @@ public class Tasks { } } public static Task<Void> fail(final String name, final Throwable optionalError) { - return Tasks.<Void>builder().dynamic(false).name(name).body(new Runnable() { public void run() { + return Tasks.<Void>builder().dynamic(false).displayName(name).body(new Runnable() { public void run() { if (optionalError!=null) throw Exceptions.propagate(optionalError); else throw new RuntimeException("Failed: "+name); } }).build(); } @@ -465,7 +465,7 @@ public class Tasks { * returning true or false depending on whether repeater succeed */ public static TaskBuilder<Boolean> testing(Repeater repeater) { return Tasks.<Boolean>builder().body(new WaitForRepeaterCallable(repeater, false)) - .name("waiting for condition") + .displayName("waiting for condition") .description("Testing whether " + getTimeoutString(repeater) + ": "+repeater.getDescription()); } @@ -473,7 +473,7 @@ public class Tasks { * throwing if it does not */ public static TaskBuilder<?> requiring(Repeater repeater) { return Tasks.<Boolean>builder().body(new WaitForRepeaterCallable(repeater, true)) - .name("waiting for condition") + .displayName("waiting for condition") .description("Requiring " + getTimeoutString(repeater) + ": " + repeater.getDescription()); } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4533edb/core/src/main/java/org/apache/brooklyn/util/core/task/ValueResolver.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/ValueResolver.java b/core/src/main/java/org/apache/brooklyn/util/core/task/ValueResolver.java index 35cae91..4a1d030 100644 --- a/core/src/main/java/org/apache/brooklyn/util/core/task/ValueResolver.java +++ b/core/src/main/java/org/apache/brooklyn/util/core/task/ValueResolver.java @@ -325,7 +325,7 @@ public class ValueResolver<T> implements DeferredSupplier<T> { } } }; String description = getDescription(); - TaskBuilder<Object> vb = Tasks.<Object>builder().body(callable).name("Resolving dependent value").description(description); + TaskBuilder<Object> vb = Tasks.<Object>builder().body(callable).displayName("Resolving dependent value").description(description); if (isTransientTask) vb.tag(BrooklynTaskTags.TRANSIENT_TASK_TAG); Task<Object> vt = exec.submit(vb.build()); // TODO to handle immediate resolution, it would be nice to be able to submit http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4533edb/core/src/main/java/org/apache/brooklyn/util/core/task/ssh/SshFetchTaskWrapper.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/ssh/SshFetchTaskWrapper.java b/core/src/main/java/org/apache/brooklyn/util/core/task/ssh/SshFetchTaskWrapper.java index c667d03..5e8e4fc 100644 --- a/core/src/main/java/org/apache/brooklyn/util/core/task/ssh/SshFetchTaskWrapper.java +++ b/core/src/main/java/org/apache/brooklyn/util/core/task/ssh/SshFetchTaskWrapper.java @@ -57,7 +57,7 @@ public class SshFetchTaskWrapper implements TaskWrapper<String> { SshFetchTaskWrapper(SshFetchTaskFactory factory) { this.remoteFile = Preconditions.checkNotNull(factory.remoteFile, "remoteFile"); this.machine = Preconditions.checkNotNull(factory.machine, "machine"); - TaskBuilder<String> tb = TaskBuilder.<String>builder().dynamic(false).name("ssh fetch "+factory.remoteFile); + TaskBuilder<String> tb = TaskBuilder.<String>builder().dynamic(false).displayName("ssh fetch "+factory.remoteFile); task = tb.body(new SshFetchJob()).build(); config = factory.getConfig(); } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4533edb/core/src/main/java/org/apache/brooklyn/util/core/task/ssh/SshPutTaskWrapper.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/ssh/SshPutTaskWrapper.java b/core/src/main/java/org/apache/brooklyn/util/core/task/ssh/SshPutTaskWrapper.java index 78aa3ab..f15e06f 100644 --- a/core/src/main/java/org/apache/brooklyn/util/core/task/ssh/SshPutTaskWrapper.java +++ b/core/src/main/java/org/apache/brooklyn/util/core/task/ssh/SshPutTaskWrapper.java @@ -49,7 +49,7 @@ public class SshPutTaskWrapper extends SshPutTaskStub implements TaskWrapper<Voi // package private as only AbstractSshTaskFactory should invoke SshPutTaskWrapper(SshPutTaskFactory constructor) { super(constructor); - TaskBuilder<Void> tb = TaskBuilder.<Void>builder().dynamic(false).name(getSummary()); + TaskBuilder<Void> tb = TaskBuilder.<Void>builder().dynamic(false).displayName(getSummary()); task = tb.body(new SshPutJob()).build(); } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4533edb/core/src/main/java/org/apache/brooklyn/util/core/task/ssh/SshTasks.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/ssh/SshTasks.java b/core/src/main/java/org/apache/brooklyn/util/core/task/ssh/SshTasks.java index 448cd61..e939ca8 100644 --- a/core/src/main/java/org/apache/brooklyn/util/core/task/ssh/SshTasks.java +++ b/core/src/main/java/org/apache/brooklyn/util/core/task/ssh/SshTasks.java @@ -219,7 +219,7 @@ public class SshTasks { return new TaskFactory<TaskAdaptable<?>>() { @Override public TaskAdaptable<?> newTask() { - return Tasks.<Void>builder().name("installing "+Urls.getBasename(url)).description("installing "+url+" to "+destPath).body(new Runnable() { + return Tasks.<Void>builder().displayName("installing "+Urls.getBasename(url)).description("installing "+url+" to "+destPath).body(new Runnable() { @Override public void run() { int result = location.installTo(utils, props, url, destPath); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4533edb/core/src/main/java/org/apache/brooklyn/util/core/task/system/internal/AbstractProcessTaskFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/system/internal/AbstractProcessTaskFactory.java b/core/src/main/java/org/apache/brooklyn/util/core/task/system/internal/AbstractProcessTaskFactory.java index 6a98c4b..8d6a343 100644 --- a/core/src/main/java/org/apache/brooklyn/util/core/task/system/internal/AbstractProcessTaskFactory.java +++ b/core/src/main/java/org/apache/brooklyn/util/core/task/system/internal/AbstractProcessTaskFactory.java @@ -168,7 +168,7 @@ public abstract class AbstractProcessTaskFactory<T extends AbstractProcessTaskFa /** creates the TaskBuilder which can be further customized; typically invoked by the initial {@link #newTask()} */ public TaskBuilder<Object> constructCustomizedTaskBuilder() { - TaskBuilder<Object> tb = TaskBuilder.builder().dynamic(false).name("ssh: "+getSummary()); + TaskBuilder<Object> tb = TaskBuilder.builder().dynamic(false).displayName("ssh: "+getSummary()); tb.tag(BrooklynTaskTags.tagForStream(BrooklynTaskTags.STREAM_STDIN, Streams.byteArrayOfString(Strings.join(commands, "\n")))); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4533edb/core/src/test/java/org/apache/brooklyn/core/effector/EffectorTaskTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/effector/EffectorTaskTest.java b/core/src/test/java/org/apache/brooklyn/core/effector/EffectorTaskTest.java index 3e79aa9..427f22b 100644 --- a/core/src/test/java/org/apache/brooklyn/core/effector/EffectorTaskTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/effector/EffectorTaskTest.java @@ -111,7 +111,7 @@ public class EffectorTaskTest extends BrooklynAppUnitTestSupport { return new EffectorTaskFactory<Integer>() { @Override public Task<Integer> newTask(final Entity entity, final Effector<Integer> effector, final ConfigBag parameters) { - return TaskBuilder.<Integer>builder().name("times").body(new Callable<Integer>() { public Integer call() { + return TaskBuilder.<Integer>builder().displayName("times").body(new Callable<Integer>() { public Integer call() { return DynamicTasks.get( x.newTask(entity, effector, parameters) )*y; } }).build(); } @@ -200,26 +200,26 @@ public class EffectorTaskTest extends BrooklynAppUnitTestSupport { // ----------------- syntax for more complex -- an effector using subtasks public static Task<Integer> add(final int x, final int y) { - return TaskBuilder.<Integer>builder().name("add").body(new Callable<Integer>() { public Integer call() { return x+y; } }).build(); + return TaskBuilder.<Integer>builder().displayName("add").body(new Callable<Integer>() { public Integer call() { return x+y; } }).build(); } public static Task<Integer> add(final Task<Integer> x, final int y) { - return TaskBuilder.<Integer>builder().name("add").body(new Callable<Integer>() { public Integer call() { return DynamicTasks.get(x)+y; } }).build(); + return TaskBuilder.<Integer>builder().displayName("add").body(new Callable<Integer>() { public Integer call() { return DynamicTasks.get(x)+y; } }).build(); } public static Task<Integer> addBasic(final Task<Integer> x, final int y) { - return TaskBuilder.<Integer>builder().name("add (not dynamic)").dynamic(false).body(new Callable<Integer>() { public Integer call() { + return TaskBuilder.<Integer>builder().displayName("add (not dynamic)").dynamic(false).body(new Callable<Integer>() { public Integer call() { Preconditions.checkState(x.isSubmitted()); return x.getUnchecked()+y; } }).build(); } public static Task<Integer> times(final int x, final int y) { - return TaskBuilder.<Integer>builder().name("times").body(new Callable<Integer>() { public Integer call() { return x*y; } }).build(); + return TaskBuilder.<Integer>builder().displayName("times").body(new Callable<Integer>() { public Integer call() { return x*y; } }).build(); } public static Task<Integer> times(final Task<Integer> x, final int y) { - return TaskBuilder.<Integer>builder().name("times").body(new Callable<Integer>() { public Integer call() { return DynamicTasks.get(x)*y; } }).build(); + return TaskBuilder.<Integer>builder().displayName("times").body(new Callable<Integer>() { public Integer call() { return DynamicTasks.get(x)*y; } }).build(); } public static final Effector<Integer> TWO_X_PLUS_ONE = Effectors.effector(Integer.class, "twoXPlusOne") http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4533edb/core/src/test/java/org/apache/brooklyn/core/entity/trait/FailingEntityImpl.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/trait/FailingEntityImpl.java b/core/src/test/java/org/apache/brooklyn/core/entity/trait/FailingEntityImpl.java index e6cf002..a675c78 100644 --- a/core/src/test/java/org/apache/brooklyn/core/entity/trait/FailingEntityImpl.java +++ b/core/src/test/java/org/apache/brooklyn/core/entity/trait/FailingEntityImpl.java @@ -68,7 +68,7 @@ public class FailingEntityImpl extends TestEntityImpl implements FailingEntity { private RuntimeException fail(final String msg) { if (getConfig(FAIL_IN_SUB_TASK)) { - Task<?> task = Tasks.builder().name(msg).body(new Runnable() { public void run() { throw newException(msg); } }).build(); + Task<?> task = Tasks.builder().displayName(msg).body(new Runnable() { public void run() { throw newException(msg); } }).build(); Entities.submit(this, task).getUnchecked(); Assert.fail("Should have thrown exception on task.getUnchecked"); throw new IllegalStateException("unreachable code"); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4533edb/core/src/test/java/org/apache/brooklyn/core/entity/trait/StartableMethodsTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/trait/StartableMethodsTest.java b/core/src/test/java/org/apache/brooklyn/core/entity/trait/StartableMethodsTest.java index 131dafe..8092fd1 100644 --- a/core/src/test/java/org/apache/brooklyn/core/entity/trait/StartableMethodsTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/entity/trait/StartableMethodsTest.java @@ -104,7 +104,7 @@ public class StartableMethodsTest extends BrooklynAppUnitTestSupport { listener.events.clear(); try { - Task<?> task = Tasks.builder().name("stopSequentially") + Task<?> task = Tasks.builder().displayName("stopSequentially") .body(new Runnable() { @Override public void run() { StartableMethods.stopSequentially(ImmutableList.of(entity, entity2)); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4533edb/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/EntityExecutionManagerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/EntityExecutionManagerTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/EntityExecutionManagerTest.java index 2bc73cb..590b8fb 100644 --- a/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/EntityExecutionManagerTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/EntityExecutionManagerTest.java @@ -113,9 +113,9 @@ public class EntityExecutionManagerTest { sema4.release(); } }); - Task<String> t1 = em.submit( Tasks.<String>builder().name("t1").dynamic(false).body(Callables.returning("foo")).build() ); + Task<String> t1 = em.submit( Tasks.<String>builder().displayName("t1").dynamic(false).body(Callables.returning("foo")).build() ); t1.getUnchecked(); - Task<String> t2 = em.submit( Tasks.<String>builder().name("t2").dynamic(false).body(Callables.returning("foo")).build() ); + Task<String> t2 = em.submit( Tasks.<String>builder().displayName("t2").dynamic(false).body(Callables.returning("foo")).build() ); sema4.acquire(); Assert.assertEquals(completedTasks.size(), 2, "completed tasks are: "+completedTasks); completedTasks.get(t1).isShorterThan(Duration.TEN_SECONDS); @@ -135,7 +135,7 @@ public class EntityExecutionManagerTest { } protected static TaskBuilder<Object> newEmptyTask(String name) { - return Tasks.builder().name(name).dynamic(false).body(Callables.returning(null)); + return Tasks.builder().displayName(name).dynamic(false).body(Callables.returning(null)); } protected void assertTaskCountForEntitySoon(final Entity entity, final int expectedCount) { @@ -247,7 +247,7 @@ public class EntityExecutionManagerTest { BrooklynGarbageCollector.MAX_TASKS_PER_TAG, 2); for (int count=0; count<5; count++) { - TaskBuilder<Object> tb = Tasks.builder().name("task-"+count).dynamic(true).body(new Runnable() { @Override public void run() {}}) + TaskBuilder<Object> tb = Tasks.builder().displayName("task-"+count).dynamic(true).body(new Runnable() { @Override public void run() {}}) .tag(ManagementContextInternal.NON_TRANSIENT_TASK_TAG).tag("foo"); ((EntityInternal)e).getExecutionContext().submit(tb.build()).getUnchecked(); } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4533edb/policy/src/main/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicy.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicy.java b/policy/src/main/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicy.java index 274aa9a..ee2f5a9 100644 --- a/policy/src/main/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicy.java +++ b/policy/src/main/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicy.java @@ -1008,7 +1008,7 @@ public class AutoScalerPolicy extends AbstractPolicy { if (LOG.isDebugEnabled()) LOG.debug("{} requesting resize to {}; current {}, min {}, max {}", new Object[] {this, desiredPoolSize, currentPoolSize, getMinPoolSize(), getMaxPoolSize()}); - Entities.submit(entity, Tasks.<Void>builder().name("Auto-scaler") + Entities.submit(entity, Tasks.<Void>builder().displayName("Auto-scaler") .description("Auto-scaler recommending resize from "+currentPoolSize+" to "+desiredPoolSize) .tag(BrooklynTaskTags.NON_TRANSIENT_TASK_TAG) .body(new Callable<Void>() { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4533edb/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltTasks.java ---------------------------------------------------------------------- diff --git a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltTasks.java b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltTasks.java index d6bacfa..f969b44 100644 --- a/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltTasks.java +++ b/sandbox/extra/src/main/java/org/apache/brooklyn/entity/salt/SaltTasks.java @@ -59,7 +59,7 @@ public class SaltTasks { } public static TaskFactory<?> installSaltMinion(final Entity minion, final String runDir, final String installDir, final boolean force) { - return Tasks.<Void>builder().name("install minion").body( + return Tasks.<Void>builder().displayName("install minion").body( new Runnable() { public void run() { // Setup bootstrap installation command for minion @@ -97,7 +97,7 @@ public class SaltTasks { } public static TaskFactory<?> installFormulas(final String installDir, final Map<String,String> formulasAndUrls, final boolean force) { - return Tasks.<Void>builder().name("install formulas").body( + return Tasks.<Void>builder().displayName("install formulas").body( new Runnable() { public void run() { Entity e = EffectorTasks.findEntity(); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4533edb/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynEntityMirrorImpl.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynEntityMirrorImpl.java b/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynEntityMirrorImpl.java index 538c170..11d3baf 100644 --- a/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynEntityMirrorImpl.java +++ b/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynEntityMirrorImpl.java @@ -98,7 +98,7 @@ public class BrooklynEntityMirrorImpl extends AbstractEntity implements Brooklyn DynamicTasks.queueIfPossible( Tasks.<Void>builder() - .name("Start entity mirror feed") + .displayName("Start entity mirror feed") .body(asyncTask) .build()) .orSubmitAsync(this); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4533edb/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java b/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java index df9651e..e21200d 100644 --- a/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java +++ b/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java @@ -198,7 +198,7 @@ public class BrooklynNodeImpl extends SoftwareProcessImpl implements BrooklynNod private void queueWaitExitTask() { //give time to the process to die gracefully after closing the shutdown call - DynamicTasks.queue(Tasks.builder().name("wait for graceful stop").body(new Runnable() { + DynamicTasks.queue(Tasks.builder().displayName("wait for graceful stop").body(new Runnable() { @Override public void run() { DynamicTasks.markInessential(); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4533edb/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/effector/BrooklynClusterUpgradeEffectorBody.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/effector/BrooklynClusterUpgradeEffectorBody.java b/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/effector/BrooklynClusterUpgradeEffectorBody.java index 319d5ba..19b5ce2 100644 --- a/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/effector/BrooklynClusterUpgradeEffectorBody.java +++ b/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/effector/BrooklynClusterUpgradeEffectorBody.java @@ -157,7 +157,7 @@ public class BrooklynClusterUpgradeEffectorBody extends EffectorBody<Void> imple } private TaskAdaptable<Collection<Entity>> newCreateNodesTask(int size, String name) { - return Tasks.<Collection<Entity>>builder().name(name).body(new CreateNodesCallable(size)).build(); + return Tasks.<Collection<Entity>>builder().displayName(name).body(new CreateNodesCallable(size)).build(); } protected class CreateNodesCallable implements Callable<Collection<Entity>> { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4533edb/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/effector/BrooklynNodeUpgradeEffectorBody.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/effector/BrooklynNodeUpgradeEffectorBody.java b/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/effector/BrooklynNodeUpgradeEffectorBody.java index c9f7dd7..12ca603 100644 --- a/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/effector/BrooklynNodeUpgradeEffectorBody.java +++ b/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/effector/BrooklynNodeUpgradeEffectorBody.java @@ -117,12 +117,12 @@ public class BrooklynNodeUpgradeEffectorBody extends EffectorBody<Void> { } // Stop running instance - DynamicTasks.queue(Tasks.builder().name("shutdown node") + DynamicTasks.queue(Tasks.builder().displayName("shutdown node") .add(Effectors.invocation(entity(), BrooklynNode.STOP_NODE_BUT_LEAVE_APPS, ImmutableMap.of(StopSoftwareParameters.STOP_MACHINE_MODE, StopMode.NEVER))) .build()); // backup old files - DynamicTasks.queue(Tasks.builder().name("backup old version").body(new Runnable() { + DynamicTasks.queue(Tasks.builder().displayName("backup old version").body(new Runnable() { @Override public void run() { String runDir = entity().getAttribute(SoftwareProcess.RUN_DIR); @@ -139,7 +139,7 @@ public class BrooklynNodeUpgradeEffectorBody extends EffectorBody<Void> { }).build()); // Reconfigure entity - DynamicTasks.queue(Tasks.builder().name("reconfigure").body(new Runnable() { + DynamicTasks.queue(Tasks.builder().displayName("reconfigure").body(new Runnable() { @Override public void run() { DynamicTasks.waitForLast(); @@ -191,11 +191,11 @@ public class BrooklynNodeUpgradeEffectorBody extends EffectorBody<Void> { Predicates.equalTo(ManagementNodeState.HOT_STANDBY), Duration.FIVE_MINUTES)); // 3 stop new version - DynamicTasks.queue(Tasks.builder().name("shutdown transient node") + DynamicTasks.queue(Tasks.builder().displayName("shutdown transient node") .add(Effectors.invocation(dryRunChild, BrooklynNode.STOP_NODE_BUT_LEAVE_APPS, ImmutableMap.of(StopSoftwareParameters.STOP_MACHINE_MODE, StopMode.NEVER))) .build()); - DynamicTasks.queue(Tasks.<Void>builder().name("remove transient node").body( + DynamicTasks.queue(Tasks.<Void>builder().displayName("remove transient node").body( new Runnable() { @Override public void run() { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4533edb/software/base/src/main/java/org/apache/brooklyn/entity/chef/ChefTasks.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/chef/ChefTasks.java b/software/base/src/main/java/org/apache/brooklyn/entity/chef/ChefTasks.java index c1efa55..ac12f00 100644 --- a/software/base/src/main/java/org/apache/brooklyn/entity/chef/ChefTasks.java +++ b/software/base/src/main/java/org/apache/brooklyn/entity/chef/ChefTasks.java @@ -56,7 +56,7 @@ public class ChefTasks { } public static TaskFactory<?> installCookbooks(final String chefDirectory, final Map<String,String> cookbooksAndUrls, final boolean force) { - return Tasks.<Void>builder().name("install "+(cookbooksAndUrls==null ? "0" : cookbooksAndUrls.size())+" cookbook"+Strings.s(cookbooksAndUrls)).body( + return Tasks.<Void>builder().displayName("install "+(cookbooksAndUrls==null ? "0" : cookbooksAndUrls.size())+" cookbook"+Strings.s(cookbooksAndUrls)).body( new Runnable() { public void run() { Entity e = EffectorTasks.findEntity(); @@ -72,7 +72,7 @@ public class ChefTasks { return new TaskFactory<TaskAdaptable<?>>() { @Override public TaskAdaptable<?> newTask() { - TaskBuilder<Void> tb = Tasks.<Void>builder().name("install cookbook "+cookbookName); + TaskBuilder<Void> tb = Tasks.<Void>builder().displayName("install cookbook "+cookbookName); String cookbookDir = Urls.mergePaths(chefDirectory, cookbookName); String privateTmpDirContainingUnpackedCookbook = http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4533edb/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SameServerEntityImpl.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SameServerEntityImpl.java b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SameServerEntityImpl.java index ee9d711..600ab77 100644 --- a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SameServerEntityImpl.java +++ b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SameServerEntityImpl.java @@ -57,7 +57,7 @@ public class SameServerEntityImpl extends AbstractEntity implements SameServerEn if (DynamicTasks.getTaskQueuingContext() != null) { doRestart(ConfigBag.EMPTY); } else { - Task<?> task = Tasks.builder().name("restart").body(new Runnable() { public void run() { doRestart(ConfigBag.EMPTY); } }).build(); + Task<?> task = Tasks.builder().displayName("restart").body(new Runnable() { public void run() { doRestart(ConfigBag.EMPTY); } }).build(); Entities.submit(this, task).getUnchecked(); } } @@ -73,7 +73,7 @@ public class SameServerEntityImpl extends AbstractEntity implements SameServerEn if (DynamicTasks.getTaskQueuingContext() != null) { doStart(locations); } else { - Task<?> task = Tasks.builder().name("start").body(new Runnable() { public void run() { doStart(locations); } }).build(); + Task<?> task = Tasks.builder().displayName("start").body(new Runnable() { public void run() { doStart(locations); } }).build(); Entities.submit(this, task).getUnchecked(); } } @@ -88,7 +88,7 @@ public class SameServerEntityImpl extends AbstractEntity implements SameServerEn if (DynamicTasks.getTaskQueuingContext() != null) { doStop(); } else { - Task<?> task = Tasks.builder().name("stop").body(new Runnable() { public void run() { doStop(); } }).build(); + Task<?> task = Tasks.builder().displayName("stop").body(new Runnable() { public void run() { doStop(); } }).build(); Entities.submit(this, task).getUnchecked(); } } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4533edb/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcessImpl.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcessImpl.java b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcessImpl.java index f4e02c4..a777dcd 100644 --- a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcessImpl.java +++ b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcessImpl.java @@ -603,7 +603,7 @@ public abstract class SoftwareProcessImpl extends AbstractEntity implements Soft if (DynamicTasks.getTaskQueuingContext() != null) { getLifecycleEffectorTasks().start(locations); } else { - Task<?> task = Tasks.builder().name("start (sequential)").body(new Runnable() { public void run() { getLifecycleEffectorTasks().start(locations); } }).build(); + Task<?> task = Tasks.builder().displayName("start (sequential)").body(new Runnable() { public void run() { getLifecycleEffectorTasks().start(locations); } }).build(); Entities.submit(this, task).getUnchecked(); } } @@ -625,7 +625,7 @@ public abstract class SoftwareProcessImpl extends AbstractEntity implements Soft if (DynamicTasks.getTaskQueuingContext() != null) { getLifecycleEffectorTasks().stop(ConfigBag.EMPTY); } else { - Task<?> task = Tasks.builder().name("stop").body(new Runnable() { public void run() { getLifecycleEffectorTasks().stop(ConfigBag.EMPTY); } }).build(); + Task<?> task = Tasks.builder().displayName("stop").body(new Runnable() { public void run() { getLifecycleEffectorTasks().stop(ConfigBag.EMPTY); } }).build(); Entities.submit(this, task).getUnchecked(); } } @@ -639,7 +639,7 @@ public abstract class SoftwareProcessImpl extends AbstractEntity implements Soft if (DynamicTasks.getTaskQueuingContext() != null) { getLifecycleEffectorTasks().restart(ConfigBag.EMPTY); } else { - Task<?> task = Tasks.builder().name("restart").body(new Runnable() { public void run() { getLifecycleEffectorTasks().restart(ConfigBag.EMPTY); } }).build(); + Task<?> task = Tasks.builder().displayName("restart").body(new Runnable() { public void run() { getLifecycleEffectorTasks().restart(ConfigBag.EMPTY); } }).build(); Entities.submit(this, task).getUnchecked(); } } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4533edb/software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/MachineLifecycleEffectorTasks.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/MachineLifecycleEffectorTasks.java b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/MachineLifecycleEffectorTasks.java index bd6f477..f57c6d3 100644 --- a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/MachineLifecycleEffectorTasks.java +++ b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/MachineLifecycleEffectorTasks.java @@ -355,7 +355,7 @@ public abstract class MachineLifecycleEffectorTasks { * and returns that machine. The task can be used as a supplier to subsequent methods. */ protected Task<MachineLocation> provisionAsync(final MachineProvisioningLocation<?> location) { - return DynamicTasks.queue(Tasks.<MachineLocation>builder().name("provisioning (" + location.getDisplayName() + ")").body( + return DynamicTasks.queue(Tasks.<MachineLocation>builder().displayName("provisioning (" + location.getDisplayName() + ")").body( new ProvisionMachineTask(location)).build()); } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4533edb/software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/ScriptHelper.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/ScriptHelper.java b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/ScriptHelper.java index a397477..27d94cf 100644 --- a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/ScriptHelper.java +++ b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/lifecycle/ScriptHelper.java @@ -281,7 +281,7 @@ public class ScriptHelper { /** creates a task which will execute this script; note this can only be run once per instance of this class */ public synchronized Task<Integer> newTask() { if (task!=null) throw new IllegalStateException("task can only be generated once"); - TaskBuilder<Integer> tb = Tasks.<Integer>builder().name("ssh: "+summary).body( + TaskBuilder<Integer> tb = Tasks.<Integer>builder().displayName("ssh: "+summary).body( new Callable<Integer>() { public Integer call() throws Exception { return executeInternal(); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4533edb/software/base/src/main/java/org/apache/brooklyn/entity/system_service/InitdServiceInstaller.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/system_service/InitdServiceInstaller.java b/software/base/src/main/java/org/apache/brooklyn/entity/system_service/InitdServiceInstaller.java index c0de92d..4922351 100644 --- a/software/base/src/main/java/org/apache/brooklyn/entity/system_service/InitdServiceInstaller.java +++ b/software/base/src/main/java/org/apache/brooklyn/entity/system_service/InitdServiceInstaller.java @@ -89,7 +89,7 @@ public class InitdServiceInstaller implements SystemServiceInstaller { .newTask(); return Tasks.<Void>builder() - .name("install (init.d)") + .displayName("install (init.d)") .description("Install init.d service") .add(putServiceTask) .add(installServiceTask) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4533edb/software/base/src/main/java/org/apache/brooklyn/entity/system_service/SystemServiceEnricher.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/system_service/SystemServiceEnricher.java b/software/base/src/main/java/org/apache/brooklyn/entity/system_service/SystemServiceEnricher.java index 4b8c5f5..6d6acf7 100644 --- a/software/base/src/main/java/org/apache/brooklyn/entity/system_service/SystemServiceEnricher.java +++ b/software/base/src/main/java/org/apache/brooklyn/entity/system_service/SystemServiceEnricher.java @@ -77,7 +77,7 @@ public class SystemServiceEnricher extends AbstractEnricher implements Enricher final String launchScriptPath = Urls.mergePaths(getRunDir(), getStartScriptName()); Task<Void> installerTask = TaskBuilder.<Void>builder() - .name("install (service)") + .displayName("install (service)") .description("Install as a system service") .body(new Runnable() { @Override @@ -99,14 +99,14 @@ public class SystemServiceEnricher extends AbstractEnricher implements Enricher .requiringExitCodeZero() .newTask(); Task<Void> udpateTask = TaskBuilder.<Void>builder() - .name("update-launch") + .displayName("update-launch") .description("Update launch script used by the system service") .add(updateLaunchScriptTask) .add(makeExecutableTask) .build(); Task<Void> updateService = TaskBuilder.<Void>builder() - .name("update-system-service") + .displayName("update-system-service") .description("Update system service") .add(installerTask) .add(udpateTask) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4533edb/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterImpl.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterImpl.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterImpl.java index 9a444fd..ae75254 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterImpl.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/mysql/MySqlClusterImpl.java @@ -381,7 +381,7 @@ public class MySqlClusterImpl extends DynamicClusterImpl implements MySqlCluster ((EntityLocal)node).setAttribute(NODE_REPLICATION_INITIALIZED, Boolean.TRUE); DynamicTasks.queueIfPossible(TaskBuilder.builder() - .name("Configure master-slave replication on node") + .displayName("Configure master-slave replication on node") .body(new InitReplicationTask(cluster, node)) .build()) .orSubmitAsync(node); @@ -400,7 +400,7 @@ public class MySqlClusterImpl extends DynamicClusterImpl implements MySqlCluster String slaveAddress = cluster.getAttribute(SLAVE_ID_ADDRESS_MAPPING).remove(node.getId()); if (slaveAddress != null) { DynamicTasks.queueIfPossible(TaskBuilder.builder() - .name("Remove slave access") + .displayName("Remove slave access") .body(new RemoveSlaveConfigTask(cluster, slaveAddress)) .build()) .orSubmitAsync(cluster); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4533edb/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseClusterImpl.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseClusterImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseClusterImpl.java index 3ae6fe9..eaa7b7a 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseClusterImpl.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseClusterImpl.java @@ -525,7 +525,7 @@ public class CouchbaseClusterImpl extends DynamicClusterImpl implements Couchbas } public void createBucket(final Entity primaryNode, final String bucketName, final String bucketType, final Integer bucketPort, final Integer bucketRamSize, final Integer bucketReplica) { - DynamicTasks.queueIfPossible(TaskBuilder.<Void>builder().name("Creating bucket " + bucketName).body( + DynamicTasks.queueIfPossible(TaskBuilder.<Void>builder().displayName("Creating bucket " + bucketName).body( new Callable<Void>() { @Override public Void call() throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4533edb/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeSshDriver.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeSshDriver.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeSshDriver.java index cc21867..3774ddb 100644 --- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeSshDriver.java +++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeSshDriver.java @@ -361,7 +361,7 @@ public class CouchbaseNodeSshDriver extends AbstractSoftwareProcessSshDriver imp entity.setAttribute(CouchbaseNode.REBALANCE_STATUS, "waiting for completion"); // Wait until the Couchbase node finishes the re-balancing Task<Boolean> reBalance = TaskBuilder.<Boolean>builder() - .name("Waiting until node is rebalancing") + .displayName("Waiting until node is rebalancing") .body(new Callable<Boolean>() { @Override public Boolean call() throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4533edb/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractControllerImpl.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractControllerImpl.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractControllerImpl.java index ec3e714..a4c04b6 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractControllerImpl.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/AbstractControllerImpl.java @@ -361,7 +361,7 @@ public abstract class AbstractControllerImpl extends SoftwareProcessImpl impleme if (updateNeeded) return; updateNeeded = true; LOG.debug("queueing an update-needed task for "+this+"; update will occur shortly"); - Entities.submit(this, Tasks.builder().name("update-needed").body(new Runnable() { + Entities.submit(this, Tasks.builder().displayName("update-needed").body(new Runnable() { @Override public void run() { if (updateNeeded) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4533edb/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/DynamicWebAppClusterImpl.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/DynamicWebAppClusterImpl.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/DynamicWebAppClusterImpl.java index 4bc1fd3..81f72f9 100644 --- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/DynamicWebAppClusterImpl.java +++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/DynamicWebAppClusterImpl.java @@ -128,7 +128,7 @@ public class DynamicWebAppClusterImpl extends DynamicClusterImpl implements Dyna * If the target goes away, this task marks itself inessential * before failing so as not to cause a parent task to fail. */ static <T> Task<T> whenServiceUp(final Entity target, final TaskAdaptable<T> task, String name) { - return Tasks.<T>builder().name(name).dynamic(true).body(new Callable<T>() { + return Tasks.<T>builder().displayName(name).dynamic(true).body(new Callable<T>() { @Override public T call() { try { @@ -176,7 +176,7 @@ public class DynamicWebAppClusterImpl extends DynamicClusterImpl implements Dyna log.debug("Deploying "+targetName+"->"+url+" across cluster "+this+"; WARs now "+getConfig(WARS_BY_CONTEXT)); Iterable<CanDeployAndUndeploy> targets = Iterables.filter(getChildren(), CanDeployAndUndeploy.class); - TaskBuilder<Void> tb = Tasks.<Void>builder().parallel(true).name("Deploy "+targetName+" to cluster (size "+Iterables.size(targets)+")"); + TaskBuilder<Void> tb = Tasks.<Void>builder().parallel(true).displayName("Deploy "+targetName+" to cluster (size "+Iterables.size(targets)+")"); for (Entity target: targets) { tb.add(whenServiceUp(target, Effectors.invocation(target, DEPLOY, MutableMap.of("url", url, "targetName", targetName)), "Deploy "+targetName+" to "+target+" when ready")); @@ -203,7 +203,7 @@ public class DynamicWebAppClusterImpl extends DynamicClusterImpl implements Dyna log.debug("Undeploying "+targetName+" across cluster "+this+"; WARs now "+getConfig(WARS_BY_CONTEXT)); Iterable<CanDeployAndUndeploy> targets = Iterables.filter(getChildren(), CanDeployAndUndeploy.class); - TaskBuilder<Void> tb = Tasks.<Void>builder().parallel(true).name("Undeploy "+targetName+" across cluster (size "+Iterables.size(targets)+")"); + TaskBuilder<Void> tb = Tasks.<Void>builder().parallel(true).displayName("Undeploy "+targetName+" across cluster (size "+Iterables.size(targets)+")"); for (Entity target: targets) { tb.add(whenServiceUp(target, Effectors.invocation(target, UNDEPLOY, MutableMap.of("targetName", targetName)), "Undeploy "+targetName+" at "+target+" when ready")); @@ -248,9 +248,9 @@ public class DynamicWebAppClusterImpl extends DynamicClusterImpl implements Dyna log.debug("Redeplying all WARs across cluster "+this+": "+getConfig(WARS_BY_CONTEXT)); Iterable<CanDeployAndUndeploy> targetEntities = Iterables.filter(getChildren(), CanDeployAndUndeploy.class); - TaskBuilder<Void> tb = Tasks.<Void>builder().parallel(true).name(redeployPrefix+" across cluster (size "+Iterables.size(targetEntities)+")"); + TaskBuilder<Void> tb = Tasks.<Void>builder().parallel(true).displayName(redeployPrefix+" across cluster (size "+Iterables.size(targetEntities)+")"); for (Entity targetEntity: targetEntities) { - TaskBuilder<Void> redeployAllToTarget = Tasks.<Void>builder().name(redeployPrefix+" at "+targetEntity+" (after ready check)"); + TaskBuilder<Void> redeployAllToTarget = Tasks.<Void>builder().displayName(redeployPrefix+" at "+targetEntity+" (after ready check)"); for (String warContextPath: wars.keySet()) { redeployAllToTarget.add(Effectors.invocation(targetEntity, DEPLOY, MutableMap.of("url", wars.get(warContextPath), "targetName", warContextPath))); } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f4533edb/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java index eebc628..149a88a 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java @@ -73,7 +73,7 @@ public class DslComponent extends BrooklynDslDeferredSupplier<Entity> { @Override public Task<Entity> newTask() { - return TaskBuilder.<Entity>builder().name(toString()).tag(BrooklynTaskTags.TRANSIENT_TASK_TAG) + return TaskBuilder.<Entity>builder().displayName(toString()).tag(BrooklynTaskTags.TRANSIENT_TASK_TAG) .body(new EntityInScopeFinder(scopeComponent, scope, componentId)).build(); } @@ -218,7 +218,7 @@ public class DslComponent extends BrooklynDslDeferredSupplier<Entity> { @Override public Task<Object> newTask() { - return Tasks.builder().name("retrieving config for "+keyName).tag(BrooklynTaskTags.TRANSIENT_TASK_TAG).dynamic(false).body(new Callable<Object>() { + return Tasks.builder().displayName("retrieving config for "+keyName).tag(BrooklynTaskTags.TRANSIENT_TASK_TAG).dynamic(false).body(new Callable<Object>() { @Override public Object call() throws Exception { Entity targetEntity = component.get(); @@ -249,7 +249,7 @@ public class DslComponent extends BrooklynDslDeferredSupplier<Entity> { @Override public Task<Sensor<?>> newTask() { - return Tasks.<Sensor<?>>builder().name("looking up sensor for "+sensorName).dynamic(false).body(new Callable<Sensor<?>>() { + return Tasks.<Sensor<?>>builder().displayName("looking up sensor for "+sensorName).dynamic(false).body(new Callable<Sensor<?>>() { @Override public Sensor<?> call() throws Exception { Entity targetEntity = component.get();
