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

Start building against Spring Framework 4.3 snapshots 

See gh-4900
This commit is contained in:
Andy Wilkinson 2016-02-26 18:22:40 +00:00
parent 9bf95c4215
commit 65234ce4a1
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-dependencies/pom.xml
View File

@ -128,7 +128,7 @@
<snakeyaml.version>1.17</snakeyaml.version> <snakeyaml.version>1.17</snakeyaml.version>
<solr.version>5.3.2</solr.version> <solr.version>5.3.2</solr.version>
<spock.version>1.0-groovy-2.4</spock.version> <spock.version>1.0-groovy-2.4</spock.version>
<spring.version>4.2.5.RELEASE</spring.version> <spring.version>4.3.0.BUILD-SNAPSHOT</spring.version>
<spring-amqp.version>1.6.0.M1</spring-amqp.version> <spring-amqp.version>1.6.0.M1</spring-amqp.version>
<spring-cloud-connectors.version>1.2.1.RELEASE</spring-cloud-connectors.version> <spring-cloud-connectors.version>1.2.1.RELEASE</spring-cloud-connectors.version>
<spring-batch.version>3.0.6.RELEASE</spring-batch.version> <spring-batch.version>3.0.6.RELEASE</spring-batch.version>

21
spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/BeanCurrentlyInCreationFailureAnalyzer.java
View File

@ -21,6 +21,8 @@ import java.util.List;
import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.BeanCurrentlyInCreationException; import org.springframework.beans.factory.BeanCurrentlyInCreationException;
import org.springframework.beans.factory.InjectionPoint;
import org.springframework.beans.factory.UnsatisfiedDependencyException;
import org.springframework.boot.diagnostics.AbstractFailureAnalyzer; import org.springframework.boot.diagnostics.AbstractFailureAnalyzer;
import org.springframework.boot.diagnostics.FailureAnalysis; import org.springframework.boot.diagnostics.FailureAnalysis;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
@ -34,8 +36,6 @@ import org.springframework.util.StringUtils;
class BeanCurrentlyInCreationFailureAnalyzer class BeanCurrentlyInCreationFailureAnalyzer
extends AbstractFailureAnalyzer<BeanCurrentlyInCreationException> { extends AbstractFailureAnalyzer<BeanCurrentlyInCreationException> {
private static final String FIELD_AUTOWIRING_FAILURE_MESSAGE_PREFIX = "Could not autowire field: ";
@Override @Override
protected FailureAnalysis analyze(Throwable rootFailure, protected FailureAnalysis analyze(Throwable rootFailure,
BeanCurrentlyInCreationException cause) { BeanCurrentlyInCreationException cause) {
@ -66,19 +66,18 @@ class BeanCurrentlyInCreationFailureAnalyzer
if (StringUtils.hasText(ex.getResourceDescription())) { if (StringUtils.hasText(ex.getResourceDescription())) {
return String.format(" defined in %s", ex.getResourceDescription()); return String.format(" defined in %s", ex.getResourceDescription());
} }
if (causedByFieldAutowiringFailure(ex)) { InjectionPoint failedInjectionPoint = findFailedInjectionPoint(ex);
return String.format(" (field %s)", if (failedInjectionPoint != null && failedInjectionPoint.getField() != null) {
ex.getCause().getMessage().substring( return String.format(" (field %s)", failedInjectionPoint.getField());
FIELD_AUTOWIRING_FAILURE_MESSAGE_PREFIX.length(),
ex.getCause().getMessage().indexOf(";")));
} }
return ""; return "";
} }
private boolean causedByFieldAutowiringFailure(BeanCreationException ex) { private InjectionPoint findFailedInjectionPoint(BeanCreationException ex) {
return ex.getCause() instanceof BeanCreationException && ex.getCause() if (!(ex instanceof UnsatisfiedDependencyException)) {
.getMessage().startsWith(FIELD_AUTOWIRING_FAILURE_MESSAGE_PREFIX); return null;
}
return ((UnsatisfiedDependencyException) ex).getInjectionPoint();
} }
} }

2
spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BeanCurrentlyInCreationFailureAnalyzerTests.java
View File

@ -57,7 +57,7 @@ public class BeanCurrentlyInCreationFailureAnalyzerTests {
assertThat(analysis.getDescription()).startsWith( assertThat(analysis.getDescription()).startsWith(
"There is a circular dependency between 3 beans in the application context:"); "There is a circular dependency between 3 beans in the application context:");
assertThat(analysis.getDescription()).contains("three defined in " assertThat(analysis.getDescription()).contains("three defined in "
+ CycleWithAutowiredFields.BeanThreeConfiguration.class); + CycleWithAutowiredFields.BeanThreeConfiguration.class.getName());
assertThat(analysis.getDescription()) assertThat(analysis.getDescription())
.contains("one defined in " + CycleWithAutowiredFields.class.getName()); .contains("one defined in " + CycleWithAutowiredFields.class.getName());
assertThat(analysis.getDescription()) assertThat(analysis.getDescription())