Merge branch '3.3.x' into 3.4.x

Closes gh-45918

Author: mhalbritter

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

@@ -91,10 +91,6 @@
  */
 public class CloudFoundryVcapEnvironmentPostProcessor implements EnvironmentPostProcessor, Ordered {
 
-	private static final String VCAP_APPLICATION = "VCAP_APPLICATION";
-
-	private static final String VCAP_SERVICES = "VCAP_SERVICES";
-
 	private final Log logger;
 
 	// Before ConfigDataEnvironmentPostProcessor so values there can use these
@@ -126,12 +122,12 @@ public void postProcessEnvironment(ConfigurableEnvironment environment, SpringAp
 			addWithPrefix(properties, getPropertiesFromApplication(environment, jsonParser), "vcap.application.");
 			addWithPrefix(properties, getPropertiesFromServices(environment, jsonParser), "vcap.services.");
 			MutablePropertySources propertySources = environment.getPropertySources();
+			PropertiesPropertySource vcapSource = new PropertiesPropertySource("vcap", properties);
 			if (propertySources.contains(CommandLinePropertySource.COMMAND_LINE_PROPERTY_SOURCE_NAME)) {
-				propertySources.addAfter(CommandLinePropertySource.COMMAND_LINE_PROPERTY_SOURCE_NAME,
-						new PropertiesPropertySource("vcap", properties));
+				propertySources.addAfter(CommandLinePropertySource.COMMAND_LINE_PROPERTY_SOURCE_NAME, vcapSource);
 			}
 			else {
-				propertySources.addFirst(new PropertiesPropertySource("vcap", properties));
+				propertySources.addFirst(vcapSource);
 			}
 		}
 	}
@@ -146,7 +142,7 @@ private void addWithPrefix(Properties properties, Properties other, String prefi
 	private Properties getPropertiesFromApplication(Environment environment, JsonParser parser) {
 		Properties properties = new Properties();
 		try {
-			String property = environment.getProperty(VCAP_APPLICATION, "{}");
+			String property = environment.getProperty("VCAP_APPLICATION", "{}");
 			Map<String, Object> map = parser.parseMap(property);
 			extractPropertiesFromApplication(properties, map);
 		}
@@ -159,7 +155,7 @@ private Properties getPropertiesFromApplication(Environment environment, JsonPar
 	private Properties getPropertiesFromServices(Environment environment, JsonParser parser) {
 		Properties properties = new Properties();
 		try {
-			String property = environment.getProperty(VCAP_SERVICES, "{}");
+			String property = environment.getProperty("VCAP_SERVICES", "{}");
 			Map<String, Object> map = parser.parseMap(property);
 			extractPropertiesFromServices(properties, map);
 		}