Merge branch '2.1.x' into 2.2.x

Closes gh-20432

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/cloud/CloudFoundryVcapEnvironmentPostProcessor.java

@@ -87,7 +87,6 @@ import org.springframework.util.StringUtils;
  *
  * @author Dave Syer
  * @author Andy Wilkinson
- * @author Madhura Bhave
  * @since 1.3.0
  */
 public class CloudFoundryVcapEnvironmentPostProcessor
@@ -231,19 +230,7 @@ public class CloudFoundryVcapEnvironmentPostProcessor
 		if (key.startsWith("[")) {
 			return path + key;
 		}
-		if (shouldWrap(key)) {
-			return path + "[" + key + "]";
-		}
 		return path + "." + key;
 	}
 
-	private boolean shouldWrap(String key) {
-		for (char ch : key.toCharArray()) {
-			if (!Character.isLowerCase(ch) && !Character.isDigit(ch) && ch != '-') {
-				return true;
-			}
-		}
-		return false;
-	}
-
 }

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/cloud/cloudfoundry/CloudFoundryVcapEnvironmentPostProcessorTests.java

@@ -30,8 +30,6 @@ import static org.assertj.core.api.Assertions.assertThat;
  *
  * @author Dave Syer
  * @author Andy Wilkinson
- * @author Hans Schulz
- * @author Madhura Bhave
  */
 class CloudFoundryVcapEnvironmentPostProcessorTests {
 
@@ -118,26 +116,6 @@ class CloudFoundryVcapEnvironmentPostProcessorTests {
 		assertThat(getProperty("vcap.services.mysql.credentials.port")).isEqualTo("3306");
 	}
 
-	@Test
-	void testServicePropertiesContainingKeysWithDot() {
-		TestPropertySourceUtils.addInlinedPropertiesToEnvironment(this.context,
-				"VCAP_SERVICES={\"user-provided\":[{\"name\":\"test\",\"label\":\"test-label\","
-						+ "\"credentials\":{\"key.with.dots\":\"some-value\"}}]}");
-		this.initializer.postProcessEnvironment(this.context.getEnvironment(), null);
-		assertThat(getProperty("vcap.services.test.name")).isEqualTo("test");
-		assertThat(getProperty("vcap.services.test.credentials[key.with.dots]")).isEqualTo("some-value");
-	}
-
-	@Test
-	void testServicePropertiesContainingKeysWithUpperCaseAndNonAlphaNumericCharacters() {
-		TestPropertySourceUtils.addInlinedPropertiesToEnvironment(this.context,
-				"VCAP_SERVICES={\"user-provided\":[{\"name\":\"test\",\"label\":\"test-label\","
-						+ "\"credentials\":{\"My-Key\":\"some-value\", \"foo@\":\"bar\"}}]}");
-		this.initializer.postProcessEnvironment(this.context.getEnvironment(), null);
-		assertThat(getProperty("vcap.services.test.credentials[My-Key]")).isEqualTo("some-value");
-		assertThat(getProperty("vcap.services.test.credentials[foo@]")).isEqualTo("bar");
-	}
-
 	private String getProperty(String key) {
 		return this.context.getEnvironment().getProperty(key);
 	}