Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Do not wrap CF JSON Keys containing special characters

Browse Source 
This reverts commit 6828a15d31.
The commit has been reverted as it breaks backwards compatiblity.

Fixes gh-20343
This commit is contained in:
Madhura Bhave
2020-03-09 15:56:48 -07:00
parent c5344b58c2
commit 06d870bdd0
2 changed files with 0 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;
}
}

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

@@ -30,8 +30,6 @@ import static org.assertj.core.api.Assertions.assertThat;
*
* @author Dave Syer
* @author Andy Wilkinson
* @author Hans Schulz
* @author Madhura Bhave
*/
public class CloudFoundryVcapEnvironmentPostProcessorTests {
@@ -119,26 +117,6 @@ public class CloudFoundryVcapEnvironmentPostProcessorTests {
assertThat(getProperty("vcap.services.mysql.credentials.port")).isEqualTo("3306");
}
@Test
public 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
public 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);
}