Merge branch '1.5.x'

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/RedisHealthIndicatorTests.java

@@ -79,8 +79,8 @@ public class RedisHealthIndicatorTests {
 		RedisHealthIndicator healthIndicator = createHealthIndicator(redisConnection);
 		Health health = healthIndicator.health();
 		assertThat(health.getStatus()).isEqualTo(Status.DOWN);
-		assertThat(((String) health.getDetails().get("error"))
-				.contains("Connection failed"));
+		assertThat((String) health.getDetails().get("error"))
+				.contains("Connection failed");
 	}
 
 	private RedisHealthIndicator createHealthIndicator(

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/SolrHealthIndicatorTests.java

@@ -94,8 +94,8 @@ public class SolrHealthIndicatorTests {
 		SolrHealthIndicator healthIndicator = new SolrHealthIndicator(solrClient);
 		Health health = healthIndicator.health();
 		assertThat(health.getStatus()).isEqualTo(Status.DOWN);
-		assertThat(((String) health.getDetails().get("error"))
-				.contains("Connection failed"));
+		assertThat((String) health.getDetails().get("error"))
+				.contains("Connection failed");
 	}
 
 	private NamedList<Object> mockResponse(int status) {

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

@@ -166,8 +166,6 @@ public class NoSuchBeanDefinitionFailureAnalyzerTests {
 		assertThat(analysis.getDescription()).startsWith(String.format(
 				"Constructor in %s required a bean named '%s' that could not be found",
 				StringNameHandler.class.getName(), "test-string"));
-		assertThat(analysis.getDescription().contains(
-				"No matching auto-configuration has been found for this bean name."));
 		assertThat(analysis.getAction()).startsWith(String.format(
 				"Consider defining a bean named '%s' in your configuration.",
 				"test-string"));

spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java

@@ -123,7 +123,8 @@ public enum DatabaseDriver {
 	 * Firebird.
 	 */
 	FIREBIRD("Firebird", "org.firebirdsql.jdbc.FBDriver",
-			"org.firebirdsql.ds.FBXADataSource", "SELECT 1 FROM RDB$DATABASE") {
+			"org.firebirdsql.ds.FBXADataSource",
+			"SELECT 1 FROM RDB$DATABASE") {
 
 		@Override
 		protected Collection<String> getUrlPrefixes() {

spring-boot/src/test/java/org/springframework/boot/jdbc/DatabaseDriverClassNameTests.java

@@ -75,8 +75,8 @@ public class DatabaseDriverClassNameTests {
 
 	@Test
 	public void databaseClassIsOfRequiredType() throws Exception {
-		assertThat(getInterfaceNames(this.className.replace('.', '/'))
-				.contains(this.requiredType.getName().replace('.', '/')));
+		assertThat(getInterfaceNames(this.className.replace('.', '/')))
+				.contains(this.requiredType.getName().replace('.', '/'));
 	}
 
 	private List<String> getInterfaceNames(String className) throws IOException {