Updated arg parser to find all embedded quotes.

resolves spring-attic#4782

Author: cppwfs

spring-cloud-dataflow-rest-resource/src/main/java/org/springframework/cloud/dataflow/rest/util/DeploymentPropertiesUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2021 the original author or authors.
+ * Copyright 2017-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,6 +47,7 @@
  * @author Christian Tzolov
  * @author Gunnar Hillert
  * @author Ilayaperumal Gopinathan
+ * @author Glenn Renfro
  */
 public final class DeploymentPropertiesUtils {
 
@@ -177,7 +178,14 @@ public static List<String> parseArgumentList(String s, String delimiter) {
 				else {
 					// we have a key/value pair having '=', or malformed first pair
 					if(!candidates[i].equals("")) {
-						pairs.add(candidates[i]);
+						int endToken = findEndToken(candidates, i);
+						if(endToken > -1) {
+							pairs.add(candidates[i] + " " + candidates[endToken]);
+							i = endToken;
+						}
+						else {
+							pairs.add(candidates[i]);
+						}
 					}
 				}
 			}

spring-cloud-dataflow-rest-resource/src/test/java/org/springframework/cloud/dataflow/rest/util/DeploymentPropertiesUtilsTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 the original author or authors.
+ * Copyright 2016-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,6 +40,7 @@
  * @author Janne Valkealahti
  * @author Christian Tzolov
  * @author Ilayaperumal Gopinathan
+ * @author Glenn Renfro
  */
 public class DeploymentPropertiesUtilsTests {
 
@@ -131,8 +132,6 @@ public void testDeploymentPropertiesParsing2() {
 		assertTrue(props.contains("a=b"));
 
 		props = DeploymentPropertiesUtils.parseArgumentList("a=b    c=d   ", " ");
-		System.out.println(">" +props.get(0)+"<");
-		System.out.println(">" +props.get(1)+"<");
 
 		assertTrue(props.contains("a=b"));
 		assertTrue(props.contains("c=d"));
@@ -160,6 +159,44 @@ public void parseArgumentTestsWithQuotes() {
 		assertTrue(props.contains("--foo=bar"));
 	}
 
+	@Test
+	public void parseArgumentTestsWithMultipleQuotes() {
+
+		List<String> props = DeploymentPropertiesUtils.parseArgumentList("arg2=\"Argument 2\" arg3=val3", " ");
+		assertTrue(props.contains("arg2=\"Argument 2\""));
+		assertTrue(props.contains("arg3=val3"));
+
+		props = DeploymentPropertiesUtils.parseArgumentList("arg0=val0 arg1=val1 arg2=\"Argument 2\" arg3=val3", " ");
+		assertTrue(props.contains("arg0=val0"));
+		assertTrue(props.contains("arg1=val1"));
+		assertTrue(props.contains("arg2=\"Argument 2\""));
+		assertTrue(props.contains("arg3=val3"));
+
+		props = DeploymentPropertiesUtils.parseArgumentList("-arg1=val1 arg2=\"Argument 2\" arg3=val3", " ");
+		assertTrue(props.contains("-arg1=val1"));
+		assertTrue(props.contains("arg2=\"Argument 2\""));
+		assertTrue(props.contains("arg3=val3"));
+
+		props = DeploymentPropertiesUtils.parseArgumentList("-arg1=val1 arg2=\"Argument 2\" arg3=val3 arg4=\"Argument 4\"", " ");
+		assertTrue(props.contains("-arg1=val1"));
+		assertTrue(props.contains("arg2=\"Argument 2\""));
+		assertTrue(props.contains("arg3=val3"));
+		assertTrue(props.contains("arg4=\"Argument 4\""));
+
+		props = DeploymentPropertiesUtils.parseArgumentList("-arg1=val1 arg2=\"Argument 2\" arg3=\"val3\" arg4=\"Argument 4\"", " ");
+		assertTrue(props.contains("-arg1=val1"));
+		assertTrue(props.contains("arg2=\"Argument 2\""));
+		assertTrue(props.contains("arg3=\"val3\""));
+		assertTrue(props.contains("arg4=\"Argument 4\""));
+
+		props = DeploymentPropertiesUtils.parseArgumentList("-arg1=\"val1\" arg2=\"Argument 2\" arg3=\"val3\" arg4=\"Argument 4\"", " ");
+		assertTrue(props.contains("-arg1=\"val1\""));
+		assertTrue(props.contains("arg2=\"Argument 2\""));
+		assertTrue(props.contains("arg3=\"val3\""));
+		assertTrue(props.contains("arg4=\"Argument 4\""));
+
+	}
+
 	@Test
 	public void testLongDeploymentPropertyValues() {
 		Map<String, String> props = DeploymentPropertiesUtils