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 b733f892f4d9de0957eaa83dc1715425c881aabb Merge: eccdd77f51 dfaf904838 Author: Alex Heneveld <[email protected]> AuthorDate: Wed May 17 10:02:43 2023 +0100 Merge branch 'master' into fix/sum-operator-coercion .../camp/brooklyn/WorkflowExpressionsYamlTest.java | 9 + .../org/apache/brooklyn/core/config/Sanitizer.java | 7 +- .../mgmt/internal/LocalSubscriptionManager.java | 48 ++--- .../brooklyn/core/workflow/WorkflowSensor.java | 3 - .../WorkflowStepInstanceExecutionContext.java | 5 +- .../core/workflow/steps/CustomWorkflowStep.java | 37 +++- .../core/workflow/steps/flow/LogWorkflowStep.java | 31 ++- .../workflow/steps/variables/LoadWorkflowStep.java | 1 + .../steps/variables/SetVariableWorkflowStep.java | 192 ++++++++++++++++- .../workflow/steps/variables/TransformReplace.java | 196 ++++++++++++++++++ .../variables/TransformVariableWorkflowStep.java | 7 +- .../steps/variables/WorkflowTransformDefault.java | 5 + .../variables/WorkflowTransformWithContext.java | 2 + .../brooklyn/util/core/mutex/MutexSupport.java | 5 +- .../util/core/mutex/SemaphoreWithOwners.java | 15 +- .../brooklyn/util/core/text/TemplateProcessor.java | 72 +++++-- .../BrooklynMiscJacksonSerializationTest.java | 7 + .../brooklyn/core/workflow/WorkflowBasicTest.java | 27 ++- .../core/workflow/WorkflowMapAndListTest.java | 120 +++++++++++ .../WorkflowNestedAndCustomExtensionTest.java | 79 ++++++- .../core/workflow/WorkflowOperandsTest.java | 196 ++++++++++++++++++ .../core/workflow/WorkflowTransformTest.java | 226 +++++++++++++++++++++ .../util/core/text/TemplateProcessorTest.java | 37 +++- .../base/AbstractSoftwareProcessDriver.java | 9 +- .../base/AbstractSoftwareProcessSshDriver.java | 23 ++- .../java/org/apache/brooklyn/util/text/Secret.java | 121 +++++++++++ .../org/apache/brooklyn/util/text/SecretTest.java | 47 +++++ 27 files changed, 1433 insertions(+), 94 deletions(-) diff --cc core/src/main/java/org/apache/brooklyn/core/workflow/steps/variables/TransformVariableWorkflowStep.java index c1fe4b54ee,a331cc24b1..4383415b2f --- a/core/src/main/java/org/apache/brooklyn/core/workflow/steps/variables/TransformVariableWorkflowStep.java +++ b/core/src/main/java/org/apache/brooklyn/core/workflow/steps/variables/TransformVariableWorkflowStep.java @@@ -167,10 -168,13 +168,14 @@@ public class TransformVariableWorkflowS }); TRANSFORMATIONS.put("max", () -> v -> minmax(v, "max", i -> i>0)); TRANSFORMATIONS.put("min", () -> v -> minmax(v, "min", i -> i<0)); - TRANSFORMATIONS.put("sum", () -> v -> sum(v, "sum")); +// TRANSFORMATIONS.put("sum", () -> v -> sum(v, "sum")); + TRANSFORMATIONS.put("sum", () -> new TransformSum()); TRANSFORMATIONS.put("average", () -> v -> average(v, "average")); TRANSFORMATIONS.put("size", () -> v -> size(v, "size")); + TRANSFORMATIONS.put("get", () -> v -> { + if (v instanceof Supplier) return ((Supplier)v).get(); + return v; + }); } static final Object minmax(Object v, String word, Predicate<Integer> test) {
