From ca57e58ee58568d030cf3cdd9cf18975c1529691 Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Tue, 4 Sep 2018 06:27:26 +0900 Subject: [PATCH] Polish See gh-14293 --- .../cache/CacheMeterBinderProvidersConfiguration.java | 2 +- .../ConfigurationPropertiesReportEndpoint.java | 6 ++---- ...tyRequestMatcherProviderAutoConfigurationTests.java | 2 +- .../src/main/asciidoc/production-ready-features.adoc | 2 +- .../src/main/asciidoc/spring-boot-features.adoc | 10 +++++----- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/cache/CacheMeterBinderProvidersConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/cache/CacheMeterBinderProvidersConfiguration.java index 6cf880182d..c4819ee12b 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/cache/CacheMeterBinderProvidersConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/cache/CacheMeterBinderProvidersConfiguration.java @@ -34,7 +34,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; /** - * {@link Configuration Auto-configuration} for {@link CacheMeterBinderProvider} beans. + * Configure {@link CacheMeterBinderProvider} beans. * * @author Stephane Nicoll */ diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpoint.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpoint.java index 06515af9e6..178e4b74cd 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpoint.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpoint.java @@ -152,13 +152,11 @@ public class ConfigurationPropertiesReportEndpoint implements ApplicationContext * @param prefix the prefix * @return the serialized instance */ + @SuppressWarnings("unchecked") private Map safeSerialize(ObjectMapper mapper, Object bean, String prefix) { try { - @SuppressWarnings("unchecked") - Map result = new HashMap<>( - mapper.convertValue(bean, Map.class)); - return result; + return new HashMap<>(mapper.convertValue(bean, Map.class)); } catch (Exception ex) { return new HashMap<>(Collections.singletonMap("error", diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/SecurityRequestMatcherProviderAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/SecurityRequestMatcherProviderAutoConfigurationTests.java index 8309842d21..74bafb9ad7 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/SecurityRequestMatcherProviderAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/SecurityRequestMatcherProviderAutoConfigurationTests.java @@ -40,7 +40,7 @@ public class SecurityRequestMatcherProviderAutoConfigurationTests { .withUserConfiguration(TestConfiguration.class); @Test - public void registersMvcRequestMatcherProviderForIfMvcPresent() { + public void registersMvcRequestMatcherProviderIfMvcPresent() { this.contextRunner.run((context) -> assertThat(context) .hasSingleBean(MvcRequestMatcherProvider.class)); } diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc index 493e4740dd..28a7816426 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc @@ -543,7 +543,7 @@ Consider the following JSON request body: } ---- -This can be used to invoke a write operation that takes a `String test` and `int counter` +This can be used to invoke a write operation that takes `String name` and `int counter` parameters. TIP: Because endpoints are technology agnostic, only simple types can be specified in the diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc index 56f7ad39b7..bf1eea4b3c 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc @@ -6433,7 +6433,7 @@ mapper, which can be one of the following libraries: * `Gson` * `Jsonb` -TIP: A list of the auto-configuration that is enabled by `@JsonTest` can be +TIP: A list of the auto-configurations that are enabled by `@JsonTest` can be <>. If you need to configure elements of the auto-configuration, you can use the @@ -6611,7 +6611,7 @@ auto-configures the Spring WebFlux infrastructure and limits scanned beans to `WebFluxConfigurer`. Regular `@Component` beans are not scanned when the `@WebFluxTest` annotation is used. -TIP: A list of the auto-configuration that is enabled by `@WebFluxTest` can be +TIP: A list of the auto-configurations that are enabled by `@WebFluxTest` can be <>. TIP: If you need to register extra components, such as Jackson `Module`, you can import @@ -6771,7 +6771,7 @@ following example: `DataSource`. By default, it configures an in-memory embedded database and a `JdbcTemplate`. Regular `@Component` beans are not loaded into the `ApplicationContext`. -TIP: A list of the auto-configuration that is enabled by `@JdbcTest` can be +TIP: A list of the auto-configurations that are enabled by `@JdbcTest` can be <>. By default, JDBC tests are transactional and roll back at the end of each test. See the @@ -6812,7 +6812,7 @@ you can use `@AutoConfigureTestDatabase` to override those settings. (For more a jOOQ with Spring Boot, see "<>", earlier in this chapter.) Regular `@Component` beans are not loaded into the `ApplicationContext`. -TIP: A list of the auto-configuration that is enabled by `@JooqTest` can be +TIP: A list of the auto-configurations that are enabled by `@JooqTest` can be <>. `@JooqTest` configures a `DSLContext`. Regular `@Component` beans are not loaded into the @@ -7197,7 +7197,7 @@ include::{code-examples}/test/autoconfigure/restdocs/restassured/AdvancedConfigu ==== Additional Auto-configuration and Slicing Each slice provides one or more `@AutoConfigure...` annotations that namely defines the auto-configurations that should be included as part of a slice. Additional -auto-configurations can be added by creating a custom `@AutoConfigure` annotation or +auto-configurations can be added by creating a custom `@AutoConfigure...` annotation or simply by adding `@ImportAutoConfiguration` to the test as shown in the following example: [source,java,indent=0]