Track condition evaluation per-context when determining delta

Closes gh-15766
This commit is contained in:
Andy Wilkinson 2019-02-14 15:11:18 +00:00
parent 1be794fe65
commit 33b9321071

View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2017 the original author or authors. * Copyright 2012-2019 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -16,12 +16,16 @@
package org.springframework.boot.devtools.autoconfigure; package org.springframework.boot.devtools.autoconfigure;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.boot.autoconfigure.condition.ConditionEvaluationReport; import org.springframework.boot.autoconfigure.condition.ConditionEvaluationReport;
import org.springframework.boot.autoconfigure.logging.ConditionEvaluationReportMessage; import org.springframework.boot.autoconfigure.logging.ConditionEvaluationReportMessage;
import org.springframework.boot.context.event.ApplicationReadyEvent; import org.springframework.boot.context.event.ApplicationReadyEvent;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.context.ApplicationListener; import org.springframework.context.ApplicationListener;
/** /**
@ -31,32 +35,47 @@ import org.springframework.context.ApplicationListener;
* @author Andy Wilkinson * @author Andy Wilkinson
*/ */
class ConditionEvaluationDeltaLoggingListener class ConditionEvaluationDeltaLoggingListener
implements ApplicationListener<ApplicationReadyEvent> { implements ApplicationListener<ApplicationReadyEvent>, ApplicationContextAware {
private final Log logger = LogFactory.getLog(getClass()); private static final ConcurrentHashMap<String, ConditionEvaluationReport> previousReports = new ConcurrentHashMap<>();
private static ConditionEvaluationReport previousReport; private static final Log logger = LogFactory
.getLog(ConditionEvaluationDeltaLoggingListener.class);
private volatile ApplicationContext context;
@Override @Override
public void onApplicationEvent(ApplicationReadyEvent event) { public void onApplicationEvent(ApplicationReadyEvent event) {
if (!event.getApplicationContext().equals(this.context)) {
return;
}
ConditionEvaluationReport report = event.getApplicationContext() ConditionEvaluationReport report = event.getApplicationContext()
.getBean(ConditionEvaluationReport.class); .getBean(ConditionEvaluationReport.class);
ConditionEvaluationReport previousReport = previousReports
.get(event.getApplicationContext().getId());
if (previousReport != null) { if (previousReport != null) {
ConditionEvaluationReport delta = report.getDelta(previousReport); ConditionEvaluationReport delta = report.getDelta(previousReport);
if (!delta.getConditionAndOutcomesBySource().isEmpty() if (!delta.getConditionAndOutcomesBySource().isEmpty()
|| !delta.getExclusions().isEmpty() || !delta.getExclusions().isEmpty()
|| !delta.getUnconditionalClasses().isEmpty()) { || !delta.getUnconditionalClasses().isEmpty()) {
if (this.logger.isInfoEnabled()) { if (ConditionEvaluationDeltaLoggingListener.logger.isInfoEnabled()) {
this.logger.info("Condition evaluation delta:" ConditionEvaluationDeltaLoggingListener.logger
+ new ConditionEvaluationReportMessage(delta, .info("Condition evaluation delta:"
"CONDITION EVALUATION DELTA")); + new ConditionEvaluationReportMessage(delta,
"CONDITION EVALUATION DELTA"));
} }
} }
else { else {
this.logger.info("Condition evaluation unchanged"); ConditionEvaluationDeltaLoggingListener.logger
.info("Condition evaluation unchanged");
} }
} }
previousReport = report; previousReports.put(event.getApplicationContext().getId(), report);
}
@Override
public void setApplicationContext(ApplicationContext applicationContext) {
this.context = applicationContext;
} }
} }