Skip to content

Commit ca57e58

Browse files
izeyesnicoll
authored andcommitted
Polish
See gh-14293
1 parent 77a5259 commit ca57e58

File tree

5 files changed

+10
-12
lines changed

5 files changed

+10
-12
lines changed

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/cache/CacheMeterBinderProvidersConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import org.springframework.context.annotation.Configuration;
3535

3636
/**
37-
* {@link Configuration Auto-configuration} for {@link CacheMeterBinderProvider} beans.
37+
* Configure {@link CacheMeterBinderProvider} beans.
3838
*
3939
* @author Stephane Nicoll
4040
*/

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpoint.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,13 +152,11 @@ private Map<String, Object> getConfigurationPropertiesBeans(
152152
* @param prefix the prefix
153153
* @return the serialized instance
154154
*/
155+
@SuppressWarnings("unchecked")
155156
private Map<String, Object> safeSerialize(ObjectMapper mapper, Object bean,
156157
String prefix) {
157158
try {
158-
@SuppressWarnings("unchecked")
159-
Map<String, Object> result = new HashMap<>(
160-
mapper.convertValue(bean, Map.class));
161-
return result;
159+
return new HashMap<>(mapper.convertValue(bean, Map.class));
162160
}
163161
catch (Exception ex) {
164162
return new HashMap<>(Collections.singletonMap("error",

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/SecurityRequestMatcherProviderAutoConfigurationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public class SecurityRequestMatcherProviderAutoConfigurationTests {
4040
.withUserConfiguration(TestConfiguration.class);
4141

4242
@Test
43-
public void registersMvcRequestMatcherProviderForIfMvcPresent() {
43+
public void registersMvcRequestMatcherProviderIfMvcPresent() {
4444
this.contextRunner.run((context) -> assertThat(context)
4545
.hasSingleBean(MvcRequestMatcherProvider.class));
4646
}

spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,7 @@ Consider the following JSON request body:
543543
}
544544
----
545545

546-
This can be used to invoke a write operation that takes a `String test` and `int counter`
546+
This can be used to invoke a write operation that takes `String name` and `int counter`
547547
parameters.
548548

549549
TIP: Because endpoints are technology agnostic, only simple types can be specified in the

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6433,7 +6433,7 @@ mapper, which can be one of the following libraries:
64336433
* `Gson`
64346434
* `Jsonb`
64356435

6436-
TIP: A list of the auto-configuration that is enabled by `@JsonTest` can be
6436+
TIP: A list of the auto-configurations that are enabled by `@JsonTest` can be
64376437
<<appendix-test-auto-configuration#test-auto-configuration,found in the appendix>>.
64386438

64396439
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
66116611
`WebFluxConfigurer`. Regular `@Component` beans are not scanned when the `@WebFluxTest`
66126612
annotation is used.
66136613

6614-
TIP: A list of the auto-configuration that is enabled by `@WebFluxTest` can be
6614+
TIP: A list of the auto-configurations that are enabled by `@WebFluxTest` can be
66156615
<<appendix-test-auto-configuration#test-auto-configuration,found in the appendix>>.
66166616

66176617
TIP: If you need to register extra components, such as Jackson `Module`, you can import
@@ -6771,7 +6771,7 @@ following example:
67716771
`DataSource`. By default, it configures an in-memory embedded database and a
67726772
`JdbcTemplate`. Regular `@Component` beans are not loaded into the `ApplicationContext`.
67736773

6774-
TIP: A list of the auto-configuration that is enabled by `@JdbcTest` can be
6774+
TIP: A list of the auto-configurations that are enabled by `@JdbcTest` can be
67756775
<<appendix-test-auto-configuration#test-auto-configuration,found in the appendix>>.
67766776

67776777
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
68126812
jOOQ with Spring Boot, see "<<boot-features-jooq>>", earlier in this chapter.) Regular
68136813
`@Component` beans are not loaded into the `ApplicationContext`.
68146814

6815-
TIP: A list of the auto-configuration that is enabled by `@JooqTest` can be
6815+
TIP: A list of the auto-configurations that are enabled by `@JooqTest` can be
68166816
<<appendix-test-auto-configuration#test-auto-configuration,found in the appendix>>.
68176817

68186818
`@JooqTest` configures a `DSLContext`. Regular `@Component` beans are not loaded into the
@@ -7197,7 +7197,7 @@ include::{code-examples}/test/autoconfigure/restdocs/restassured/AdvancedConfigu
71977197
==== Additional Auto-configuration and Slicing
71987198
Each slice provides one or more `@AutoConfigure...` annotations that namely defines the
71997199
auto-configurations that should be included as part of a slice. Additional
7200-
auto-configurations can be added by creating a custom `@AutoConfigure` annotation or
7200+
auto-configurations can be added by creating a custom `@AutoConfigure...` annotation or
72017201
simply by adding `@ImportAutoConfiguration` to the test as shown in the following example:
72027202

72037203
[source,java,indent=0]

0 commit comments

Comments
 (0)