You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2023/05/01 12:18:08 UTC
[brooklyn-server] 01/06: minor tidies for workflow
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit 42980dcdb3bd2b8691e08fec86cc6369fa88de09
Author: Alex Heneveld <al...@cloudsoft.io>
AuthorDate: Mon May 1 10:48:20 2023 +0100
minor tidies for workflow
---
.../main/java/org/apache/brooklyn/core/workflow/WorkflowSensor.java | 3 ---
.../brooklyn/core/workflow/steps/variables/LoadWorkflowStep.java | 1 +
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/core/src/main/java/org/apache/brooklyn/core/workflow/WorkflowSensor.java b/core/src/main/java/org/apache/brooklyn/core/workflow/WorkflowSensor.java
index c24195fa70..7c67301fc7 100644
--- a/core/src/main/java/org/apache/brooklyn/core/workflow/WorkflowSensor.java
+++ b/core/src/main/java/org/apache/brooklyn/core/workflow/WorkflowSensor.java
@@ -64,9 +64,6 @@ public class WorkflowSensor<T> extends AbstractAddTriggerableSensor<T> implement
public static final ConfigKey<EntityValueToSet> SENSOR = ConfigKeys.newConfigKey(EntityValueToSet.class, "sensor");
- public static final ConfigKey<Map<String,Object>> INPUT = WorkflowCommonConfig.INPUT;
- public static final ConfigKey<List<Object>> STEPS = WorkflowCommonConfig.STEPS;
-
// do we need to have an option not to run when initialization is done?
public WorkflowSensor() {}
diff --git a/core/src/main/java/org/apache/brooklyn/core/workflow/steps/variables/LoadWorkflowStep.java b/core/src/main/java/org/apache/brooklyn/core/workflow/steps/variables/LoadWorkflowStep.java
index 1a60f5a10c..197aebefce 100644
--- a/core/src/main/java/org/apache/brooklyn/core/workflow/steps/variables/LoadWorkflowStep.java
+++ b/core/src/main/java/org/apache/brooklyn/core/workflow/steps/variables/LoadWorkflowStep.java
@@ -41,6 +41,7 @@ public class LoadWorkflowStep extends WorkflowStepDefinition {
private static final Logger log = LoggerFactory.getLogger(LoadWorkflowStep.class);
public static final String SHORTHAND =
+ // TODO could support "template" here to change the interpolation mode
"[ \"charset\" ${charset} ] [ ${variable.type} ] ${variable.name} [ \"=\" ${url...} ]";
public static final ConfigKey<TypedValueToSet> VARIABLE = ConfigKeys.newConfigKey(TypedValueToSet.class, "variable");