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

Merge branch '2.0.x'

This commit is contained in:
Stephane Nicoll 2018-10-01 10:50:58 -04:00
parent 121aad8397 7163fe1f46
commit 2d36a6f952
12 changed files with 41 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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