root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '2.0.x'

This commit is contained in:
Stephane Nicoll 2018-08-01 11:05:49 +02:00
parent 0c1b229764 1f4124b695
commit 960817a8c6
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/EhCache2CacheAutoConfigurationTests.java vendored
View File

@ -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

2
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/EhCache3CacheAutoConfigurationTests.java vendored
View File

@ -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

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

@ -465,7 +465,7 @@ feature, add the following dependency to your project:
</dependency>
----
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

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

@ -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() : ",";
}