Fix DeploymentProperties parsing argumentList

 - When the values passed with quotes, handle them as separate key/value pairs
This is to accommodate the task parameter passing without `--`

This commit is copied from the original changes from 51a0c79

Resolves #3921

Author: ilayaperumalg

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

@@ -148,10 +148,21 @@ public static List<String> parseParamList(String s, String delimiter) {
 	 */
 	public static List<String> parseArgumentList(String s, String delimiter) {
 		ArrayList<String> pairs = new ArrayList<>();
-		if(s != null && s.contains("=")) {
+		if (s != null && s.contains("=")) {
 			// get raw candidates as simple comma split
 			String[] candidates = StringUtils.delimitedListToStringArray(s, delimiter);
 			for (int i = 0; i < candidates.length; i++) {
+				int elementsInQuotesIndex = findEndToken(candidates, i) +1;
+				if (elementsInQuotesIndex > -1) {
+					pairs.add(candidates[i]);
+					i++;
+					for (; i < elementsInQuotesIndex; i++) {
+						pairs.set(pairs.size() - 1, pairs.get(pairs.size() - 1) + delimiter + candidates[i]);
+					}
+					if(!(i < candidates.length)) {
+						break;
+					}
+				}
 				if (i > 0 && !candidates[i].contains("=")) {
 					// we don't have '=' so this has to be latter parts of
 					// a comma delimited value, append it to previously added
@@ -167,11 +178,23 @@ public static List<String> parseArgumentList(String s, String delimiter) {
 				}
 			}
 		}
-
-
 		return pairs;
 	}
 
+	private  static int findEndToken(String[] candidates, int currentPos) {
+		int result = -1;
+		if(!candidates[currentPos].contains("=\"")) {
+			return -1;
+		}
+		for(int i = currentPos; i < candidates.length; i++) {
+			if(candidates[i].endsWith("\"" )) {
+				result = i;
+				break;
+			}
+		}
+		return result;
+	}
+
 
 	private static boolean startsWithDeploymentPropertyPrefix(String candidate) {
 		for (String deploymentPropertyPrefix: DEPLOYMENT_PROPERTIES_PREFIX) {

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

@@ -140,6 +140,23 @@ public void testDeploymentPropertiesParsing2() {
 		assertTrue(props.contains("foo3=bar3 xxx3"));
 	}
 
+	@Test
+	public void parseArgumentTestsWithQuotes() {
+
+		List<String> props = DeploymentPropertiesUtils.parseArgumentList("a=\"b c\" e=f g=h", " ");
+		assertTrue(props.contains("a=\"b c\""));
+		assertTrue(props.contains("e=f"));
+		assertTrue(props.contains("g=h"));
+		props = DeploymentPropertiesUtils.parseArgumentList("--composedTaskArguments=\"1.timestamp.format=YYYY " +
+				"--timestamp.timestamp.format=MM --foo=bar bar=\"bazzz buzz\"\" " +
+				"a=b c=d --foo=bar", " ");
+		assertTrue(props.contains("--composedTaskArguments=\"1.timestamp.format=YYYY " +
+				"--timestamp.timestamp.format=MM --foo=bar bar=\"bazzz buzz\"\""));
+		assertTrue(props.contains("a=b"));
+		assertTrue(props.contains("c=d"));
+		assertTrue(props.contains("--foo=bar"));
+	}
+
 	@Test
 	public void testLongDeploymentPropertyValues() {
 		Map<String, String> props = DeploymentPropertiesUtils