Refactor PropertySource support

Locate PropertySourcesLoaders using SpringFactoriesLoader and refactor
the interface to expose file extensions and support 'profiles' within
documents.

Rework ConfigFileApplicationListener for consistent profile loading.
Profiles are now loaded in a consistent order for both profile specific
files, and contained profile documents (i.e. YAML sub-sections).

Also update ConfigFileApplicationListener so that it no longer directly
processes @ProperySource annotations. Instead the standard Spring
ConfigurationClassPostProcessor will insert @propertysource items with
ConfigFileApplicationListener later re-ordering them.

The SpringApplication can no longer be configured using @ProperySource
annotations, however, application.properties may still be used.

Fixes spring-projectsgh-322

Author: Phillip Webb

spring-boot/src/main/java/org/springframework/boot/cloudfoundry/VcapApplicationListener.java

@@ -98,7 +98,7 @@ public class VcapApplicationListener implements
 	private static final String VCAP_SERVICES = "VCAP_SERVICES";
 
 	// Before ConfigFileApplicationListener so values there can use these ones
-	private int order = ConfigFileApplicationListener.DEFAULT_CONFIG_LISTENER_ORDER - 1;;
+	private int order = ConfigFileApplicationListener.DEFAULT_ORDER - 1;;
 
 	private final JsonParser parser = JsonParserFactory.getJsonParser();
 

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

@@ -0,0 +1,61 @@
+/*
+ * Copyright 2012-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.config;
+
+import java.util.Random;
+
+import org.springframework.core.env.ConfigurableEnvironment;
+import org.springframework.core.env.PropertySource;
+import org.springframework.core.env.StandardEnvironment;
+import org.springframework.util.DigestUtils;
+
+/**
+ * {@link PropertySource} that returns a random value for any property that starts with
+ * {@literal "random."}. Return a {@code byte[]} unless the property name ends with
+ * {@literal ".int} or {@literal ".long"}.
+ * 
+ * @author Dave Syer
+ */
+public class RandomValuePropertySource extends PropertySource<Random> {
+
+	public RandomValuePropertySource(String name) {
+		super(name, new Random());
+	}
+
+	@Override
+	public Object getProperty(String name) {
+		if (!name.startsWith("random.")) {
+			return null;
+		}
+		if (name.endsWith("int")) {
+			return getSource().nextInt();
+		}
+		if (name.endsWith("long")) {
+			return getSource().nextLong();
+		}
+		byte[] bytes = new byte[32];
+		getSource().nextBytes(bytes);
+		return DigestUtils.md5DigestAsHex(bytes);
+	}
+
+	public static void addToEnvironment(ConfigurableEnvironment environment) {
+		environment.getPropertySources().addAfter(
+				StandardEnvironment.SYSTEM_ENVIRONMENT_PROPERTY_SOURCE_NAME,
+				new RandomValuePropertySource("random"));
+	}
+
+}

spring-boot/src/main/java/org/springframework/boot/config/DefaultPropertySourceLoadersFactory.java

@@ -16,6 +16,8 @@
 
 package org.springframework.boot.context.properties;
 
+import java.io.IOException;
+
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.BeanFactory;
@@ -26,9 +28,7 @@
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.boot.bind.PropertiesConfigurationFactory;
-import org.springframework.boot.config.PropertiesPropertySourceLoader;
-import org.springframework.boot.config.PropertySourceLoader;
-import org.springframework.boot.config.YamlPropertySourceLoader;
+import org.springframework.boot.env.PropertySourcesLoader;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.ConfigurableApplicationContext;
@@ -332,26 +332,22 @@ private Validator determineValidator(Object bean) {
 		return this.validator;
 	}
 
-	private PropertySources loadPropertySources(String[] path) {
-		MutablePropertySources propertySources = new MutablePropertySources();
-		PropertySourceLoader[] loaders = {
-				new PropertiesPropertySourceLoader(),
-				YamlPropertySourceLoader.springProfileAwareLoader(this.environment
-						.getActiveProfiles()) };
-		for (String location : path) {
-			location = this.environment.resolvePlaceholders(location);
-			Resource resource = this.resourceLoader.getResource(location);
-			if (resource != null && resource.exists()) {
-				for (PropertySourceLoader loader : loaders) {
-					if (loader.supports(resource)) {
-						PropertySource<?> propertySource = loader.load(
-								resource.getDescription(), resource);
-						propertySources.addFirst(propertySource);
-					}
+	private PropertySources loadPropertySources(String[] locations) {
+		try {
+			PropertySourcesLoader loader = new PropertySourcesLoader();
+			for (String location : locations) {
+				Resource resource = this.resourceLoader.getResource(this.environment
+						.resolvePlaceholders(location));
+				for (String profile : this.environment.getActiveProfiles()) {
+					loader.load(resource, null, profile);
 				}
+				loader.load(resource, null, null);
 			}
+			return loader.getPropertySources();
+		}
+		catch (IOException ex) {
+			throw new IllegalStateException(ex);
 		}
-		return propertySources;
 	}
 
 	private ConversionService getDefaultConversionService() {