Merge branch 'sfw-4.3'

spring-boot-dependencies/pom.xml

@@ -128,7 +128,7 @@
 		<snakeyaml.version>1.17</snakeyaml.version>
 		<solr.version>5.3.2</solr.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-cloud-connectors.version>1.2.1.RELEASE</spring-cloud-connectors.version>
 		<spring-batch.version>3.0.6.RELEASE</spring-batch.version>

spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/undertow/SampleWebSocketsApplicationTests.java

@@ -22,6 +22,7 @@ import java.util.concurrent.atomic.AtomicReference;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import samples.websocket.undertow.client.GreetingService;
@@ -56,6 +57,7 @@ public class SampleWebSocketsApplicationTests {
 	private int port = 1234;
 
 	@Test
+	@Ignore("UNDERTOW-639")
 	public void echoEndpoint() throws Exception {
 		ConfigurableApplicationContext context = new SpringApplicationBuilder(
 				ClientConfiguration.class, PropertyPlaceholderAutoConfiguration.class)

spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/undertow/echo/CustomContainerWebSocketsApplicationTests.java

@@ -22,6 +22,7 @@ import java.util.concurrent.atomic.AtomicReference;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import samples.websocket.undertow.SampleUndertowWebSocketsApplication;
@@ -62,6 +63,7 @@ public class CustomContainerWebSocketsApplicationTests {
 	private static int PORT = SocketUtils.findAvailableTcpPort();
 
 	@Test
+	@Ignore("UNDERTOW-639")
 	public void echoEndpoint() throws Exception {
 		ConfigurableApplicationContext context = new SpringApplicationBuilder(
 				ClientConfiguration.class, PropertyPlaceholderAutoConfiguration.class)

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

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

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

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