Back-port #4085

 - Remove second unescaping of Container Metadata

Author: tzolov

spring-cloud-dataflow-configuration-metadata/src/main/java/org/springframework/cloud/dataflow/configuration/metadata/BootApplicationConfigurationMetadataResolver.java

@@ -33,7 +33,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.apache.commons.text.StringEscapeUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -194,10 +193,10 @@ private List<ConfigurationMetadataProperty> resolvePropertiesFromContainerImage(
 		}
 
 		try {
-			String metadataJson = StringEscapeUtils.unescapeJson(encodedMetadata);
 			ConfigurationMetadataRepository configurationMetadataRepository =
-					ConfigurationMetadataRepositoryJsonBuilder.create().withJsonResource(
-							new ByteArrayInputStream(metadataJson.getBytes())).build();
+					ConfigurationMetadataRepositoryJsonBuilder
+							.create().withJsonResource(new ByteArrayInputStream(encodedMetadata.getBytes()))
+							.build();
 
 			List<ConfigurationMetadataProperty> result = configurationMetadataRepository.getAllProperties().entrySet().stream()
 					.map(e -> e.getValue())

spring-cloud-dataflow-configuration-metadata/src/test/java/org/springframework/cloud/dataflow/configuration/metadata/BootApplicationConfigurationMetadataResolverTests.java

@@ -23,7 +23,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.text.StringEscapeUtils;
 import org.hamcrest.Matcher;
 import org.junit.Before;
 import org.junit.Test;
@@ -77,15 +76,15 @@ public void appDockerResource() throws IOException {
 		byte[] bytes = StreamUtils.copyToByteArray(new ClassPathResource(
 				"apps/no-whitelist/META-INF/spring-configuration-metadata.json", getClass()).getInputStream());
 		when(containerImageMetadataResolver.getImageLabels("test/test:latest"))
-				.thenReturn(Collections.singletonMap("org.springframework.cloud.dataflow.spring-configuration-metadata.json", StringEscapeUtils.escapeJson(new String(bytes))));
+				.thenReturn(Collections.singletonMap("org.springframework.cloud.dataflow.spring-configuration-metadata.json", new String(bytes)));
 		List<ConfigurationMetadataProperty> properties = resolver.listProperties(new DockerResource("test/test:latest"));
 		assertThat(properties.size(), is(3));
 	}
 
 	@Test
 	public void appDockerResourceBrokenFormat() {
 		byte[] bytes = "Invalid metadata json content1".getBytes();
-		Map<String, String> result = Collections.singletonMap("org.springframework.cloud.dataflow.spring-configuration-metadata.json", StringEscapeUtils.escapeJson(new String(bytes)));
+		Map<String, String> result = Collections.singletonMap("org.springframework.cloud.dataflow.spring-configuration-metadata.json", new String(bytes));
 		when(containerImageMetadataResolver.getImageLabels("test/test:latest")).thenReturn(result);
 		List<ConfigurationMetadataProperty> properties = resolver.listProperties(new DockerResource("test/test:latest"));
 		assertThat(properties.size(), is(0));

spring-cloud-dataflow-server/src/test/java/org/springframework/cloud/dataflow/integration/test/DataFlowIT.java

@@ -234,12 +234,19 @@ public void applicationMetadataTests() {
 		assertThat(mavenAppWithoutMetadata.getOptions()).hasSize(8);
 
 		// Docker app with container image metadata
-		dataFlowOperations.appRegistryOperations().register("docker-app-with-container-metadata", ApplicationType.sink,
+		dataFlowOperations.appRegistryOperations().register("docker-app-with-container-metadata", ApplicationType.source,
 				"docker:springcloudstream/time-source-kafka:2.1.2.BUILD-SNAPSHOT", null, true);
 		DetailedAppRegistrationResource dockerAppWithContainerMetadata = dataFlowOperations.appRegistryOperations()
-				.info("docker-app-with-container-metadata", ApplicationType.sink, false);
+				.info("docker-app-with-container-metadata", ApplicationType.source, false);
 		assertThat(dockerAppWithContainerMetadata.getOptions()).hasSize(6);
 
+		// Docker app with container image metadata with escape characters.
+		dataFlowOperations.appRegistryOperations().register("docker-app-with-container-metadata-escape-chars", ApplicationType.source,
+				"docker:springcloudstream/http-source-rabbit:2.1.3.RELEASE", null, true);
+		DetailedAppRegistrationResource dockerAppWithContainerMetadataWithEscapeChars = dataFlowOperations.appRegistryOperations()
+				.info("docker-app-with-container-metadata-escape-chars", ApplicationType.source, false);
+		assertThat(dockerAppWithContainerMetadataWithEscapeChars.getOptions()).hasSize(6);
+
 		// Docker app without metadata
 		dataFlowOperations.appRegistryOperations().register("docker-app-without-metadata", ApplicationType.sink,
 				"docker:springcloudstream/file-sink-kafka:2.1.1.RELEASE", null, true);
@@ -256,7 +263,8 @@ public void applicationMetadataTests() {
 		assertThat(dockerAppWithJarMetadata.getOptions()).hasSize(8);
 
 		// unregister the test apps
-		dataFlowOperations.appRegistryOperations().unregister("docker-app-with-container-metadata", ApplicationType.sink);
+		dataFlowOperations.appRegistryOperations().unregister("docker-app-with-container-metadata", ApplicationType.source);
+		dataFlowOperations.appRegistryOperations().unregister("docker-app-with-container-metadata-escape-chars", ApplicationType.source);
 		dataFlowOperations.appRegistryOperations().unregister("docker-app-without-metadata", ApplicationType.sink);
 		dataFlowOperations.appRegistryOperations().unregister("maven-app-without-metadata", ApplicationType.sink);
 		dataFlowOperations.appRegistryOperations().unregister("docker-app-with-jar-metadata", ApplicationType.sink);

spring-cloud-dataflow-server/src/test/java/org/springframework/cloud/dataflow/integration/test/util/DockerComposeFactory.java

@@ -50,12 +50,12 @@ public class DockerComposeFactory {
 	/**
 	 * Data Flow version to use for the tests.
 	 */
-	public static final String DEFAULT_DATAFLOW_VERSION = "2.6.0-SNAPSHOT";
+	public static final String DEFAULT_DATAFLOW_VERSION = "2.6.2-SNAPSHOT";
 
 	/**
 	 * Skipper version used for the tests.
 	 */
-	public static final String DEFAULT_SKIPPER_VERSION = "2.5.0-SNAPSHOT";
+	public static final String DEFAULT_SKIPPER_VERSION = "2.5.1";
 
 	/**
 	 * Pre-registered Task apps used for testing.