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/12/06 14:21:50 UTC
[1/4] brooklyn-server git commit: transformer should resolve deep
Repository: brooklyn-server
Updated Branches:
refs/heads/master 703cd0d31 -> 89a48a5fe
transformer should resolve deep
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/5310e51a
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/5310e51a
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/5310e51a
Branch: refs/heads/master
Commit: 5310e51ad2579f8ea175cb779cab01b9a30f99e6
Parents: 9fb62ca
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Dec 6 12:32:38 2017 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Dec 6 12:32:38 2017 +0000
----------------------------------------------------------------------
.../main/java/org/apache/brooklyn/enricher/stock/Transformer.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/5310e51a/core/src/main/java/org/apache/brooklyn/enricher/stock/Transformer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/enricher/stock/Transformer.java b/core/src/main/java/org/apache/brooklyn/enricher/stock/Transformer.java
index ec10b97..6b73159 100644
--- a/core/src/main/java/org/apache/brooklyn/enricher/stock/Transformer.java
+++ b/core/src/main/java/org/apache/brooklyn/enricher/stock/Transformer.java
@@ -134,6 +134,7 @@ public class Transformer<T,U> extends AbstractTransformer<T,U> {
return (U) Tasks.resolving(rawVal).as(targetSensor.getType())
.context(entity)
.description("Computing sensor "+targetSensor+" from "+rawVal)
+ .deep(true)
.immediately(true)
.getMaybe().orNull();
}
[2/4] brooklyn-server git commit: rename var as millis for readability
Posted by dr...@apache.org.
rename var as millis for readability
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/a3aaabda
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/a3aaabda
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/a3aaabda
Branch: refs/heads/master
Commit: a3aaabda2143a12f36405ce684710b2b41941ff6
Parents: 5310e51
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Dec 6 12:33:08 2017 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Dec 6 12:33:08 2017 +0000
----------------------------------------------------------------------
.../main/java/org/apache/brooklyn/core/feed/PollConfig.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/a3aaabda/core/src/main/java/org/apache/brooklyn/core/feed/PollConfig.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/feed/PollConfig.java b/core/src/main/java/org/apache/brooklyn/core/feed/PollConfig.java
index 133431b..d999053 100644
--- a/core/src/main/java/org/apache/brooklyn/core/feed/PollConfig.java
+++ b/core/src/main/java/org/apache/brooklyn/core/feed/PollConfig.java
@@ -55,9 +55,9 @@ public class PollConfig<V, T, F extends PollConfig<V, T, F>> extends FeedConfig<
return self();
}
- public F period(long val) {
- checkArgument(val >= 0, "period must be greater than or equal to zero");
- this.period = val; return self();
+ public F period(long millis) {
+ checkArgument(millis >= 0, "period must be greater than or equal to zero");
+ this.period = millis; return self();
}
public F period(long val, TimeUnit units) {
[4/4] brooklyn-server git commit: This closes #910
Posted by dr...@apache.org.
This closes #910
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/89a48a5f
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/89a48a5f
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/89a48a5f
Branch: refs/heads/master
Commit: 89a48a5fe0807829e69e8bea3f6dbf8a045d48e0
Parents: 703cd0d 64d4c1c
Author: Duncan Godwin <dr...@googlemail.com>
Authored: Wed Dec 6 14:21:43 2017 +0000
Committer: Duncan Godwin <dr...@googlemail.com>
Committed: Wed Dec 6 14:21:43 2017 +0000
----------------------------------------------------------------------
.../org/apache/brooklyn/core/feed/PollConfig.java | 6 +++---
.../apache/brooklyn/enricher/stock/Transformer.java | 1 +
.../apache/brooklyn/util/core/task/DynamicTasks.java | 10 ++++++++++
.../apache/brooklyn/util/core/task/TaskBuilder.java | 14 ++++++++++++++
.../org/apache/brooklyn/util/core/task/Tasks.java | 10 ++++++++++
5 files changed, 38 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[3/4] brooklyn-server git commit: conveniences for creating simple
tasks with names
Posted by dr...@apache.org.
conveniences for creating simple tasks with names
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/64d4c1cc
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/64d4c1cc
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/64d4c1cc
Branch: refs/heads/master
Commit: 64d4c1cc909e9e9e105d5e8095b637c6e6547ed3
Parents: a3aaabd
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Dec 6 12:33:19 2017 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Dec 6 12:33:19 2017 +0000
----------------------------------------------------------------------
.../apache/brooklyn/util/core/task/DynamicTasks.java | 10 ++++++++++
.../apache/brooklyn/util/core/task/TaskBuilder.java | 14 ++++++++++++++
.../org/apache/brooklyn/util/core/task/Tasks.java | 10 ++++++++++
3 files changed, 34 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/64d4c1cc/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 9026798..ff2aca7 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
@@ -81,6 +81,16 @@ public class DynamicTasks {
taskQueueingContext.remove();
}
+ /** Convenience for {@link TaskBuilder#of(String, Runnable)} creating a {@link DynamicSequentialTask} instance.
+ * See also {@link Tasks#of(String, Runnable)}. */
+ public static Task<Void> of(String name, Runnable body) {
+ return TaskBuilder.of(name, body).dynamic(true).build();
+ }
+ /** As {@link #of(String, Runnable)} where the task returns a result. */
+ public static <T> Task<T> of(String name, Callable<T> body) {
+ return TaskBuilder.of(name, body).dynamic(true).build();
+ }
+
public static class TaskQueueingResult<T> implements TaskWrapper<T> {
private final Task<T> task;
private final boolean wasQueued;
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/64d4c1cc/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 aaf5b87..c617799 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
@@ -52,6 +52,20 @@ public class TaskBuilder<T> {
return new TaskBuilder<T>();
}
+ /** Convenience to create a new {@link TaskBuilder} with the given name and body.
+ * Caller may then set {@link #build()} or {@link #buildFactory()},
+ * optionally first setting a {@link #description(String)},
+ * turning off {@link #dynamic(boolean)},
+ * adding {@link #tag(Object)}s,
+ * or listing children to {@link #add(TaskAdaptable)}. */
+ public static TaskBuilder<Void> of(String name, Runnable body) {
+ return TaskBuilder.<Void>builder().displayName(name).body(body);
+ }
+ /** As {@link #of(String, Runnable)} where the task returns a result. */
+ public static <T> TaskBuilder<T> of(String name, Callable<T> body) {
+ return TaskBuilder.<T>builder().displayName(name).body(body);
+ }
+
public TaskBuilder<T> displayName(String displayName) {
this.displayName = displayName;
return this;
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/64d4c1cc/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 830e64c..8ca3baf 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
@@ -194,6 +194,16 @@ public class Tasks {
public static <T> TaskBuilder<T> builder() {
return TaskBuilder.<T>builder();
}
+
+ /** Convenience for {@link TaskBuilder#of(String, Runnable)} for basic tasks.
+ * See also {@link DynamicTasks#of(String, Runnable)}. */
+ public static Task<Void> of(String name, Runnable body) {
+ return TaskBuilder.of(name, body).dynamic(false).build();
+ }
+ /** As {@link #of(String, Runnable)} where the task returns a result. */
+ public static <T> Task<T> of(String name, Callable<T> body) {
+ return TaskBuilder.of(name, body).dynamic(false).build();
+ }
private static Task<?>[] asTasks(TaskAdaptable<?> ...tasks) {
Task<?>[] result = new Task<?>[tasks.length];