ApplicationContextInitializers now listen for ContextRefreshedEvent

The AutoConfigurationReportLoggingInitializer wasn't working in
non-GenericApplicationContext becasue teh BeanFatcory wasn't available
for registering its listener during initialization. Instead of
relying on that rather fragile state I decided to give any
ApplicationContextInitializer that was itself an ApplicationListener
an explicit callback with a ContextRefreshedEvent, and move that
interface up a level in the logging initializer. Works much better.

spring-boot/src/main/java/org/springframework/boot/SpringApplication.java

@@ -36,12 +36,16 @@ import org.springframework.beans.factory.support.BeanNameGenerator;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextInitializer;
+import org.springframework.context.ApplicationListener;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.EnvironmentAware;
 import org.springframework.context.annotation.AnnotatedBeanDefinitionReader;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigUtils;
 import org.springframework.context.annotation.ClassPathBeanDefinitionScanner;
+import org.springframework.context.event.ApplicationEventMulticaster;
+import org.springframework.context.event.ContextRefreshedEvent;
+import org.springframework.context.event.SimpleApplicationEventMulticaster;
 import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.core.GenericTypeResolver;
@@ -298,7 +302,7 @@ public class SpringApplication {
 						getApplicationLog(), stopWatch);
 			}
 
-			runCommandLineRunners(context, args);
+			afterRefresh(context, args);
 			return context;
 		}
 		catch (RuntimeException ex) {
@@ -312,6 +316,19 @@ public class SpringApplication {
 
 	}
 
+	private void afterRefresh(ConfigurableApplicationContext context, String[] args) {
+		ApplicationEventMulticaster multicaster = new SimpleApplicationEventMulticaster();
+		List<ApplicationContextInitializer<?>> initializers = new ArrayList<ApplicationContextInitializer<?>>(
+				getInitializers());
+		for (ApplicationContextInitializer<?> initializer : initializers) {
+			if (initializer instanceof ApplicationListener) {
+				multicaster.addApplicationListener((ApplicationListener<?>) initializer);
+			}
+		}
+		multicaster.multicastEvent(new ContextRefreshedEvent(context));
+		runCommandLineRunners(context, args);
+	}
+
 	private void handleError(ConfigurableApplicationContext context, String[] args,
 			Throwable exception) {
 		List<ApplicationContextInitializer<?>> initializers = new ArrayList<ApplicationContextInitializer<?>>(

spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java

@@ -33,11 +33,13 @@ import org.springframework.boot.context.embedded.jetty.JettyEmbeddedServletConta
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.ApplicationContextInitializer;
+import org.springframework.context.ApplicationListener;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigUtils;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.context.support.StaticApplicationContext;
 import org.springframework.core.Ordered;
 import org.springframework.core.env.CommandLinePropertySource;
@@ -156,6 +158,30 @@ public class SpringApplicationTests {
 		assertThat(getEnvironment().getProperty("foo"), equalTo("bar"));
 	}
 
+	@Test
+	public void contextRefreshedEventListener() throws Exception {
+		SpringApplication application = new SpringApplication(ExampleConfig.class);
+		application.setWebEnvironment(false);
+		final AtomicReference<ApplicationContext> reference = new AtomicReference<ApplicationContext>();
+		class InitalizerListener implements
+				ApplicationContextInitializer<ConfigurableApplicationContext>,
+				ApplicationListener<ContextRefreshedEvent> {
+			@Override
+			public void onApplicationEvent(ContextRefreshedEvent event) {
+				reference.set(event.getApplicationContext());
+			}
+
+			@Override
+			public void initialize(ConfigurableApplicationContext applicationContext) {
+			}
+		}
+		application.setInitializers(Arrays.asList(new InitalizerListener()));
+		this.context = application.run("--foo=bar");
+		assertThat(this.context, sameInstance(reference.get()));
+		// Custom initializers do not switch off the defaults
+		assertThat(getEnvironment().getProperty("foo"), equalTo("bar"));
+	}
+
 	@Test
 	public void defaultApplicationContext() throws Exception {
 		SpringApplication application = new SpringApplication(ExampleConfig.class);