From cafb5033e2c5c1388b0d952c592ca101f0e6b53c Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Tue, 19 Jun 2018 13:50:13 +0300 Subject: [PATCH] Polishing --- .../beans/factory/xml/DefaultBeanDefinitionDocumentReader.java | 2 ++ .../org/springframework/core/env/StandardEnvironmentTests.java | 1 + 2 files changed, 3 insertions(+) diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultBeanDefinitionDocumentReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultBeanDefinitionDocumentReader.java index 74d3e6569f..c8f851a750 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultBeanDefinitionDocumentReader.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultBeanDefinitionDocumentReader.java @@ -135,6 +135,8 @@ public class DefaultBeanDefinitionDocumentReader implements BeanDefinitionDocume if (StringUtils.hasText(profileSpec)) { String[] specifiedProfiles = StringUtils.tokenizeToStringArray( profileSpec, BeanDefinitionParserDelegate.MULTI_VALUE_ATTRIBUTE_DELIMITERS); + // We cannot use Profiles.of(...) since profile expressions are not supported + // in XML config. See SPR-12458 for details. if (!getReaderContext().getEnvironment().acceptsProfiles(specifiedProfiles)) { if (logger.isInfoEnabled()) { logger.info("Skipped XML bean definition file due to specified profiles [" + profileSpec + diff --git a/spring-core/src/test/java/org/springframework/core/env/StandardEnvironmentTests.java b/spring-core/src/test/java/org/springframework/core/env/StandardEnvironmentTests.java index e705793ae8..084e6c6192 100644 --- a/spring-core/src/test/java/org/springframework/core/env/StandardEnvironmentTests.java +++ b/spring-core/src/test/java/org/springframework/core/env/StandardEnvironmentTests.java @@ -38,6 +38,7 @@ import static org.springframework.core.env.AbstractEnvironment.*; * @author Chris Beams * @author Juergen Hoeller */ +@SuppressWarnings("deprecation") public class StandardEnvironmentTests { private static final String ALLOWED_PROPERTY_NAME = "theanswer";