[brooklyn-server] branch master updated: Added arguments splitting using QuotedStringTokenizer

[iuliana]

This is an automated email from the ASF dual-hosted git repository.

iuliana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git


The following commit(s) were added to refs/heads/master by this push:
     new dd1522f343 Added arguments splitting using QuotedStringTokenizer
     new e0ebaafa2b Merge pull request #1410 from iuliana/arg-tokenizer
dd1522f343 is described below

commit dd1522f34388ba1fde5bcf14d56a4df707a14e4a
Author: iuliana <iuli...@cloudsoft.io>
AuthorDate: Thu Aug 31 15:21:24 2023 +0100

    Added arguments splitting using QuotedStringTokenizer
---
 .../java/org/apache/brooklyn/tasks/kubectl/ContainerTaskFactory.java | 5 ++---
 .../org/apache/brooklyn/tasks/kubectl/ContainerWorkflowStep.java     | 3 ++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/software/base/src/main/java/org/apache/brooklyn/tasks/kubectl/ContainerTaskFactory.java
 
b/software/base/src/main/java/org/apache/brooklyn/tasks/kubectl/ContainerTaskFactory.java
index a1412a1005..70e6219336 100644
--- 
a/software/base/src/main/java/org/apache/brooklyn/tasks/kubectl/ContainerTaskFactory.java
+++ 
b/software/base/src/main/java/org/apache/brooklyn/tasks/kubectl/ContainerTaskFactory.java
@@ -18,7 +18,6 @@
  */
 package org.apache.brooklyn.tasks.kubectl;
 
-import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import com.google.gson.Gson;
 import org.apache.brooklyn.api.entity.Entity;
@@ -601,8 +600,8 @@ public class ContainerTaskFactory<T extends 
ContainerTaskFactory<T,RET>,RET> imp
     public T timeout(Duration timeout) { config.put(TIMEOUT, timeout); return 
self(); }
     public T command(List<String> commands) { config.put(COMMAND, commands); 
return self(); }
 
-    public T arguments(String[] arguments) {
-        config.put(ARGUMENTS, Arrays.asList(arguments)); return self();
+    public T arguments(List<String> arguments) {
+        config.put(ARGUMENTS, arguments); return self();
     }
     public T command(String baseCommandWithNoArgs, String 
...extraCommandArguments) { config.put(COMMAND, 
MutableList.of(baseCommandWithNoArgs).appendAll(Arrays.asList(extraCommandArguments)));
 return self(); }
     public T bashScriptCommands(List<String> commands) {
diff --git 
a/software/base/src/main/java/org/apache/brooklyn/tasks/kubectl/ContainerWorkflowStep.java
 
b/software/base/src/main/java/org/apache/brooklyn/tasks/kubectl/ContainerWorkflowStep.java
index 0e39cc6c3f..5ff670d8d0 100644
--- 
a/software/base/src/main/java/org/apache/brooklyn/tasks/kubectl/ContainerWorkflowStep.java
+++ 
b/software/base/src/main/java/org/apache/brooklyn/tasks/kubectl/ContainerWorkflowStep.java
@@ -30,6 +30,7 @@ import org.apache.brooklyn.util.collections.MutableMap;
 import org.apache.brooklyn.util.core.json.ShellEnvironmentSerializer;
 import org.apache.brooklyn.util.core.predicates.DslPredicates;
 import org.apache.brooklyn.util.core.task.DynamicTasks;
+import org.apache.brooklyn.util.text.QuotedStringTokenizer;
 import org.apache.brooklyn.util.text.Strings;
 
 import java.util.Arrays;
@@ -95,7 +96,7 @@ public class ContainerWorkflowStep extends 
WorkflowStepDefinition {
 
         String args = context.getInput(ARGS);
         if (Strings.isNonBlank(args)) {
-            tf.arguments(args.split(" +"));
+            tf.arguments(new QuotedStringTokenizer(args).remainderAsList());
         }
 
         Map<String, Object> env = context.getInput(ENV);