Skip to content

Commit 1f4124b

Browse files
committed
Merge pull request #13963 from izeye:polish-20180801
* pr/13963: Polish
2 parents 4e45f36 + 94468e5 commit 1f4124b

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/EhCache2CacheAutoConfigurationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import static org.assertj.core.api.Assertions.assertThat;
3232

3333
/**
34-
* Tests for {@link CacheAutoConfigurationTests} with EhCache 2.
34+
* Tests for {@link CacheAutoConfiguration} with EhCache 2.
3535
*
3636
* @author Stephane Nicoll
3737
* @author Andy Wilkinson

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/EhCache3CacheAutoConfigurationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import static org.assertj.core.api.Assertions.assertThat;
3131

3232
/**
33-
* Tests for {@link CacheAutoConfigurationTests} with EhCache 3.
33+
* Tests for {@link CacheAutoConfiguration} with EhCache 3.
3434
*
3535
* @author Stephane Nicoll
3636
* @author Andy Wilkinson

spring-boot-project/spring-boot-docs/src/main/asciidoc/getting-started.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ feature, add the following dependency to your project:
465465
</dependency>
466466
----
467467

468-
WARNING: properties that are added late to the environment, such as when using
468+
WARNING: Properties that are added late to the environment, such as when using
469469
`@PropertySource`, will not be taken into account.
470470

471471
NOTE: Once you're done with the migration, please make sure to remove this module from

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/convert/CollectionToDelimitedStringConverter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@ private Object convert(Collection<?> source, TypeDescriptor sourceType,
7373
}
7474
return source.stream()
7575
.map((element) -> convertElement(element, sourceType, targetType))
76-
.collect(Collectors.joining(getDelimter(sourceType)));
76+
.collect(Collectors.joining(getDelimiter(sourceType)));
7777
}
7878

79-
private CharSequence getDelimter(TypeDescriptor sourceType) {
79+
private CharSequence getDelimiter(TypeDescriptor sourceType) {
8080
Delimiter annotation = sourceType.getAnnotation(Delimiter.class);
8181
return (annotation != null) ? annotation.value() : ",";
8282
}

0 commit comments

Comments
 (0)