Merge pull request #356 from spring-projects/master

[pull] master from spring-projects:master

Author: pull[bot]

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/Sanitizer.java

@@ -101,10 +101,11 @@ public Object sanitize(String key, Object value) {
 	}
 
 	private Object sanitizeUri(Object value) {
-		Matcher matcher = URI_USERINFO_PATTERN.matcher(value.toString());
+		String uriString = value.toString();
+		Matcher matcher = URI_USERINFO_PATTERN.matcher(uriString);
 		String password = matcher.matches() ? matcher.group(1) : null;
 		if (password != null) {
-			return StringUtils.replace(value.toString(), ":" + password + "@", ":******@");
+			return StringUtils.replace(uriString, ":" + password + "@", ":******@");
 		}
 		return value;
 	}

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java

@@ -275,7 +275,7 @@ void flywayJavaMigrations() {
 				.withUserConfiguration(EmbeddedDataSourceConfiguration.class, FlywayJavaMigrationsConfiguration.class)
 				.run((context) -> {
 					Flyway flyway = context.getBean(Flyway.class);
-					assertThat(flyway.getConfiguration().getJavaMigrations().length).isEqualTo(2);
+					assertThat(flyway.getConfiguration().getJavaMigrations()).hasSize(2);
 				});
 	}
 

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerAutoConfigurationTests.java

@@ -342,7 +342,7 @@ void autoConfigurationShouldConfigureResourceServerUsingJwkSetUriAndIssuerUri()
 							.getField(reactiveJwtDecoder, "jwtValidator");
 					Collection<OAuth2TokenValidator<Jwt>> tokenValidators = (Collection<OAuth2TokenValidator<Jwt>>) ReflectionTestUtils
 							.getField(jwtValidator, "tokenValidators");
-					assertThat(tokenValidators.stream()).hasAtLeastOneElementOfType(JwtIssuerValidator.class);
+					assertThat(tokenValidators).hasAtLeastOneElementOfType(JwtIssuerValidator.class);
 				});
 	}
 

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerAutoConfigurationTests.java

@@ -345,7 +345,7 @@ void autoConfigurationShouldConfigureResourceServerUsingJwkSetUriAndIssuerUri()
 							.getField(jwtDecoder, "jwtValidator");
 					Collection<OAuth2TokenValidator<Jwt>> tokenValidators = (Collection<OAuth2TokenValidator<Jwt>>) ReflectionTestUtils
 							.getField(jwtValidator, "tokenValidators");
-					assertThat(tokenValidators.stream()).hasAtLeastOneElementOfType(JwtIssuerValidator.class);
+					assertThat(tokenValidators).hasAtLeastOneElementOfType(JwtIssuerValidator.class);
 				});
 	}
 

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

@@ -1247,7 +1247,7 @@ include::{code-examples}/web/client/RestTemplateProxyCustomizationExample.java[t
 === Configure the TcpClient used by a Reactor Netty-based WebClient
 When Reactor Netty is on the classpath a Reactor Netty-based `WebClient` is auto-configured.
 To customize the client's handling of network connections, provide a `ClientHttpConnector` bean.
-The following example configures a 60 second read timeout and adds a `ReadTimeoutHandler`:
+The following example configures a 60 second connect timeout and adds a `ReadTimeoutHandler`:
 
 [source,java,indent=0]
 ----

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

@@ -727,7 +727,7 @@ For example, consider the following config in a file:
 	      password: "secret"
 ----
 
-If you run the application with the arguments `--spring.profiles.active=dev" you might expect `security.user.password` to be set to "`secret`", but this is not the case.
+If you run the application with the argument `--spring.profiles.active=dev` you might expect `security.user.password` to be set to "`secret`", but this is not the case.
 
 The nested document will be filtered because the main file is named `application-dev.yml`.
 It is already considered to be profile-specific, and nested documents will be ignored.
@@ -1675,13 +1675,10 @@ Spring Boot includes the following pre-defined logging groups that can be used o
 | Name | Loggers
 
 | web
-| `org.springframework.core.codec`, `org.springframework.http`, `org.springframework.web`
+| `org.springframework.core.codec`, `org.springframework.http`, `org.springframework.web`, `org.springframework.boot.actuate.endpoint.web`, `org.springframework.boot.web.servlet.ServletContextInitializerBeans`
 
 | sql
 | `org.springframework.jdbc.core`, `org.hibernate.SQL`, `org.jooq.tools.LoggerListener`
-
-| sql
-| `org.springframework.jdbc.core`, `org.hibernate.SQL`
 |===