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

Polish 

See gh-18281
This commit is contained in:
Johnny Lim 2019-09-19 13:12:44 +09:00 committed by Stephane Nicoll
parent 9f1243129c
commit b70be97cbf
6 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,10 +101,11 @@ public class Sanitizer {
} }
private Object sanitizeUri(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; String password = matcher.matches() ? matcher.group(1) : null;
if (password != null) { if (password != null) {
return StringUtils.replace(value.toString(), ":" + password + "@", ":******@"); return StringUtils.replace(uriString, ":" + password + "@", ":******@");
} }
return value; return value;
} }

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

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

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

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

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

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

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

@ -1247,7 +1247,7 @@ include::{code-examples}/web/client/RestTemplateProxyCustomizationExample.java[t
=== Configure the TcpClient used by a Reactor Netty-based WebClient === 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. 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. 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] [source,java,indent=0]
---- ----

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

@ -727,7 +727,7 @@ For example, consider the following config in a file:
password: "secret" 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`. 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. It is already considered to be profile-specific, and nested documents will be ignored.