From 8526e66939271e57424aacc886642af8fb419cea Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Wed, 11 Mar 2020 12:17:37 +0900 Subject: [PATCH] Polish See gh-20498 --- .../security/reactive/EndpointRequest.java | 2 - .../spring-boot-dependencies/build.gradle | 92 +++++++++---------- .../src/docs/asciidoc/howto.adoc | 2 +- .../asciidoc/production-ready-features.adoc | 6 +- .../tasks/buildinfo/BuildInfoProperties.java | 2 +- 5 files changed, 51 insertions(+), 53 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/reactive/EndpointRequest.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/reactive/EndpointRequest.java index 591ccf3ead..5f998e5fdf 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/reactive/EndpointRequest.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/security/reactive/EndpointRequest.java @@ -159,8 +159,6 @@ public final class EndpointRequest { private volatile ServerWebExchangeMatcher delegate; - private static ManagementPortType managementPortType; - private EndpointServerWebExchangeMatcher(boolean includeLinks) { this(Collections.emptyList(), Collections.emptyList(), includeLinks); } diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 403c519c27..1318473239 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -525,52 +525,52 @@ bom { } library("Infinispan", "10.1.3.Final") { group("org.infinispan") { - modules = [ - 'infinispan-api', - 'infinispan-cachestore-jdbc', - 'infinispan-cachestore-jpa', - 'infinispan-cachestore-remote', - 'infinispan-cachestore-rest', - 'infinispan-cachestore-rocksdb', - 'infinispan-cdi-common', - 'infinispan-cdi-embedded', - 'infinispan-cdi-remote', - 'infinispan-client-hotrod', - 'infinispan-client-rest', - 'infinispan-clustered-counter', - 'infinispan-clustered-lock', - 'infinispan-commons', - 'infinispan-component-annotations', - 'infinispan-core', - 'infinispan-directory-provider', - 'infinispan-hibernate-cache-v53', - 'infinispan-jboss-marshalling', - 'infinispan-jcache', - 'infinispan-jcache-commons', - 'infinispan-jcache-remote', - 'infinispan-key-value-store-client', - 'infinispan-lucene-directory', - 'infinispan-objectfilter', - 'infinispan-osgi', - 'infinispan-persistence-soft-index', - 'infinispan-query', - 'infinispan-query-core', - 'infinispan-query-dsl', - 'infinispan-remote-query-client', - 'infinispan-remote-query-server', - 'infinispan-scripting', - 'infinispan-server-core', - 'infinispan-server-hotrod', - 'infinispan-server-memcached', - 'infinispan-server-rest', - 'infinispan-server-router', - 'infinispan-spring5-common', - 'infinispan-spring5-embedded', - 'infinispan-spring5-remote', - 'infinispan-tasks', - 'infinispan-tasks-api', - 'infinispan-tools' - ] + modules = [ + 'infinispan-api', + 'infinispan-cachestore-jdbc', + 'infinispan-cachestore-jpa', + 'infinispan-cachestore-remote', + 'infinispan-cachestore-rest', + 'infinispan-cachestore-rocksdb', + 'infinispan-cdi-common', + 'infinispan-cdi-embedded', + 'infinispan-cdi-remote', + 'infinispan-client-hotrod', + 'infinispan-client-rest', + 'infinispan-clustered-counter', + 'infinispan-clustered-lock', + 'infinispan-commons', + 'infinispan-component-annotations', + 'infinispan-core', + 'infinispan-directory-provider', + 'infinispan-hibernate-cache-v53', + 'infinispan-jboss-marshalling', + 'infinispan-jcache', + 'infinispan-jcache-commons', + 'infinispan-jcache-remote', + 'infinispan-key-value-store-client', + 'infinispan-lucene-directory', + 'infinispan-objectfilter', + 'infinispan-osgi', + 'infinispan-persistence-soft-index', + 'infinispan-query', + 'infinispan-query-core', + 'infinispan-query-dsl', + 'infinispan-remote-query-client', + 'infinispan-remote-query-server', + 'infinispan-scripting', + 'infinispan-server-core', + 'infinispan-server-hotrod', + 'infinispan-server-memcached', + 'infinispan-server-rest', + 'infinispan-server-router', + 'infinispan-spring5-common', + 'infinispan-spring5-embedded', + 'infinispan-spring5-remote', + 'infinispan-tasks', + 'infinispan-tasks-api', + 'infinispan-tools' + ] } } library("InfluxDB Java", "2.17") { diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto.adoc index cc90bd59a4..f5ce385176 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto.adoc @@ -2204,7 +2204,7 @@ Information returned by the `env` and `configprops` endpoints can be somewhat se The patterns to use can be customized using the `management.endpoint.env.keys-to-sanitize` and `management.endpoint.configprops.keys-to-sanitize` respectively. Spring Boot uses sensible defaults for such keys: any key ending with the word "password", "secret", "key", "token", "vcap_services", "sun.java.command", "uri", "uris", "address" or "addresses" is sanitized. -Additionally, any key that holds the word `credentials` as part of the key is sanitized (configured as a regular expression, i.e. `+*credentials.*+`). +Additionally, any key that holds the word `credentials` as part of the key is sanitized (configured as a regular expression, i.e. `+.*credentials.*+`). If any of the keys to sanitize are URI format (i.e. `://:@:/`), only the password part is sanitized. diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/production-ready-features.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/production-ready-features.adoc index e53c0476b4..d2e3f52df2 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/production-ready-features.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/production-ready-features.adoc @@ -663,12 +663,12 @@ The following `HealthIndicators` are auto-configured by Spring Boot when appropr | {spring-boot-actuator-module-code}/couchbase/CouchbaseHealthIndicator.java[`CouchbaseHealthIndicator`] | Checks that a Couchbase cluster is up. -| {spring-boot-actuator-module-code}/system/DiskSpaceHealthIndicator.java[`DiskSpaceHealthIndicator`] -| Checks for low disk space. - | {spring-boot-actuator-module-code}/jdbc/DataSourceHealthIndicator.java[`DataSourceHealthIndicator`] | Checks that a connection to `DataSource` can be obtained. +| {spring-boot-actuator-module-code}/system/DiskSpaceHealthIndicator.java[`DiskSpaceHealthIndicator`] +| Checks for low disk space. + | {spring-boot-actuator-module-code}/elasticsearch/ElasticSearchRestHealthContributorAutoConfiguration.java[`ElasticSearchRestHealthContributorAutoConfiguration`] | Checks that an Elasticsearch cluster is up. diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/buildinfo/BuildInfoProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/buildinfo/BuildInfoProperties.java index e9a2c96f3f..2a72555295 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/buildinfo/BuildInfoProperties.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/buildinfo/BuildInfoProperties.java @@ -56,7 +56,7 @@ public class BuildInfoProperties implements Serializable { this.version = project.getObjects().property(String.class); this.version.set(project.provider(() -> project.getVersion().toString())); this.name = project.getObjects().property(String.class); - this.name.set(project.provider(() -> project.getName().toString())); + this.name.set(project.provider(() -> project.getName())); } /**