root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Rename AutoConfigurationReportLoggingInitializer to ConditionEvaluationReportLoggingListener 

Closes gh-2945
This commit is contained in:
Stephane Nicoll 2017-11-10 16:20:13 +01:00
parent 26158c1ee2
commit dac7d9c174
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/logging/AutoConfigurationReportLoggingInitializer.java → spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/logging/ConditionEvaluationReportLoggingListener.java
View File

@ -45,7 +45,7 @@ import org.springframework.core.ResolvableType;
* @author Phillip Webb
* @author Andy Wilkinson
*/
public class AutoConfigurationReportLoggingInitializer
public class ConditionEvaluationReportLoggingListener
implements ApplicationContextInitializer<ConfigurableApplicationContext> {
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);
}
}

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

@ -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=\

12
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/logging/AutoConfigurationReportLoggingInitializerTests.java → spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/logging/ConditionEvaluationReportLoggingListenerTests.java
View File

@ -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 {