Skip to content

Commit 9c4753f

Browse files
committed
DATAJDBC-598 - Adapt to changed Spring Framework CollectionUtils.
CollectionUtils.arrayToList(…) now returns List<?> which isn't compatible with Collection<Object>.
1 parent 378736c commit 9c4753f

File tree

1 file changed

+3
-1
lines changed
  • spring-data-relational/src/main/java/org/springframework/data/relational/repository/query

1 file changed

+3
-1
lines changed

spring-data-relational/src/main/java/org/springframework/data/relational/repository/query/CriteriaFactory.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package org.springframework.data.relational.repository.query;
1717

18+
import java.util.Arrays;
1819
import java.util.Collection;
1920
import java.util.Collections;
2021

@@ -23,6 +24,7 @@
2324
import org.springframework.data.repository.query.parser.Part;
2425
import org.springframework.util.Assert;
2526
import org.springframework.util.CollectionUtils;
27+
import org.springframework.util.ObjectUtils;
2628

2729
/**
2830
* Simple factory to contain logic to create {@link Criteria}s from {@link Part}s.
@@ -176,7 +178,7 @@ private static Collection<Object> asCollection(Object value) {
176178
}
177179

178180
if (value.getClass().isArray()) {
179-
return CollectionUtils.arrayToList(value);
181+
return Arrays.asList(ObjectUtils.toObjectArray(value));
180182
}
181183

182184
return Collections.singletonList(value);

0 commit comments

Comments
 (0)