From 9c4753f3a5e053bd15bb7fd7d2aa120453c0feeb Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 9 Sep 2020 13:58:01 +0200 Subject: [PATCH] DATAJDBC-598 - Adapt to changed Spring Framework CollectionUtils. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit CollectionUtils.arrayToList(…) now returns List which isn't compatible with Collection. --- .../data/relational/repository/query/CriteriaFactory.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/repository/query/CriteriaFactory.java b/spring-data-relational/src/main/java/org/springframework/data/relational/repository/query/CriteriaFactory.java index fed7dfe2..a20a1c7c 100644 --- a/spring-data-relational/src/main/java/org/springframework/data/relational/repository/query/CriteriaFactory.java +++ b/spring-data-relational/src/main/java/org/springframework/data/relational/repository/query/CriteriaFactory.java @@ -15,6 +15,7 @@ */ package org.springframework.data.relational.repository.query; +import java.util.Arrays; import java.util.Collection; import java.util.Collections; @@ -23,6 +24,7 @@ import org.springframework.data.relational.core.sql.Expression; import org.springframework.data.repository.query.parser.Part; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; +import org.springframework.util.ObjectUtils; /** * Simple factory to contain logic to create {@link Criteria}s from {@link Part}s. @@ -176,7 +178,7 @@ class CriteriaFactory { } if (value.getClass().isArray()) { - return CollectionUtils.arrayToList(value); + return Arrays.asList(ObjectUtils.toObjectArray(value)); } return Collections.singletonList(value);