Merge branch '2.0.x'

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/reactive/server/WebFluxTags.java

@@ -97,11 +97,13 @@ public final class WebFluxTags {
 			return Tag.of("uri", pathPattern.getPatternString());
 		}
 		HttpStatus status = exchange.getResponse().getStatusCode();
-		if (status != null && status.is3xxRedirection()) {
-			return URI_REDIRECTION;
-		}
-		if (status != null && status.equals(HttpStatus.NOT_FOUND)) {
-			return URI_NOT_FOUND;
+		if (status != null) {
+			if (status.is3xxRedirection()) {
+				return URI_REDIRECTION;
+			}
+			if (status == HttpStatus.NOT_FOUND) {
+				return URI_NOT_FOUND;
+			}
 		}
 		String path = exchange.getRequest().getPath().value();
 		if (path.isEmpty()) {

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcTags.java

@@ -109,13 +109,15 @@ public final class WebMvcTags {
 			if (pattern != null) {
 				return Tag.of("uri", pattern);
 			}
-			else if (response != null) {
+			if (response != null) {
 				HttpStatus status = extractStatus(response);
-				if (status != null && status.is3xxRedirection()) {
-					return URI_REDIRECTION;
-				}
-				if (status != null && status.equals(HttpStatus.NOT_FOUND)) {
-					return URI_NOT_FOUND;
+				if (status != null) {
+					if (status.is3xxRedirection()) {
+						return URI_REDIRECTION;
+					}
+					if (status == HttpStatus.NOT_FOUND) {
+						return URI_NOT_FOUND;
+					}
 				}
 			}
 			String pathInfo = getPathInfo(request);

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/EmbeddedDataSourceConfiguration.java

@@ -54,10 +54,9 @@ public class EmbeddedDataSourceConfiguration implements BeanClassLoaderAware {
 
 	@Bean
 	public EmbeddedDatabase dataSource() {
-		EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder()
+		this.database = new EmbeddedDatabaseBuilder()
 				.setType(EmbeddedDatabaseConnection.get(this.classLoader).getType())
-				.setName(this.properties.determineDatabaseName());
-		this.database = builder.build();
+				.setName(this.properties.determineDatabaseName()).build();
 		return this.database;
 	}
 

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/logging/ConditionEvaluationReportLoggingListener.java

@@ -128,13 +128,12 @@ public class ConditionEvaluationReportLoggingListener
 				}
 			}
 			else {
-				if (isCrashReport && this.logger.isInfoEnabled()
-						&& !this.logger.isDebugEnabled()) {
-					logMessage("debug");
-				}
 				if (this.logger.isDebugEnabled()) {
 					this.logger.debug(new ConditionEvaluationReportMessage(this.report));
 				}
+				else if (isCrashReport) {
+					logMessage("debug");
+				}
 			}
 		}
 	}

spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc

@@ -8105,11 +8105,11 @@ to print the report in auto-configuration tests.
 	@Test
 	public void autoConfigTest {
 		ConditionEvaluationReportLoggingListener initializer = new ConditionEvaluationReportLoggingListener(
-					LogLevel.INFO);
-			ApplicationContextRunner contextRunner = new ApplicationContextRunner()
-					.withInitializer(initializer).run((context -> {
-							// Do something...
-					}));
+				LogLevel.INFO);
+		ApplicationContextRunner contextRunner = new ApplicationContextRunner()
+				.withInitializer(initializer).run((context) -> {
+						// Do something...
+				});
 	}
 ----
 

spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/AutoConfigureTestDatabaseWithMultipleDatasourcesIntegrationTests.java

@@ -61,16 +61,14 @@ public class AutoConfigureTestDatabaseWithMultipleDatasourcesIntegrationTests {
 		@Bean
 		@Primary
 		public DataSource dataSource() {
-			EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder()
-					.generateUniqueName(true).setType(EmbeddedDatabaseType.HSQL);
-			return builder.build();
+			return new EmbeddedDatabaseBuilder().generateUniqueName(true)
+					.setType(EmbeddedDatabaseType.HSQL).build();
 		}
 
 		@Bean
 		public DataSource secondaryDataSource() {
-			EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder()
-					.generateUniqueName(true).setType(EmbeddedDatabaseType.HSQL);
-			return builder.build();
+			return new EmbeddedDatabaseBuilder().generateUniqueName(true)
+					.setType(EmbeddedDatabaseType.HSQL).build();
 		}
 
 	}

spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/ExampleJdbcApplication.java

@@ -33,9 +33,8 @@ public class ExampleJdbcApplication {
 
 	@Bean
 	public DataSource dataSource() {
-		EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder()
-				.generateUniqueName(true).setType(EmbeddedDatabaseType.HSQL);
-		return builder.build();
+		return new EmbeddedDatabaseBuilder().generateUniqueName(true)
+				.setType(EmbeddedDatabaseType.HSQL).build();
 	}
 
 }

spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTestWithAutoConfigureTestDatabaseReplaceExplicitIntegrationTests.java

@@ -60,9 +60,8 @@ public class JdbcTestWithAutoConfigureTestDatabaseReplaceExplicitIntegrationTest
 
 		@Bean
 		public DataSource dataSource() {
-			EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder()
-					.generateUniqueName(true).setType(EmbeddedDatabaseType.H2);
-			return builder.build();
+			return new EmbeddedDatabaseBuilder().generateUniqueName(true)
+					.setType(EmbeddedDatabaseType.H2).build();
 		}
 
 	}

spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTestWithAutoConfigureTestDatabaseReplacePropertyAnyIntegrationTests.java

@@ -62,9 +62,8 @@ public class JdbcTestWithAutoConfigureTestDatabaseReplacePropertyAnyIntegrationT
 
 		@Bean
 		public DataSource dataSource() {
-			EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder()
-					.generateUniqueName(true).setType(EmbeddedDatabaseType.H2);
-			return builder.build();
+			return new EmbeddedDatabaseBuilder().generateUniqueName(true)
+					.setType(EmbeddedDatabaseType.H2).build();
 		}
 
 	}

spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/TestDatabaseAutoConfigurationTests.java

@@ -73,9 +73,8 @@ public class TestDatabaseAutoConfigurationTests {
 
 		@Bean
 		public DataSource dataSource() {
-			EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder()
-					.generateUniqueName(true).setType(EmbeddedDatabaseType.HSQL);
-			return builder.build();
+			return new EmbeddedDatabaseBuilder().generateUniqueName(true)
+					.setType(EmbeddedDatabaseType.HSQL).build();
 		}
 
 	}

spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jooq/ExampleJooqApplication.java

@@ -33,9 +33,8 @@ public class ExampleJooqApplication {
 
 	@Bean
 	public DataSource dataSource() {
-		EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder()
-				.generateUniqueName(true).setType(EmbeddedDatabaseType.HSQL);
-		return builder.build();
+		return new EmbeddedDatabaseBuilder().generateUniqueName(true)
+				.setType(EmbeddedDatabaseType.HSQL).build();
 	}
 
 }

spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/ExampleDataJpaApplication.java

@@ -33,9 +33,8 @@ public class ExampleDataJpaApplication {
 
 	@Bean
 	public DataSource dataSource() {
-		EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder()
-				.generateUniqueName(true).setType(EmbeddedDatabaseType.HSQL);
-		return builder.build();
+		return new EmbeddedDatabaseBuilder().generateUniqueName(true)
+				.setType(EmbeddedDatabaseType.HSQL).build();
 	}
 
 }