Commit dac7d9c1 authored by Stephane Nicoll's avatar Stephane Nicoll

Rename AutoConfigurationReportLoggingInitializer to ConditionEvaluationReportLoggingListener

Closes gh-2945
parent 26158c1e
...@@ -45,7 +45,7 @@ import org.springframework.core.ResolvableType; ...@@ -45,7 +45,7 @@ import org.springframework.core.ResolvableType;
* @author Phillip Webb * @author Phillip Webb
* @author Andy Wilkinson * @author Andy Wilkinson
*/ */
public class AutoConfigurationReportLoggingInitializer public class ConditionEvaluationReportLoggingListener
implements ApplicationContextInitializer<ConfigurableApplicationContext> { implements ApplicationContextInitializer<ConfigurableApplicationContext> {
private final Log logger = LogFactory.getLog(getClass()); private final Log logger = LogFactory.getLog(getClass());
...@@ -57,7 +57,7 @@ public class AutoConfigurationReportLoggingInitializer ...@@ -57,7 +57,7 @@ public class AutoConfigurationReportLoggingInitializer
@Override @Override
public void initialize(ConfigurableApplicationContext applicationContext) { public void initialize(ConfigurableApplicationContext applicationContext) {
this.applicationContext = applicationContext; this.applicationContext = applicationContext;
applicationContext.addApplicationListener(new AutoConfigurationReportListener()); applicationContext.addApplicationListener(new ConditionEvaluationReportListener());
if (applicationContext instanceof GenericApplicationContext) { if (applicationContext instanceof GenericApplicationContext) {
// Get the report early in case the context fails to load // Get the report early in case the context fails to load
this.report = ConditionEvaluationReport this.report = ConditionEvaluationReport
...@@ -66,7 +66,7 @@ public class AutoConfigurationReportLoggingInitializer ...@@ -66,7 +66,7 @@ public class AutoConfigurationReportLoggingInitializer
} }
protected void onApplicationEvent(ApplicationEvent event) { protected void onApplicationEvent(ApplicationEvent event) {
ConfigurableApplicationContext initializerApplicationContext = AutoConfigurationReportLoggingInitializer.this.applicationContext; ConfigurableApplicationContext initializerApplicationContext = this.applicationContext;
if (event instanceof ContextRefreshedEvent) { if (event instanceof ContextRefreshedEvent) {
if (((ApplicationContextEvent) event) if (((ApplicationContextEvent) event)
.getApplicationContext() == initializerApplicationContext) { .getApplicationContext() == initializerApplicationContext) {
...@@ -109,7 +109,8 @@ public class AutoConfigurationReportLoggingInitializer ...@@ -109,7 +109,8 @@ public class AutoConfigurationReportLoggingInitializer
} }
} }
private class AutoConfigurationReportListener implements GenericApplicationListener { private class ConditionEvaluationReportListener
implements GenericApplicationListener {
@Override @Override
public int getOrder() { public int getOrder() {
...@@ -133,7 +134,7 @@ public class AutoConfigurationReportLoggingInitializer ...@@ -133,7 +134,7 @@ public class AutoConfigurationReportLoggingInitializer
@Override @Override
public void onApplicationEvent(ApplicationEvent event) { public void onApplicationEvent(ApplicationEvent event) {
AutoConfigurationReportLoggingInitializer.this.onApplicationEvent(event); ConditionEvaluationReportLoggingListener.this.onApplicationEvent(event);
} }
} }
......
# Initializers # Initializers
org.springframework.context.ApplicationContextInitializer=\ org.springframework.context.ApplicationContextInitializer=\
org.springframework.boot.autoconfigure.SharedMetadataReaderFactoryContextInitializer,\ org.springframework.boot.autoconfigure.SharedMetadataReaderFactoryContextInitializer,\
org.springframework.boot.autoconfigure.logging.AutoConfigurationReportLoggingInitializer org.springframework.boot.autoconfigure.logging.ConditionEvaluationReportLoggingListener
# Application Listeners # Application Listeners
org.springframework.context.ApplicationListener=\ org.springframework.context.ApplicationListener=\
......
...@@ -44,17 +44,17 @@ import static org.assertj.core.api.Assertions.assertThat; ...@@ -44,17 +44,17 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
/** /**
* Tests for {@link AutoConfigurationReportLoggingInitializer}. * Tests for {@link ConditionEvaluationReportLoggingListener}.
* *
* @author Phillip Webb * @author Phillip Webb
* @author Andy Wilkinson * @author Andy Wilkinson
*/ */
public class AutoConfigurationReportLoggingInitializerTests { public class ConditionEvaluationReportLoggingListenerTests {
@Rule @Rule
public OutputCapture outputCapture = new OutputCapture(); public OutputCapture outputCapture = new OutputCapture();
private AutoConfigurationReportLoggingInitializer initializer = new AutoConfigurationReportLoggingInitializer(); private ConditionEvaluationReportLoggingListener initializer = new ConditionEvaluationReportLoggingListener();
@Test @Test
public void logsDebugOnContextRefresh() { public void logsDebugOnContextRefresh() {
...@@ -120,7 +120,7 @@ public class AutoConfigurationReportLoggingInitializerTests { ...@@ -120,7 +120,7 @@ public class AutoConfigurationReportLoggingInitializerTests {
public void canBeUsedInApplicationContext() throws Exception { public void canBeUsedInApplicationContext() throws Exception {
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(); AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
context.register(Config.class); context.register(Config.class);
new AutoConfigurationReportLoggingInitializer().initialize(context); new ConditionEvaluationReportLoggingListener().initialize(context);
context.refresh(); context.refresh();
assertThat(context.getBean(ConditionEvaluationReport.class)).isNotNull(); assertThat(context.getBean(ConditionEvaluationReport.class)).isNotNull();
} }
...@@ -130,7 +130,7 @@ public class AutoConfigurationReportLoggingInitializerTests { ...@@ -130,7 +130,7 @@ public class AutoConfigurationReportLoggingInitializerTests {
AnnotationConfigWebApplicationContext context = new AnnotationConfigWebApplicationContext(); AnnotationConfigWebApplicationContext context = new AnnotationConfigWebApplicationContext();
context.setServletContext(new MockServletContext()); context.setServletContext(new MockServletContext());
context.register(Config.class); context.register(Config.class);
new AutoConfigurationReportLoggingInitializer().initialize(context); new ConditionEvaluationReportLoggingListener().initialize(context);
context.refresh(); context.refresh();
assertThat(context.getBean(ConditionEvaluationReport.class)).isNotNull(); assertThat(context.getBean(ConditionEvaluationReport.class)).isNotNull();
} }
...@@ -148,7 +148,7 @@ public class AutoConfigurationReportLoggingInitializerTests { ...@@ -148,7 +148,7 @@ public class AutoConfigurationReportLoggingInitializerTests {
LoggerContext context = (LoggerContext) StaticLoggerBinder.getSingleton() LoggerContext context = (LoggerContext) StaticLoggerBinder.getSingleton()
.getLoggerFactory(); .getLoggerFactory();
Logger logger = context Logger logger = context
.getLogger(AutoConfigurationReportLoggingInitializer.class); .getLogger(ConditionEvaluationReportLoggingListener.class);
Level currentLevel = logger.getLevel(); Level currentLevel = logger.getLevel();
logger.setLevel(Level.DEBUG); logger.setLevel(Level.DEBUG);
try { try {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment