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

Avoid creating JsonParser for VCAP_* parsing when running outside CF

Browse Source 
Closes gh-13437
This commit is contained in:
Andy Wilkinson
2018-06-25 17:35:30 +01:00
parent 8dbeb68afa
commit 9281e2a410
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -101,8 +101,6 @@ public class CloudFoundryVcapEnvironmentPostProcessor
// Before ConfigFileApplicationListener so values there can use these ones
private int order = ConfigFileApplicationListener.DEFAULT_ORDER - 1;
private final JsonParser parser = JsonParserFactory.getJsonParser();
public void setOrder(int order) {
this.order = order;
}
@@ -117,9 +115,11 @@ public class CloudFoundryVcapEnvironmentPostProcessor
SpringApplication application) {
if (CloudPlatform.CLOUD_FOUNDRY.isActive(environment)) {
Properties properties = new Properties();
addWithPrefix(properties, getPropertiesFromApplication(environment),
JsonParser jsonParser = JsonParserFactory.getJsonParser();
addWithPrefix(properties,
getPropertiesFromApplication(environment, jsonParser),
"vcap.application.");
addWithPrefix(properties, getPropertiesFromServices(environment),
addWithPrefix(properties, getPropertiesFromServices(environment, jsonParser),
"vcap.services.");
MutablePropertySources propertySources = environment.getPropertySources();
if (propertySources.contains(
@@ -142,11 +142,12 @@ public class CloudFoundryVcapEnvironmentPostProcessor
}
}
private Properties getPropertiesFromApplication(Environment environment) {
private Properties getPropertiesFromApplication(Environment environment,
JsonParser parser) {
Properties properties = new Properties();
try {
String property = environment.getProperty(VCAP_APPLICATION, "{}");
Map<String, Object> map = this.parser.parseMap(property);
Map<String, Object> map = parser.parseMap(property);
extractPropertiesFromApplication(properties, map);
}
catch (Exception ex) {
@@ -155,11 +156,12 @@ public class CloudFoundryVcapEnvironmentPostProcessor
return properties;
}
private Properties getPropertiesFromServices(Environment environment) {
private Properties getPropertiesFromServices(Environment environment,
JsonParser parser) {
Properties properties = new Properties();
try {
String property = environment.getProperty(VCAP_SERVICES, "{}");
Map<String, Object> map = this.parser.parseMap(property);
Map<String, Object> map = parser.parseMap(property);
extractPropertiesFromServices(properties, map);
}
catch (Exception ex) {