Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-05 00:56:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14843 from izeye

Browse Source 
* pr/14843:
  Polish
This commit is contained in:
Stephane Nicoll 2018-10-16 11:39:01 +02:00
commit 6fb29eddc4
7 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/test/MetricsIntegrationTests.java
View File

@ -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,

6
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/http/HttpTrace.java
View File

@ -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

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

@ -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);

2
spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
View File

@ -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.

12
spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-configuration-metadata.adoc
View File

@ -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": [

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

@ -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.

4
spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
View File

@ -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": [