Move spring.resources.* properties to spring.web.resources.*

Closes gh-23917

Author: wilkinsona

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/OnEnabledResourceChainCondition.java

@@ -19,9 +19,13 @@
 import org.springframework.boot.autoconfigure.condition.ConditionMessage;
 import org.springframework.boot.autoconfigure.condition.ConditionOutcome;
 import org.springframework.boot.autoconfigure.condition.SpringBootCondition;
+import org.springframework.boot.autoconfigure.web.WebProperties.Resources.Chain;
+import org.springframework.boot.context.properties.bind.BindResult;
+import org.springframework.boot.context.properties.bind.Binder;
 import org.springframework.context.annotation.Condition;
 import org.springframework.context.annotation.ConditionContext;
 import org.springframework.core.env.ConfigurableEnvironment;
+import org.springframework.core.env.Environment;
 import org.springframework.core.type.AnnotatedTypeMetadata;
 import org.springframework.util.ClassUtils;
 
@@ -41,10 +45,11 @@ class OnEnabledResourceChainCondition extends SpringBootCondition {
 	@Override
 	public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeMetadata metadata) {
 		ConfigurableEnvironment environment = (ConfigurableEnvironment) context.getEnvironment();
-		boolean fixed = getEnabledProperty(environment, "strategy.fixed.", false);
-		boolean content = getEnabledProperty(environment, "strategy.content.", false);
-		Boolean chain = getEnabledProperty(environment, "", null);
-		Boolean match = ResourceProperties.Chain.getEnabled(fixed, content, chain);
+		String prefix = determineResourcePropertiesPrefix(environment);
+		boolean fixed = getEnabledProperty(environment, prefix, "strategy.fixed.", false);
+		boolean content = getEnabledProperty(environment, prefix, "strategy.content.", false);
+		Boolean chain = getEnabledProperty(environment, prefix, "", null);
+		Boolean match = Chain.getEnabled(fixed, content, chain);
 		ConditionMessage.Builder message = ConditionMessage.forCondition(ConditionalOnEnabledResourceChain.class);
 		if (match == null) {
 			if (ClassUtils.isPresent(WEBJAR_ASSET_LOCATOR, getClass().getClassLoader())) {
@@ -58,8 +63,19 @@ public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeM
 		return ConditionOutcome.noMatch(message.because("disabled"));
 	}
 
-	private Boolean getEnabledProperty(ConfigurableEnvironment environment, String key, Boolean defaultValue) {
-		String name = "spring.resources.chain." + key + "enabled";
+	@SuppressWarnings("deprecation")
+	private String determineResourcePropertiesPrefix(Environment environment) {
+		BindResult<org.springframework.boot.autoconfigure.web.ResourceProperties> result = Binder.get(environment)
+				.bind("spring.resources", org.springframework.boot.autoconfigure.web.ResourceProperties.class);
+		if (result.isBound() && result.get().hasBeenCustomized()) {
+			return "spring.resources.chain.";
+		}
+		return "spring.web.resources.chain.";
+	}
+
+	private Boolean getEnabledProperty(ConfigurableEnvironment environment, String prefix, String key,
+			Boolean defaultValue) {
+		String name = prefix + key + "enabled";
 		return environment.getProperty(name, Boolean.class, defaultValue);
 	}