Revised ResourcePropertySource in order to avoid ConfigurationClassProcessor's AnnotationPropertySource subclass

Issue: SPR-12115
2014-08-22 13:54:39 +02:00
parent dbe337f932
commit 9dfbc5326b
5 changed files with 73 additions and 59 deletions
--- a/spring-context/src/test/java/org/springframework/context/annotation/PropertySourceAnnotationTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/PropertySourceAnnotationTests.java
@@ -362,6 +362,7 @@ public class PropertySourceAnnotationTests {
 	static class ConfigWithEmptyResourceLocations {
 	}

+
 	@Import({ ConfigImportedWithSameSourceImportedInDifferentOrder.class })
 	@PropertySources({
 		@PropertySource("classpath:org/springframework/context/annotation/p1.properties"),
@@ -372,6 +373,7 @@ public class PropertySourceAnnotationTests {

 	}

+
 	@Configuration
 	@PropertySources({
 		@PropertySource("classpath:org/springframework/context/annotation/p2.properties"),