Skip to content

Commit 8d8357e

Browse files
committed
Merge pull request #11075 from izeye/polish-20171118
* pr/11075: Polish
2 parents 7ff2cb5 + 73c6528 commit 8d8357e

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
lines changed

ci/README.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ $ fly -t spring set-pipeline -p spring-boot -c ci/pipeline.yml -l ci/parameters.
88
----
99

1010
NOTE: This assumes that you have credhub integration configured with the appropriate
11-
secrets
11+
secrets.
1212

1313
=== Release
1414

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/asciidoc/endpoints/loggers.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ include::{snippets}loggers/single/http-response.adoc[]
4646

4747

4848

49-
[[loggerse-single-response-structure]]
49+
[[loggers-single-response-structure]]
5050
=== Response Structure
5151

5252
The response contains details of the requested logger. The following table describes the

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/asciidoc/endpoints/shutdown.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ include::{snippets}shutdown/http-response.adoc[]
1919

2020

2121

22-
[[shutdowm-shutting-down-response-structure]]
22+
[[shutdown-shutting-down-response-structure]]
2323
=== Response Structure
2424

2525
The response contains details of the result of the shutdown request. The following table

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveSecurityAutoConfigurationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public void configuresADefaultUser() {
7575
}
7676

7777
@Test
78-
public void doesNotConfigureDefaultUserIfUserDetailsRepositoryAvailable() {
78+
public void doesNotConfigureDefaultUserIfUserDetailsServiceAvailable() {
7979
this.contextRunner.withUserConfiguration(UserConfig.class, TestConfig.class)
8080
.withConfiguration(
8181
AutoConfigurations.of(ReactiveSecurityAutoConfiguration.class))

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6686,7 +6686,7 @@ It then becomes important not to litter the application's main class with config
66866686
settings that are specific to a particular area of its functionality.
66876687

66886688
Assume that you are using Spring Batch and you rely on the auto-configuration for it.
6689-
Your could define your `@SpringBootApplication` as follows:
6689+
You could define your `@SpringBootApplication` as follows:
66906690

66916691
[source,java,indent=0]
66926692
----
@@ -6708,7 +6708,7 @@ at the same level as your application, as shown in the following example:
67086708
----
67096709

67106710
NOTE: Depending on the complexity of your application, you may either have a single
6711-
`ApplicationConfiguration` class for your customizations or one class per domain area when
6711+
`@Configuration` class for your customizations or one class per domain area when
67126712
it makes sense. The latter approach lets you enable it in one of your tests, if necessary,
67136713
with the `@Import` annotation.
67146714

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/CollectionBinderTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ public void bindToBeanWithNestedCollectionShouldPopulateCollection()
362362
Bindable<BeanWithNestedCollection> target = Bindable
363363
.of(BeanWithNestedCollection.class);
364364
BeanWithNestedCollection foo = this.binder.bind("foo", target).get();
365-
assertThat(foo.getValue()).isNotNull();
365+
assertThat(foo.getValue()).isEqualTo("one");
366366
assertThat(foo.getFoos().get(0).getValue()).isEqualTo("two");
367367
assertThat(foo.getFoos().get(1).getValue()).isEqualTo("three");
368368
}

spring-boot-samples/spring-boot-sample-secure-webflux/src/main/java/sample/secure/webflux/SampleSecureWebFluxApplication.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public RouterFunction<ServerResponse> monoRouterFunction(EchoHandler echoHandler
4141
}
4242

4343
@Bean
44-
public ReactiveUserDetailsService userDetailsRepository() {
44+
public ReactiveUserDetailsService userDetailsService() {
4545
return new MapReactiveUserDetailsService(User.withDefaultPasswordEncoder()
4646
.username("foo").password("password").roles("USER").build());
4747
}

0 commit comments

Comments
 (0)