From 94468e58659fa3a9cb16f2bf0de0202ce2db02b5 Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Wed, 1 Aug 2018 17:41:15 +0900 Subject: [PATCH] Polish See gh-13963 --- .../cache/EhCache2CacheAutoConfigurationTests.java | 2 +- .../cache/EhCache3CacheAutoConfigurationTests.java | 2 +- .../spring-boot-docs/src/main/asciidoc/getting-started.adoc | 2 +- .../boot/convert/CollectionToDelimitedStringConverter.java | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/EhCache2CacheAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/EhCache2CacheAutoConfigurationTests.java index ee40de1de6..1405aafe30 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/EhCache2CacheAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/EhCache2CacheAutoConfigurationTests.java @@ -31,7 +31,7 @@ import org.springframework.cache.ehcache.EhCacheCacheManager; import static org.assertj.core.api.Assertions.assertThat; /** - * Tests for {@link CacheAutoConfigurationTests} with EhCache 2. + * Tests for {@link CacheAutoConfiguration} with EhCache 2. * * @author Stephane Nicoll * @author Andy Wilkinson diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/EhCache3CacheAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/EhCache3CacheAutoConfigurationTests.java index 8600e2e9d2..f64509cc33 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/EhCache3CacheAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/EhCache3CacheAutoConfigurationTests.java @@ -30,7 +30,7 @@ import org.springframework.core.io.Resource; import static org.assertj.core.api.Assertions.assertThat; /** - * Tests for {@link CacheAutoConfigurationTests} with EhCache 3. + * Tests for {@link CacheAutoConfiguration} with EhCache 3. * * @author Stephane Nicoll * @author Andy Wilkinson diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/getting-started.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/getting-started.adoc index b3fa0b6d1e..1be7d0d177 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/getting-started.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/getting-started.adoc @@ -465,7 +465,7 @@ feature, add the following dependency to your project: ---- -WARNING: properties that are added late to the environment, such as when using +WARNING: Properties that are added late to the environment, such as when using `@PropertySource`, will not be taken into account. NOTE: Once you're done with the migration, please make sure to remove this module from diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/convert/CollectionToDelimitedStringConverter.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/convert/CollectionToDelimitedStringConverter.java index dc016b760c..bc553fb28e 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/convert/CollectionToDelimitedStringConverter.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/convert/CollectionToDelimitedStringConverter.java @@ -73,10 +73,10 @@ final class CollectionToDelimitedStringConverter implements ConditionalGenericCo } return source.stream() .map((element) -> convertElement(element, sourceType, targetType)) - .collect(Collectors.joining(getDelimter(sourceType))); + .collect(Collectors.joining(getDelimiter(sourceType))); } - private CharSequence getDelimter(TypeDescriptor sourceType) { + private CharSequence getDelimiter(TypeDescriptor sourceType) { Delimiter annotation = sourceType.getAnnotation(Delimiter.class); return (annotation != null) ? annotation.value() : ","; }