[brooklyn-server] 08/11: fix load workflow step

[heneveld]

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 77879c3a9879821493224019b9827abcb7dd5dd6
Author: Alex Heneveld <a...@cloudsoft.io>
AuthorDate: Thu Nov 10 12:40:21 2022 +0000

    fix load workflow step
---
 .../org/apache/brooklyn/core/workflow/steps/LoadWorkflowStep.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git 
a/core/src/main/java/org/apache/brooklyn/core/workflow/steps/LoadWorkflowStep.java
 
b/core/src/main/java/org/apache/brooklyn/core/workflow/steps/LoadWorkflowStep.java
index 52d7653441..1eb14fcab8 100644
--- 
a/core/src/main/java/org/apache/brooklyn/core/workflow/steps/LoadWorkflowStep.java
+++ 
b/core/src/main/java/org/apache/brooklyn/core/workflow/steps/LoadWorkflowStep.java
@@ -37,6 +37,7 @@ import org.apache.brooklyn.util.core.flags.TypeCoercions;
 import org.apache.brooklyn.util.exceptions.Exceptions;
 import org.apache.brooklyn.util.guava.Maybe;
 import org.apache.brooklyn.util.javalang.Boxing;
+import org.apache.brooklyn.util.text.ByteSizeStrings;
 import org.apache.brooklyn.util.text.QuotedStringTokenizer;
 import org.apache.brooklyn.util.text.Strings;
 import org.apache.brooklyn.util.yaml.Yamls;
@@ -96,11 +97,12 @@ public class LoadWorkflowStep extends 
WorkflowStepDefinition {
         } else {
             data = r.getResourceAsString("" + url);
         }
-        Object resolvedValue = 
context.resolve(WorkflowExpressionResolution.WorkflowExpressionStage.STEP_RUNNING,
 data, type);
 
-        Object oldValue = 
context.getWorkflowExectionContext().getWorkflowScratchVariables().put(name, 
resolvedValue);
+        Object resolvedValue = 
context.getWorkflowExectionContext().resolveCoercingOnly(WorkflowExpressionResolution.WorkflowExpressionStage.STEP_OUTPUT,
 data, type);
 
-        if (oldValue!=null) context.noteOtherMetadata("Previous value", 
oldValue);
+        
context.getWorkflowExectionContext().getWorkflowScratchVariables().put(name, 
resolvedValue);
+
+        context.noteOtherMetadata("Loaded", 
ByteSizeStrings.java().makeSizeString(data.getBytes().length)+" from "+url+" 
into "+variable);
         return context.getPreviousStepOutput();
     }
 }