DATACMNS-1182 - Reinstantiate Java 6 compatibility of QueryExecutionConverters.

Replace reference to JDK 8's Stream through lenient reflection lookup.
This commit is contained in:
Oliver Gierke
2017-10-01 18:36:06 +02:00
parent 8c6c2da0ba
commit cd1efe45fd

View File

@@ -32,7 +32,6 @@ import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Future;
import java.util.function.Supplier;
import java.util.stream.Stream;
import org.springframework.core.convert.ConversionService;
import org.springframework.core.convert.TypeDescriptor;
@@ -257,7 +256,7 @@ public abstract class QueryExecutionConverters {
boolean needToUnwrap = Iterable.class.isAssignableFrom(rawType) //
|| rawType.isArray() //
|| supports(rawType) //
|| Stream.class.isAssignableFrom(rawType);
|| org.springframework.data.util.ReflectionUtils.isJava8StreamType(rawType);
return needToUnwrap ? unwrapWrapperTypes(type.getComponentType()) : type;
}