Adjust order of property sources

@PropertySources *can* and should be added in the slot
after the application.properties (code that is part of the
application should have lower precedence than external
configuration).

Fixes gh-1044

spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc

@@ -207,11 +207,11 @@ sensible overriding of values, properties are considered in the the following or
 . OS environment variables.
 . JNDI attributes from `java:comp/env`
 . A `RandomValuePropertySource` that only has properties in `random.*`.
-. `@PropertySource` annotations on your `@Configuration` classes.
 . Application properties outside of your packaged jar (`application.properties`
   including YAML and profile variants).
 . Application properties packaged inside your jar (`application.properties`
   including YAML and profile variants).
+. `@PropertySource` annotations on your `@Configuration` classes.
 . Default properties (specified using `SpringApplication.setDefaultProperties`).
 
 To provide a concrete example, suppose you develop a `@Component` that uses a

spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java

@@ -497,19 +497,22 @@ public class ConfigFileApplicationListener implements
 
 		public static void finishAndRelocate(MutablePropertySources propertySources) {
 			ConfigurationPropertySources removed = (ConfigurationPropertySources) propertySources
-					.remove(ConfigurationPropertySources.NAME);
+					.get(ConfigurationPropertySources.NAME);
+			String name = ConfigurationPropertySources.NAME;
 			if (removed != null) {
 				for (PropertySource<?> propertySource : removed.sources) {
 					if (propertySource instanceof EnumerableCompositePropertySource) {
 						EnumerableCompositePropertySource composite = (EnumerableCompositePropertySource) propertySource;
 						for (PropertySource<?> nested : composite.getSource()) {
-							propertySources.addLast(nested);
+							propertySources.addAfter(name, nested);
+							name = nested.getName();
 						}
 					}
 					else {
-						propertySources.addLast(propertySource);
+						propertySources.addAfter(name, propertySource);
 					}
 				}
+				propertySources.remove(ConfigurationPropertySources.NAME);
 			}
 		}
 

spring-boot/src/test/java/org/springframework/boot/bind/PropertySourcesBindingTests.java

@@ -53,13 +53,23 @@ public class PropertySourcesBindingTests {
 	private Wrapper properties;
 
 	@Test
-	public void overridingOfPropertiesWorksAsExpected() {
+	public void overridingOfPropertiesOrderOfAtPropertySources() {
+		assertThat(this.properties.getBar(), is("override"));
+	}
+
+	@Test
+	public void overridingOfPropertiesAndBindToAtValue() {
 		assertThat(this.foo, is(this.properties.getFoo()));
 	}
 
+	@Test
+	public void overridingOfPropertiesOrderOfApplicationProperties() {
+		assertThat(this.properties.getFoo(), is("bucket"));
+	}
+
 	@Import({ SomeConfig.class })
-	@PropertySources({ @PropertySource("classpath:/override.properties"),
-			@PropertySource("classpath:/some.properties") })
+	@PropertySources({ @PropertySource("classpath:/some.properties"),
+			@PropertySource("classpath:/override.properties") })
 	@Configuration
 	@EnableConfigurationProperties(Wrapper.class)
 	public static class TestConfig {
@@ -81,6 +91,16 @@ public class PropertySourcesBindingTests {
 	public static class Wrapper {
 		private String foo;
 
+		private String bar;
+
+		public String getBar() {
+			return this.bar;
+		}
+
+		public void setBar(String bar) {
+			this.bar = bar;
+		}
+
 		public String getFoo() {
 			return this.foo;
 		}

spring-boot/src/test/resources/enableprofile-myprofile.properties

 my.property=fromprofilepropertiesfile
+the.property=fromprofilepropertiesfile
\ No newline at end of file

spring-boot/src/test/resources/enableprofile.properties

 spring.profiles.active=myprofile
 my.property=frompropertiesfile
+the.property=frompropertiesfile
 one.more=${my.property}

spring-boot/src/test/resources/moreproperties.properties

 my.property=frommorepropertiesfile
+the.property=frommorepropertiesfile
\ No newline at end of file

spring-boot/src/test/resources/override.properties

 foo=bar
+bar=override

spring-boot/src/test/resources/some.properties

 foo=spam
+bar=some
\ No newline at end of file

spring-boot/src/test/resources/specificlocation.properties

 my.property=fromspecificlocation
+the.property=fromspecificlocation
\ No newline at end of file

spring-boot/src/test/resources/testproperties.properties

 my.property=frompropertiesfile
+the.property=frompropertiesfile