Add TaskBuilder.displayName; deprecate TaskBuilder.name Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/b1105a4b Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/b1105a4b Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/b1105a4b
Branch: refs/heads/0.8.0-incubating Commit: b1105a4bbca83f497a95756337c1614b4f75927b Parents: a19506c 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 ---------------------------------------------------------------------- .../java/org/apache/brooklyn/entity/salt/SaltTasks.java | 4 ++-- .../brooklyn/entity/database/mysql/MySqlClusterImpl.java | 4 ++-- .../entity/nosql/couchbase/CouchbaseClusterImpl.java | 2 +- .../entity/nosql/couchbase/CouchbaseNodeSshDriver.java | 2 +- .../brooklyn/entity/proxy/AbstractControllerImpl.java | 2 +- .../brooklyn/entity/webapp/DynamicWebAppClusterImpl.java | 10 +++++----- 6 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/b1105a4b/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/brooklyn-library/blob/b1105a4b/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/brooklyn-library/blob/b1105a4b/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/brooklyn-library/blob/b1105a4b/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/brooklyn-library/blob/b1105a4b/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/brooklyn-library/blob/b1105a4b/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))); }
