Fixes #101: Moved existing RefreshEndpoint logic to a new RefreshSupport class.

spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshAutoConfiguration.java

@@ -22,8 +22,10 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration;
 import org.springframework.cloud.context.environment.EnvironmentManager;
+import org.springframework.cloud.context.refresh.ContextRefresher;
 import org.springframework.cloud.context.scope.refresh.RefreshScope;
 import org.springframework.cloud.logging.LoggingRebinder;
+import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.ConfigurableEnvironment;
@@ -33,7 +35,7 @@
  * the Environment (e.g. rebinding logger levels).
  *
  * @author Dave Syer
- *
+ * @author Venil Noronha
  */
 @Configuration
 @ConditionalOnClass(RefreshScope.class)
@@ -58,4 +60,11 @@ public EnvironmentManager environmentManager(ConfigurableEnvironment environment
 		return new EnvironmentManager(environment);
 	}
 
+	@Bean
+	@ConditionalOnMissingBean
+	public ContextRefresher contextRefresher(ConfigurableApplicationContext context,
+			RefreshScope scope) {
+		return new ContextRefresher(context, scope);
+	}
+
 }

spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshEndpointAutoConfiguration.java

@@ -35,18 +35,22 @@
 import org.springframework.cloud.bootstrap.config.PropertySourceBootstrapConfiguration;
 import org.springframework.cloud.context.environment.EnvironmentChangeEvent;
 import org.springframework.cloud.context.properties.ConfigurationPropertiesRebinder;
+import org.springframework.cloud.context.refresh.ContextRefresher;
 import org.springframework.cloud.context.restart.RestartEndpoint;
 import org.springframework.cloud.context.scope.refresh.RefreshScope;
 import org.springframework.cloud.endpoint.RefreshEndpoint;
 import org.springframework.cloud.endpoint.event.RefreshEventListener;
 import org.springframework.cloud.health.RefreshScopeHealthIndicator;
 import org.springframework.context.ApplicationListener;
-import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.integration.monitor.IntegrationMBeanExporter;
 
+/**
+ * 
+ * @author Venil Noronha
+ */
 @Configuration
 @ConditionalOnClass(Endpoint.class)
 @AutoConfigureAfter(EndpointAutoConfiguration.class)
@@ -112,9 +116,8 @@ protected static class RefreshEndpointConfiguration {
 
 		@Bean
 		@ConditionalOnMissingBean
-		public RefreshEndpoint refreshEndpoint(ConfigurableApplicationContext context,
-				RefreshScope scope) {
-			RefreshEndpoint endpoint = new RefreshEndpoint(context, scope);
+		public RefreshEndpoint refreshEndpoint(ContextRefresher contextRefresher) {
+			RefreshEndpoint endpoint = new RefreshEndpoint(contextRefresher);
 			return endpoint;
 		}
 

spring-cloud-context/src/main/java/org/springframework/cloud/context/refresh/ContextRefresher.java

@@ -0,0 +1,206 @@
+package org.springframework.cloud.context.refresh;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.springframework.boot.Banner.Mode;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.cloud.context.environment.EnvironmentChangeEvent;
+import org.springframework.cloud.context.scope.refresh.RefreshScope;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.env.CompositePropertySource;
+import org.springframework.core.env.ConfigurableEnvironment;
+import org.springframework.core.env.EnumerablePropertySource;
+import org.springframework.core.env.MapPropertySource;
+import org.springframework.core.env.MutablePropertySources;
+import org.springframework.core.env.PropertySource;
+import org.springframework.core.env.StandardEnvironment;
+import org.springframework.web.context.support.StandardServletEnvironment;
+
+/**
+ * 
+ * @author Venil Noronha
+ */
+public class ContextRefresher {
+
+	private static final String REFRESH_ARGS_PROPERTY_SOURCE = "refreshArgs";
+
+	private Set<String> standardSources = new HashSet<String>(
+			Arrays.asList(StandardEnvironment.SYSTEM_PROPERTIES_PROPERTY_SOURCE_NAME,
+					StandardEnvironment.SYSTEM_ENVIRONMENT_PROPERTY_SOURCE_NAME,
+					StandardServletEnvironment.JNDI_PROPERTY_SOURCE_NAME,
+					StandardServletEnvironment.SERVLET_CONFIG_PROPERTY_SOURCE_NAME,
+					StandardServletEnvironment.SERVLET_CONTEXT_PROPERTY_SOURCE_NAME));
+
+	private ConfigurableApplicationContext context;
+	private RefreshScope scope;
+
+	public ContextRefresher(ConfigurableApplicationContext context, RefreshScope scope) {
+		this.context = context;
+		this.scope = scope;
+	}
+
+	public synchronized Set<String> refresh() {
+		Map<String, Object> before = extract(
+				this.context.getEnvironment().getPropertySources());
+		addConfigFilesToEnvironment();
+		Set<String> keys = changes(before,
+				extract(this.context.getEnvironment().getPropertySources())).keySet();
+		this.context.publishEvent(new EnvironmentChangeEvent(keys));
+		this.scope.refreshAll();
+		return keys;
+	}
+
+	private void addConfigFilesToEnvironment() {
+		ConfigurableApplicationContext capture = null;
+		try {
+			StandardEnvironment environment = copyEnvironment(
+					this.context.getEnvironment());
+			capture = new SpringApplicationBuilder(Empty.class).bannerMode(Mode.OFF)
+					.web(false).environment(environment).run();
+			if (environment.getPropertySources().contains(REFRESH_ARGS_PROPERTY_SOURCE)) {
+				environment.getPropertySources().remove(REFRESH_ARGS_PROPERTY_SOURCE);
+			}
+			MutablePropertySources target = this.context.getEnvironment()
+					.getPropertySources();
+			String targetName = null;
+			for (PropertySource<?> source : environment.getPropertySources()) {
+				String name = source.getName();
+				if (target.contains(name)) {
+					targetName = name;
+				}
+				if (!this.standardSources.contains(name)) {
+					if (target.contains(name)) {
+						target.replace(name, source);
+					}
+					else {
+						if (targetName != null) {
+							target.addAfter(targetName, source);
+						}
+						else {
+							if (target.contains("defaultProperties")) {
+								target.addBefore("defaultProperties", source);
+							}
+							else {
+								target.addLast(source);
+							}
+						}
+					}
+				}
+			}
+		}
+		finally {
+			ConfigurableApplicationContext closeable = capture;
+			while (closeable != null) {
+				closeable.close();
+				ApplicationContext parent = closeable.getParent();
+				if (parent instanceof ConfigurableApplicationContext) {
+					closeable = (ConfigurableApplicationContext) parent;
+				}
+				else {
+					closeable = null;
+				}
+			}
+		}
+	}
+
+	// Don't use ConfigurableEnvironment.merge() in case there are clashes with property
+	// source names
+	private StandardEnvironment copyEnvironment(ConfigurableEnvironment input) {
+		StandardEnvironment environment = new StandardEnvironment();
+		MutablePropertySources capturedPropertySources = environment.getPropertySources();
+		for (PropertySource<?> source : capturedPropertySources) {
+			capturedPropertySources.remove(source.getName());
+		}
+		for (PropertySource<?> source : input.getPropertySources()) {
+			capturedPropertySources.addLast(source);
+		}
+		environment.setActiveProfiles(input.getActiveProfiles());
+		environment.setDefaultProfiles(input.getDefaultProfiles());
+		Map<String, Object> map = new HashMap<String, Object>();
+		map.put("spring.jmx.enabled", false);
+		map.put("spring.main.sources", "");
+		capturedPropertySources
+		.addFirst(new MapPropertySource(REFRESH_ARGS_PROPERTY_SOURCE, map));
+		return environment;
+	}
+
+	private Map<String, Object> changes(Map<String, Object> before,
+			Map<String, Object> after) {
+		Map<String, Object> result = new HashMap<String, Object>();
+		for (String key : before.keySet()) {
+			if (!after.containsKey(key)) {
+				result.put(key, null);
+			}
+			else if (!equal(before.get(key), after.get(key))) {
+				result.put(key, after.get(key));
+			}
+		}
+		for (String key : after.keySet()) {
+			if (!before.containsKey(key)) {
+				result.put(key, after.get(key));
+			}
+		}
+		return result;
+	}
+
+	private boolean equal(Object one, Object two) {
+		if (one == null && two == null) {
+			return true;
+		}
+		if (one == null || two == null) {
+			return false;
+		}
+		return one.equals(two);
+	}
+
+	private Map<String, Object> extract(MutablePropertySources propertySources) {
+		Map<String, Object> result = new HashMap<String, Object>();
+		List<PropertySource<?>> sources = new ArrayList<PropertySource<?>>();
+		for (PropertySource<?> source : propertySources) {
+			sources.add(0, source);
+		}
+		for (PropertySource<?> source : sources) {
+			if (!this.standardSources.contains(source.getName())) {
+				extract(source, result);
+			}
+		}
+		return result;
+	}
+
+	private void extract(PropertySource<?> parent, Map<String, Object> result) {
+		if (parent instanceof CompositePropertySource) {
+			try {
+				List<PropertySource<?>> sources = new ArrayList<PropertySource<?>>();
+				for (PropertySource<?> source : ((CompositePropertySource) parent)
+						.getPropertySources()) {
+					sources.add(0, source);
+				}
+				for (PropertySource<?> source : sources) {
+					extract(source, result);
+				}
+			}
+			catch (Exception e) {
+				return;
+			}
+		}
+		else if (parent instanceof EnumerablePropertySource) {
+			for (String key : ((EnumerablePropertySource<?>) parent).getPropertyNames()) {
+				result.put(key, parent.getProperty(key));
+			}
+		}
+	}
+
+	@Configuration
+	protected static class Empty {
+
+	}
+
+}