Merge branch '2.0.x'

snicoll · snicoll · commit 2d36a6f95205 · 2018-10-01T10:50:58.000-04:00
diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/reactive/server/WebFluxTags.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/reactive/server/WebFluxTags.java
@@ -97,11 +97,13 @@ public static Tag uri(ServerWebExchange exchange) {
 			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()) {
diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcTags.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcTags.java
@@ -109,13 +109,15 @@ public static Tag uri(HttpServletRequest request, HttpServletResponse response)
 			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);
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/EmbeddedDataSourceConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/EmbeddedDataSourceConfiguration.java
@@ -54,10 +54,9 @@ public void setBeanClassLoader(ClassLoader classLoader) {
 
 	@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;
 	}
 
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/logging/ConditionEvaluationReportLoggingListener.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/logging/ConditionEvaluationReportLoggingListener.java
@@ -128,13 +128,12 @@ else if (isCrashReport) {
 				}
 			}
 			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");
+				}
 			}
 		}
 	}
diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/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...
+				});
 	}
 ----
 
diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/AutoConfigureTestDatabaseWithMultipleDatasourcesIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/AutoConfigureTestDatabaseWithMultipleDatasourcesIntegrationTests.java
@@ -61,16 +61,14 @@ static class Config {
 		@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();
 		}
 
 	}
diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/ExampleJdbcApplication.java b/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();
 	}
 
 }
diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTestWithAutoConfigureTestDatabaseReplaceExplicitIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTestWithAutoConfigureTestDatabaseReplaceExplicitIntegrationTests.java
@@ -60,9 +60,8 @@ static class Config {
 
 		@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();
 		}
 
 	}
diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTestWithAutoConfigureTestDatabaseReplacePropertyAnyIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/JdbcTestWithAutoConfigureTestDatabaseReplacePropertyAnyIntegrationTests.java
@@ -62,9 +62,8 @@ static class Config {
 
 		@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();
 		}
 
 	}
diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/TestDatabaseAutoConfigurationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/TestDatabaseAutoConfigurationTests.java
@@ -73,9 +73,8 @@ static class ExistingDataSourceConfiguration {
 
 		@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();
 		}
 
 	}
diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jooq/ExampleJooqApplication.java b/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();
 	}
 
 }
diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/ExampleDataJpaApplication.java b/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();
 	}
 
 }

Original file line number	Diff line number	Diff line change
`@@ -128,13 +128,12 @@ else if (isCrashReport) {`
`128`	`128`	`}`
`129`	`129`	`}`
`130`	`130`	`else {`
`131`		`- if (isCrashReport && this.logger.isInfoEnabled()`
`132`		`- && !this.logger.isDebugEnabled()) {`
`133`		`- logMessage("debug");`
`134`		`- }`
`135`	`131`	`if (this.logger.isDebugEnabled()) {`
`136`	`132`	`this.logger.debug(new ConditionEvaluationReportMessage(this.report));`
`137`	`133`	`}`
	`134`	`+ else if (isCrashReport) {`
	`135`	`+ logMessage("debug");`
	`136`	`+ }`
`138`	`137`	`}`
`139`	`138`	`}`
`140`	`139`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,16 +61,14 @@ static class Config {`
`61`	`61`	`@Bean`
`62`	`62`	`@Primary`
`63`	`63`	`public DataSource dataSource() {`
`64`		`- EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder()`
`65`		`- .generateUniqueName(true).setType(EmbeddedDatabaseType.HSQL);`
`66`		`- return builder.build();`
	`64`	`+ return new EmbeddedDatabaseBuilder().generateUniqueName(true)`
	`65`	`+ .setType(EmbeddedDatabaseType.HSQL).build();`
`67`	`66`	`}`
`68`	`67`
`69`	`68`	`@Bean`
`70`	`69`	`public DataSource secondaryDataSource() {`
`71`		`- EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder()`
`72`		`- .generateUniqueName(true).setType(EmbeddedDatabaseType.HSQL);`
`73`		`- return builder.build();`
	`70`	`+ return new EmbeddedDatabaseBuilder().generateUniqueName(true)`
	`71`	`+ .setType(EmbeddedDatabaseType.HSQL).build();`
`74`	`72`	`}`
`75`	`73`
`76`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,9 +33,8 @@ public class ExampleJdbcApplication {`
`33`	`33`
`34`	`34`	`@Bean`
`35`	`35`	`public DataSource dataSource() {`
`36`		`- EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder()`
`37`		`- .generateUniqueName(true).setType(EmbeddedDatabaseType.HSQL);`
`38`		`- return builder.build();`
	`36`	`+ return new EmbeddedDatabaseBuilder().generateUniqueName(true)`
	`37`	`+ .setType(EmbeddedDatabaseType.HSQL).build();`
`39`	`38`	`}`
`40`	`39`
`41`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,9 +60,8 @@ static class Config {`
`60`	`60`
`61`	`61`	`@Bean`
`62`	`62`	`public DataSource dataSource() {`
`63`		`- EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder()`
`64`		`- .generateUniqueName(true).setType(EmbeddedDatabaseType.H2);`
`65`		`- return builder.build();`
	`63`	`+ return new EmbeddedDatabaseBuilder().generateUniqueName(true)`
	`64`	`+ .setType(EmbeddedDatabaseType.H2).build();`
`66`	`65`	`}`
`67`	`66`
`68`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,9 +62,8 @@ static class Config {`
`62`	`62`
`63`	`63`	`@Bean`
`64`	`64`	`public DataSource dataSource() {`
`65`		`- EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder()`
`66`		`- .generateUniqueName(true).setType(EmbeddedDatabaseType.H2);`
`67`		`- return builder.build();`
	`65`	`+ return new EmbeddedDatabaseBuilder().generateUniqueName(true)`
	`66`	`+ .setType(EmbeddedDatabaseType.H2).build();`
`68`	`67`	`}`
`69`	`68`
`70`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,9 +73,8 @@ static class ExistingDataSourceConfiguration {`
`73`	`73`
`74`	`74`	`@Bean`
`75`	`75`	`public DataSource dataSource() {`
`76`		`- EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder()`
`77`		`- .generateUniqueName(true).setType(EmbeddedDatabaseType.HSQL);`
`78`		`- return builder.build();`
	`76`	`+ return new EmbeddedDatabaseBuilder().generateUniqueName(true)`
	`77`	`+ .setType(EmbeddedDatabaseType.HSQL).build();`
`79`	`78`	`}`
`80`	`79`
`81`	`80`	`}`