Merge pull request #13963 from izeye:polish-20180801

* pr/13963:
  Polish
pull/14003/head
Stephane Nicoll 6 years ago
commit 1f4124b695

@ -31,7 +31,7 @@ import org.springframework.cache.ehcache.EhCacheCacheManager;
import static org.assertj.core.api.Assertions.assertThat; 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 Stephane Nicoll
* @author Andy Wilkinson * @author Andy Wilkinson

@ -30,7 +30,7 @@ import org.springframework.core.io.Resource;
import static org.assertj.core.api.Assertions.assertThat; 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 Stephane Nicoll
* @author Andy Wilkinson * @author Andy Wilkinson

@ -465,7 +465,7 @@ feature, add the following dependency to your project:
</dependency> </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. `@PropertySource`, will not be taken into account.
NOTE: Once you're done with the migration, please make sure to remove this module from NOTE: Once you're done with the migration, please make sure to remove this module from

@ -73,10 +73,10 @@ final class CollectionToDelimitedStringConverter implements ConditionalGenericCo
} }
return source.stream() return source.stream()
.map((element) -> convertElement(element, sourceType, targetType)) .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); Delimiter annotation = sourceType.getAnnotation(Delimiter.class);
return (annotation != null) ? annotation.value() : ","; return (annotation != null) ? annotation.value() : ",";
} }

Loading…
Cancel
Save