Doesn't use SpringApplication to load bootstrap

Author: spencergibb

spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/BootstrapEnvironmentPostProcessor.java

@@ -22,17 +22,21 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.springframework.boot.Banner;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.WebApplicationType;
-import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.context.config.ConfigFileApplicationListener;
 import org.springframework.boot.env.EnvironmentPostProcessor;
 import org.springframework.boot.env.OriginTrackedMapPropertySource;
 import org.springframework.boot.origin.Origin;
 import org.springframework.boot.origin.OriginLookup;
 import org.springframework.cloud.bootstrap.support.OriginTrackedCompositePropertySource;
 import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.Lifecycle;
+import org.springframework.context.annotation.AnnotatedBeanDefinitionReader;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.support.StaticApplicationContext;
 import org.springframework.core.env.CompositePropertySource;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.MapPropertySource;
@@ -43,10 +47,12 @@
 import org.springframework.util.StringUtils;
 
 public class BootstrapEnvironmentPostProcessor implements EnvironmentPostProcessor {
+
 	/**
 	 * Property source name for bootstrap.
 	 */
 	public static final String BOOTSTRAP_PROPERTY_SOURCE_NAME = "bootstrap";
+
 	/**
 	 * The name of the default properties.
 	 */
@@ -105,6 +111,7 @@ private ConfigurableApplicationContext bootstrapServiceContext(
 			bootstrapProperties.addLast(source);
 		}
 		// TODO: is it possible or sensible to share a ResourceLoader?
+		/*
 		SpringApplicationBuilder builder = new SpringApplicationBuilder()
 				.profiles(environment.getActiveProfiles()).bannerMode(Banner.Mode.OFF)
 				.environment(bootstrapEnvironment)
@@ -132,6 +139,18 @@ private ConfigurableApplicationContext bootstrapServiceContext(
 		}
 		builder.sources(BootstrapImportSelectorConfiguration.class);
 		final ConfigurableApplicationContext context = builder.run();
+		 */
+
+		final StaticApplicationContext context = new StaticApplicationContext();
+		AnnotatedBeanDefinitionReader annotatedReader = new AnnotatedBeanDefinitionReader(
+				context);
+		annotatedReader.setEnvironment(bootstrapEnvironment);
+		annotatedReader.register(BootstrapImportSelectorConfiguration.class,
+				BootstrapConfigFileConfiguration.class);
+		context.setEnvironment(bootstrapEnvironment);
+
+		context.refresh();
+
 		// gh-214 using spring.application.name=bootstrap to set the context id via
 		// `ContextIdApplicationContextInitializer` prevents apps from getting the actual
 		// spring.application.name
@@ -203,6 +222,58 @@ private void addOrReplace(MutablePropertySources environment,
 		}
 	}
 
+	@Configuration(proxyBeanMethods = false)
+	private static class BootstrapConfigFileConfiguration {
+
+		@Bean
+		public BootstrapConfigFileLoader bootstrapConfigFileLoader(
+				ConfigurableEnvironment env) {
+			return new BootstrapConfigFileLoader(env);
+		}
+
+	}
+
+	private static class BootstrapConfigFileLoader implements Lifecycle {
+
+		private final AtomicBoolean started = new AtomicBoolean();
+
+		private final ConfigurableEnvironment environment;
+
+		BootstrapConfigFileLoader(ConfigurableEnvironment environment) {
+			this.environment = environment;
+			ConfigFileApplicationListener listener = new ConfigFileApplicationListener();
+			listener.postProcessEnvironment(this.environment, new BootstrapApplication());
+		}
+
+		@Override
+		public void start() {
+			if (started.compareAndSet(false, true)) {
+				ConfigFileApplicationListener listener = new ConfigFileApplicationListener();
+				listener.postProcessEnvironment(this.environment,
+						new BootstrapApplication());
+			}
+		}
+
+		@Override
+		public void stop() {
+			started.compareAndSet(true, false);
+		}
+
+		@Override
+		public boolean isRunning() {
+			return started.get();
+		}
+
+	}
+
+	private static class BootstrapApplication extends SpringApplication {
+
+		BootstrapApplication() {
+			// setResourceLoader(new DefaultResourceLoader(getClassLoader()));
+		}
+
+	}
+
 	private static class ExtendedDefaultPropertySource
 			extends SystemEnvironmentPropertySource implements OriginLookup<String> {
 

spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapEnvironmentPostProcessorIntegrationTests.java

@@ -29,12 +29,14 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.MapPropertySource;
+import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 // see https://github.com/spring-cloud/spring-cloud-commons/issues/476
 @RunWith(SpringRunner.class)
+@ActiveProfiles("epptests")
 @SpringBootTest
 public class BootstrapEnvironmentPostProcessorIntegrationTests {
 
@@ -53,6 +55,8 @@ public void conditionalValuesFromMapProperySourceCreatedByEPPExist() {
 		assertThat(this.env.getProperty("conditional.property"))
 				.as("Environment has wrong value for conditional.property")
 				.isEqualTo("conditional.value");
+		assertThat(this.env.getProperty("info.name"))
+				.isEqualTo("from bootstrap-epptests");
 	}
 
 	@EnableAutoConfiguration

spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/BootstrapEnvironmentPostProcessorTests.java

@@ -19,13 +19,11 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringBootConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.ApplicationContext;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -46,7 +44,8 @@ public class BootstrapEnvironmentPostProcessorTests {
 	@Test
 	public void contextLoads() {
 		// from bootstrap.properties
-		assertThat(env.getProperty("test.property")).isEqualTo("from bootstrap.properties");
+		assertThat(env.getProperty("test.property"))
+				.isEqualTo("from bootstrap.properties");
 
 		try {
 			assertThat(context.getBean("foo-during-bootstrap"));

spring-cloud-context/src/test/resources/bootstrap-epptests.properties

@@ -0,0 +1 @@
+info.name=from bootstrap-epptests

spring-cloud-context/src/test/resources/bootstrap.properties

@@ -1,4 +1,5 @@
 spring.main.sources:org.springframework.cloud.bootstrap.config.BootstrapConfigurationTests.PropertySourceConfiguration,org.springframework.cloud.bootstrap.config.BootstrapConfigurationTests.CompositePropertySourceConfiguration
 info.name:child
 info.desc: defaultPropertiesInfoDesc
-test.property: from bootstrap.properties
+test.property: from bootstrap.properties
+