From 7f9671fd14d152f0ecb381c575ddb659d5a01cbd Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Tue, 16 Oct 2018 07:15:08 +0900 Subject: [PATCH] Polish Closes gh-14843 --- .../metrics/test/MetricsIntegrationTests.java | 3 ++- .../boot/actuate/trace/http/HttpTrace.java | 6 +++--- .../orm/jpa/HibernateJpaAutoConfigurationTests.java | 4 ++-- .../asciidoc/appendix-application-properties.adoc | 2 +- .../asciidoc/appendix-configuration-metadata.adoc | 12 ++++++------ .../spring-boot-docs/src/main/asciidoc/howto.adoc | 2 +- .../additional-spring-configuration-metadata.json | 4 ++-- 7 files changed, 17 insertions(+), 16 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/test/MetricsIntegrationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/test/MetricsIntegrationTests.java index 82d97372c4e..e7a7e62cdd6 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/test/MetricsIntegrationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/test/MetricsIntegrationTests.java @@ -35,6 +35,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.actuate.autoconfigure.metrics.JvmMetricsAutoConfiguration; +import org.springframework.boot.actuate.autoconfigure.metrics.LogbackMetricsAutoConfiguration; import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration; import org.springframework.boot.actuate.autoconfigure.metrics.SystemMetricsAutoConfiguration; import org.springframework.boot.actuate.autoconfigure.metrics.amqp.RabbitMetricsAutoConfiguration; @@ -142,7 +143,7 @@ public class MetricsIntegrationTests { @Configuration @ImportAutoConfiguration({ MetricsAutoConfiguration.class, - JvmMetricsAutoConfiguration.class, LogbackMetrics.class, + JvmMetricsAutoConfiguration.class, LogbackMetricsAutoConfiguration.class, SystemMetricsAutoConfiguration.class, RabbitMetricsAutoConfiguration.class, CacheMetricsAutoConfiguration.class, DataSourcePoolMetricsAutoConfiguration.class, diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/http/HttpTrace.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/http/HttpTrace.java index b80ffc9f571..b3e53c5d80e 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/http/HttpTrace.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/http/HttpTrace.java @@ -47,7 +47,7 @@ public final class HttpTrace { private volatile Long timeTaken; /** - * Creates a fully-configured {@code HttpTrace} instance. Primarly for use by + * Creates a fully-configured {@code HttpTrace} instance. Primarily for use by * {@link HttpTraceRepository} implementations when recreating a trace from a * persistent store. * @param request the request @@ -137,7 +137,7 @@ public final class HttpTrace { } /** - * Creates a fully-configured {@code Request} instance. Primarly for use by + * Creates a fully-configured {@code Request} instance. Primarily for use by * {@link HttpTraceRepository} implementations when recreating a request from a * persistent store. * @param method the HTTP method of the request @@ -186,7 +186,7 @@ public final class HttpTrace { } /** - * Creates a fully-configured {@code Response} instance. Primarly for use by + * Creates a fully-configured {@code Response} instance. Primarily for use by * {@link HttpTraceRepository} implementations when recreating a response from a * persistent store. * @param status the status of the response diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java index 975c980b9fc..54c0e6f82b0 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java @@ -585,12 +585,12 @@ public class HibernateJpaAutoConfigurationTests static class AsyncBootstrappingConfiguration { @Bean - ThreadPoolTaskExecutor ThreadPoolTaskExecutor() { + public ThreadPoolTaskExecutor ThreadPoolTaskExecutor() { return new ThreadPoolTaskExecutor(); } @Bean - public EntityManagerFactoryBuilderCustomizer asyncBoostrappingCustomizer( + public EntityManagerFactoryBuilderCustomizer asyncBootstrappingCustomizer( ThreadPoolTaskExecutor executor) { return (builder) -> { builder.setBootstrapExecutor(executor); diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc index 029cae675e1..7afa3f83cdc 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc @@ -1537,7 +1537,7 @@ content into your application. Rather, pick only the properties that you need. management.metrics.tags.*= # Common tags that are applied to every meter. management.metrics.web.client.max-uri-tags=100 # Maximum number of unique URI tag values allowed. After the max number of tag values is reached, metrics with additional tag values are denied by filter. management.metrics.web.client.requests-metric-name=http.client.requests # Name of the metric for sent requests. - management.metrics.web.server.auto-time-requests=true # Whether requests handled by Spring MVC or WebFlux should be automatically timed. + management.metrics.web.server.auto-time-requests=true # Whether requests handled by Spring MVC, WebFlux or Jersey should be automatically timed. management.metrics.web.server.max-uri-tags=100 # Maximum number of unique URI tag values allowed. After the max number of tag values is reached, metrics with additional tag values are denied by filter. management.metrics.web.server.requests-metric-name=http.server.requests # Name of the metric for received requests. diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-configuration-metadata.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-configuration-metadata.adoc index 8b395211381..b07144d7739 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-configuration-metadata.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-configuration-metadata.adoc @@ -632,16 +632,16 @@ have been added for those. "name": "logging.level.keys", "values": [ { - "value": "root", - "description": "Root logger used to assign the default logging level." + "value": "root", + "description": "Root logger used to assign the default logging level." }, { - "value": "sql", - "description": "SQL logging groups including Hibernate SQL logger." + "value": "sql", + "description": "SQL logging group including Hibernate SQL logger." }, { - "value": "web", - "description": "Web logging groups including codecs." + "value": "web", + "description": "Web logging group including codecs." } ], "providers": [ diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/howto.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/howto.adoc index 607a7d24f65..773c1eb3f0a 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/howto.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/howto.adoc @@ -2025,7 +2025,7 @@ By default, Spring Boot registers a `BeanContainer` implementation that uses the injection. You can disable or tune this behaviour by registering a `HibernatePropertiesCustomizer` -that remove or change the `hibernate.resource.beans.container` property. +that removes or changes the `hibernate.resource.beans.container` property. diff --git a/spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json index a251338b9ba..3a7236be436 100644 --- a/spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -359,11 +359,11 @@ }, { "value": "sql", - "description": "SQL logging groups including Hibernate SQL logger." + "description": "SQL logging group including Hibernate SQL logger." }, { "value": "web", - "description": "Web logging groups including codecs." + "description": "Web logging group including codecs." } ], "providers": [