Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Reactor 2

Browse Source 
Issue: SPR-12599
This commit is contained in:
Stephane Maldini
2015-04-23 18:38:52 +01:00
committed by Rossen Stoyanchev
parent 122d3476d9
commit 74c0250525
13 changed files with 389 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-core/src/main/java/org/springframework/core/convert/support/StreamConverter.java
View File

@@ -99,7 +99,7 @@ public class StreamConverter implements ConditionalGenericConverter {
}
private Object convertFromStream(Stream<?> source, TypeDescriptor streamType, TypeDescriptor targetType) {
List<Object> content = source.collect(Collectors.toList());
List<Object> content = source.collect(Collectors.<Object>toList());
TypeDescriptor listType = TypeDescriptor.collection(List.class, streamType.getElementTypeDescriptor());
return this.conversionService.convert(content, listType, targetType);
}