From dac7d9c17449b286d31b04dba8385ee484552b53 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 10 Nov 2017 16:20:13 +0100 Subject: [PATCH] Rename AutoConfigurationReportLoggingInitializer to ConditionEvaluationReportLoggingListener Closes gh-2945 --- ...=> ConditionEvaluationReportLoggingListener.java} | 11 ++++++----- .../src/main/resources/META-INF/spring.factories | 2 +- ...nditionEvaluationReportLoggingListenerTests.java} | 12 ++++++------ 3 files changed, 13 insertions(+), 12 deletions(-) rename spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/logging/{AutoConfigurationReportLoggingInitializer.java => ConditionEvaluationReportLoggingListener.java} (92%) rename spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/logging/{AutoConfigurationReportLoggingInitializerTests.java => ConditionEvaluationReportLoggingListenerTests.java} (93%) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/logging/AutoConfigurationReportLoggingInitializer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/logging/ConditionEvaluationReportLoggingListener.java similarity index 92% rename from spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/logging/AutoConfigurationReportLoggingInitializer.java rename to spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/logging/ConditionEvaluationReportLoggingListener.java index e4b671df2c..a014a6a8b7 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/logging/AutoConfigurationReportLoggingInitializer.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/logging/ConditionEvaluationReportLoggingListener.java @@ -45,7 +45,7 @@ import org.springframework.core.ResolvableType; * @author Phillip Webb * @author Andy Wilkinson */ -public class AutoConfigurationReportLoggingInitializer +public class ConditionEvaluationReportLoggingListener implements ApplicationContextInitializer { private final Log logger = LogFactory.getLog(getClass()); @@ -57,7 +57,7 @@ public class AutoConfigurationReportLoggingInitializer @Override public void initialize(ConfigurableApplicationContext applicationContext) { this.applicationContext = applicationContext; - applicationContext.addApplicationListener(new AutoConfigurationReportListener()); + applicationContext.addApplicationListener(new ConditionEvaluationReportListener()); if (applicationContext instanceof GenericApplicationContext) { // Get the report early in case the context fails to load this.report = ConditionEvaluationReport @@ -66,7 +66,7 @@ public class AutoConfigurationReportLoggingInitializer } protected void onApplicationEvent(ApplicationEvent event) { - ConfigurableApplicationContext initializerApplicationContext = AutoConfigurationReportLoggingInitializer.this.applicationContext; + ConfigurableApplicationContext initializerApplicationContext = this.applicationContext; if (event instanceof ContextRefreshedEvent) { if (((ApplicationContextEvent) event) .getApplicationContext() == initializerApplicationContext) { @@ -109,7 +109,8 @@ public class AutoConfigurationReportLoggingInitializer } } - private class AutoConfigurationReportListener implements GenericApplicationListener { + private class ConditionEvaluationReportListener + implements GenericApplicationListener { @Override public int getOrder() { @@ -133,7 +134,7 @@ public class AutoConfigurationReportLoggingInitializer @Override public void onApplicationEvent(ApplicationEvent event) { - AutoConfigurationReportLoggingInitializer.this.onApplicationEvent(event); + ConditionEvaluationReportLoggingListener.this.onApplicationEvent(event); } } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories b/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories index 1675ecbc67..0afb614c7b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories @@ -1,7 +1,7 @@ # Initializers org.springframework.context.ApplicationContextInitializer=\ org.springframework.boot.autoconfigure.SharedMetadataReaderFactoryContextInitializer,\ -org.springframework.boot.autoconfigure.logging.AutoConfigurationReportLoggingInitializer +org.springframework.boot.autoconfigure.logging.ConditionEvaluationReportLoggingListener # Application Listeners org.springframework.context.ApplicationListener=\ diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/logging/AutoConfigurationReportLoggingInitializerTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/logging/ConditionEvaluationReportLoggingListenerTests.java similarity index 93% rename from spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/logging/AutoConfigurationReportLoggingInitializerTests.java rename to spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/logging/ConditionEvaluationReportLoggingListenerTests.java index 9f80fbb671..14cab16ab5 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/logging/AutoConfigurationReportLoggingInitializerTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/logging/ConditionEvaluationReportLoggingListenerTests.java @@ -44,17 +44,17 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.fail; /** - * Tests for {@link AutoConfigurationReportLoggingInitializer}. + * Tests for {@link ConditionEvaluationReportLoggingListener}. * * @author Phillip Webb * @author Andy Wilkinson */ -public class AutoConfigurationReportLoggingInitializerTests { +public class ConditionEvaluationReportLoggingListenerTests { @Rule public OutputCapture outputCapture = new OutputCapture(); - private AutoConfigurationReportLoggingInitializer initializer = new AutoConfigurationReportLoggingInitializer(); + private ConditionEvaluationReportLoggingListener initializer = new ConditionEvaluationReportLoggingListener(); @Test public void logsDebugOnContextRefresh() { @@ -120,7 +120,7 @@ public class AutoConfigurationReportLoggingInitializerTests { public void canBeUsedInApplicationContext() throws Exception { AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(); context.register(Config.class); - new AutoConfigurationReportLoggingInitializer().initialize(context); + new ConditionEvaluationReportLoggingListener().initialize(context); context.refresh(); assertThat(context.getBean(ConditionEvaluationReport.class)).isNotNull(); } @@ -130,7 +130,7 @@ public class AutoConfigurationReportLoggingInitializerTests { AnnotationConfigWebApplicationContext context = new AnnotationConfigWebApplicationContext(); context.setServletContext(new MockServletContext()); context.register(Config.class); - new AutoConfigurationReportLoggingInitializer().initialize(context); + new ConditionEvaluationReportLoggingListener().initialize(context); context.refresh(); assertThat(context.getBean(ConditionEvaluationReport.class)).isNotNull(); } @@ -148,7 +148,7 @@ public class AutoConfigurationReportLoggingInitializerTests { LoggerContext context = (LoggerContext) StaticLoggerBinder.getSingleton() .getLoggerFactory(); Logger logger = context - .getLogger(AutoConfigurationReportLoggingInitializer.class); + .getLogger(ConditionEvaluationReportLoggingListener.class); Level currentLevel = logger.getLevel(); logger.setLevel(Level.DEBUG); try {