Skip to content

Commit dac7d9c

Browse files
committed
Rename AutoConfigurationReportLoggingInitializer to ConditionEvaluationReportLoggingListener
Closes gh-2945
1 parent 26158c1 commit dac7d9c

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed
Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
* @author Phillip Webb
4646
* @author Andy Wilkinson
4747
*/
48-
public class AutoConfigurationReportLoggingInitializer
48+
public class ConditionEvaluationReportLoggingListener
4949
implements ApplicationContextInitializer<ConfigurableApplicationContext> {
5050

5151
private final Log logger = LogFactory.getLog(getClass());
@@ -57,7 +57,7 @@ public class AutoConfigurationReportLoggingInitializer
5757
@Override
5858
public void initialize(ConfigurableApplicationContext applicationContext) {
5959
this.applicationContext = applicationContext;
60-
applicationContext.addApplicationListener(new AutoConfigurationReportListener());
60+
applicationContext.addApplicationListener(new ConditionEvaluationReportListener());
6161
if (applicationContext instanceof GenericApplicationContext) {
6262
// Get the report early in case the context fails to load
6363
this.report = ConditionEvaluationReport
@@ -66,7 +66,7 @@ public void initialize(ConfigurableApplicationContext applicationContext) {
6666
}
6767

6868
protected void onApplicationEvent(ApplicationEvent event) {
69-
ConfigurableApplicationContext initializerApplicationContext = AutoConfigurationReportLoggingInitializer.this.applicationContext;
69+
ConfigurableApplicationContext initializerApplicationContext = this.applicationContext;
7070
if (event instanceof ContextRefreshedEvent) {
7171
if (((ApplicationContextEvent) event)
7272
.getApplicationContext() == initializerApplicationContext) {
@@ -109,7 +109,8 @@ public void logAutoConfigurationReport(boolean isCrashReport) {
109109
}
110110
}
111111

112-
private class AutoConfigurationReportListener implements GenericApplicationListener {
112+
private class ConditionEvaluationReportListener
113+
implements GenericApplicationListener {
113114

114115
@Override
115116
public int getOrder() {
@@ -133,7 +134,7 @@ public boolean supportsSourceType(Class<?> sourceType) {
133134

134135
@Override
135136
public void onApplicationEvent(ApplicationEvent event) {
136-
AutoConfigurationReportLoggingInitializer.this.onApplicationEvent(event);
137+
ConditionEvaluationReportLoggingListener.this.onApplicationEvent(event);
137138
}
138139

139140
}

spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Initializers
22
org.springframework.context.ApplicationContextInitializer=\
33
org.springframework.boot.autoconfigure.SharedMetadataReaderFactoryContextInitializer,\
4-
org.springframework.boot.autoconfigure.logging.AutoConfigurationReportLoggingInitializer
4+
org.springframework.boot.autoconfigure.logging.ConditionEvaluationReportLoggingListener
55

66
# Application Listeners
77
org.springframework.context.ApplicationListener=\
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,17 @@
4444
import static org.junit.Assert.fail;
4545

4646
/**
47-
* Tests for {@link AutoConfigurationReportLoggingInitializer}.
47+
* Tests for {@link ConditionEvaluationReportLoggingListener}.
4848
*
4949
* @author Phillip Webb
5050
* @author Andy Wilkinson
5151
*/
52-
public class AutoConfigurationReportLoggingInitializerTests {
52+
public class ConditionEvaluationReportLoggingListenerTests {
5353

5454
@Rule
5555
public OutputCapture outputCapture = new OutputCapture();
5656

57-
private AutoConfigurationReportLoggingInitializer initializer = new AutoConfigurationReportLoggingInitializer();
57+
private ConditionEvaluationReportLoggingListener initializer = new ConditionEvaluationReportLoggingListener();
5858

5959
@Test
6060
public void logsDebugOnContextRefresh() {
@@ -120,7 +120,7 @@ public void logsOutput() throws Exception {
120120
public void canBeUsedInApplicationContext() throws Exception {
121121
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
122122
context.register(Config.class);
123-
new AutoConfigurationReportLoggingInitializer().initialize(context);
123+
new ConditionEvaluationReportLoggingListener().initialize(context);
124124
context.refresh();
125125
assertThat(context.getBean(ConditionEvaluationReport.class)).isNotNull();
126126
}
@@ -130,7 +130,7 @@ public void canBeUsedInNonGenericApplicationContext() throws Exception {
130130
AnnotationConfigWebApplicationContext context = new AnnotationConfigWebApplicationContext();
131131
context.setServletContext(new MockServletContext());
132132
context.register(Config.class);
133-
new AutoConfigurationReportLoggingInitializer().initialize(context);
133+
new ConditionEvaluationReportLoggingListener().initialize(context);
134134
context.refresh();
135135
assertThat(context.getBean(ConditionEvaluationReport.class)).isNotNull();
136136
}
@@ -148,7 +148,7 @@ private void withDebugLogging(Runnable runnable) {
148148
LoggerContext context = (LoggerContext) StaticLoggerBinder.getSingleton()
149149
.getLoggerFactory();
150150
Logger logger = context
151-
.getLogger(AutoConfigurationReportLoggingInitializer.class);
151+
.getLogger(ConditionEvaluationReportLoggingListener.class);
152152
Level currentLevel = logger.getLevel();
153153
logger.setLevel(Level.DEBUG);
154154
try {

0 commit comments

Comments
 (0)