Append group in stream DSL on app definition

 - When the stream DSL has `input` group set, then the `group` property needs to be set on the app definition associated with it.
 - Update test

Resolves #4463

Author: ilayaperumalg

spring-cloud-dataflow-core/src/main/java/org/springframework/cloud/dataflow/core/DefaultStreamDefinitionService.java

@@ -72,15 +72,16 @@ public String constructDsl(String originalDslText, LinkedList<StreamAppDefinitio
 			// Check for Input Named Destination
 			if (appDefinitionIndex == 0 && StringUtils.hasText(inputDestination)) {
 				dslBuilder.append(":").append(inputDestination);
-				if (inputGroup != null && !inputGroup.equals(appDefinition.getStreamName())) {
-					dslBuilder.append(" --group=").append(inputGroup);
-				}
 				dslBuilder.append(" > ");
 			}
 
 			// Add App Definition
 			dslBuilder.append(appDefinition.getName());
 
+			if (inputGroup != null && !inputGroup.equals(appDefinition.getStreamName())) {
+				dslBuilder.append(" --group=").append(inputGroup);
+			}
+
 			if (!appDefinition.getName().equals(appDefinition.getRegisteredAppName())) {
 				dslBuilder.append(": ").append(appDefinition.getRegisteredAppName());
 			}

spring-cloud-dataflow-core/src/test/java/org/springframework/cloud/dataflow/core/StreamDefinitionServiceUtilsTests.java

@@ -73,7 +73,7 @@ public void testXD2416_2() {
 
 	@Test
 	public void testSourceDestinationArgs() {
-		reverseDslTest(":test --group=test > file", 1);
+		reverseDslTest(":test > file --group=test", 1);
 	}
 
 	@Test
@@ -133,7 +133,6 @@ public void testExclusionOfDataFlowAddedProperties() {
 				DataFlowPropertyKeys.STREAM_APP_TYPE,
 				DataFlowPropertyKeys.STREAM_APP_LABEL,
 				DataFlowPropertyKeys.STREAM_NAME,
-				BindingPropertyKeys.INPUT_GROUP,
 				BindingPropertyKeys.OUTPUT_REQUIRED_GROUPS,
 				BindingPropertyKeys.OUTPUT_DESTINATION);
 
@@ -163,7 +162,9 @@ public void testInputDestinationProperty() {
 	@Test
 	public void testPropertyAutoQuotes() {
 
-		StreamDefinition streamDefinition = new StreamDefinition("streamName", "foo | bar");
+		String streamName = "stream2";
+
+		StreamDefinition streamDefinition = new StreamDefinition(streamName, "foo | bar");
 
 		StreamAppDefinition foo = this.streamDefinitionService.getAppDefinitions(streamDefinition).get(0);
 		StreamAppDefinition bar = this.streamDefinitionService.getAppDefinitions(streamDefinition).get(1);
@@ -174,13 +175,13 @@ public void testPropertyAutoQuotes() {
 				.setProperty("p3", "ef")
 				.setProperty("p4", "'i' 'j'")
 				.setProperty("p5", "\"k l\"")
-				.build("stream2");
+				.build(streamName);
 
 		StreamAppDefinition bar2 = StreamAppDefinition.Builder.from(bar)
 				.setProperty("p1", "a b")
 				.setProperty("p2", "'c d'")
 				.setProperty("p3", "ef")
-				.build("stream2");
+				.build(streamName);
 
 		assertEquals("foo --p1='a b' --p2=\"'c d'\" --p3=ef --p4=\"'i' 'j'\" --p5=\"k l\" | bar --p1='a b' --p2=\"'c d'\" --p3=ef",
 				this.streamDefinitionService.constructDsl(streamDefinition.getDslText(), new LinkedList(Arrays.asList(foo2, bar2))));