Fixed visibility of 4.2's additional default converters

Issue: SPR-12175
Issue: SPR-13020
master
Juergen Hoeller 9 years ago
parent 93f77f5d51
commit 91b3caf238
  1. 5
      spring-core/src/main/java/org/springframework/core/convert/support/StreamConverter.java
  2. 2
      spring-core/src/main/java/org/springframework/core/convert/support/StringToCharsetConverter.java

@ -36,7 +36,7 @@ import org.springframework.lang.UsesJava8;
* @since 4.2 * @since 4.2
*/ */
@UsesJava8 @UsesJava8
public class StreamConverter implements ConditionalGenericConverter { class StreamConverter implements ConditionalGenericConverter {
private static final TypeDescriptor STREAM_TYPE = TypeDescriptor.valueOf(Stream.class); private static final TypeDescriptor STREAM_TYPE = TypeDescriptor.valueOf(Stream.class);
@ -107,8 +107,7 @@ public class StreamConverter implements ConditionalGenericConverter {
} }
private Object convertToStream(Object source, TypeDescriptor sourceType, TypeDescriptor streamType) { private Object convertToStream(Object source, TypeDescriptor sourceType, TypeDescriptor streamType) {
TypeDescriptor targetCollection = TypeDescriptor targetCollection = TypeDescriptor.collection(List.class, streamType.getElementTypeDescriptor());
TypeDescriptor.collection(List.class, streamType.getElementTypeDescriptor());
List<?> target = (List<?>) this.conversionService.convert(source, sourceType, targetCollection); List<?> target = (List<?>) this.conversionService.convert(source, sourceType, targetCollection);
return target.stream(); return target.stream();
} }

@ -26,7 +26,7 @@ import org.springframework.core.convert.converter.Converter;
* @author Stephane Nicoll * @author Stephane Nicoll
* @since 4.2 * @since 4.2
*/ */
public class StringToCharsetConverter implements Converter<String, Charset> { class StringToCharsetConverter implements Converter<String, Charset> {
@Override @Override
public Charset convert(String source) { public Charset convert(String source) {

Loading…
Cancel
Save