From 298c1c6e3c2a50e96dc6b0d83df6d18431bd0e5f Mon Sep 17 00:00:00 2001
From: Mark Paluch <mark.paluch@broadcom.com>
Date: Wed, 14 Aug 2024 10:15:05 +0200
Subject: [PATCH] Polishing.

Consistently convert Iterable to Collection for identifier parameters.

See #3580
---
 .../support/SimpleJpaRepository.java          | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/SimpleJpaRepository.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/SimpleJpaRepository.java
index 7ee27c1304..80bb93431b 100644
--- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/SimpleJpaRepository.java
+++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/SimpleJpaRepository.java
@@ -40,8 +40,6 @@
 import java.util.Optional;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
-import java.util.stream.Collectors;
-import java.util.stream.StreamSupport;
 
 import org.springframework.data.domain.Example;
 import org.springframework.data.domain.KeysetScrollPosition;
@@ -246,14 +244,8 @@ public void deleteAllByIdInBatch(Iterable<ID> ids) {
 			/*
 			 * Some JPA providers require {@code ids} to be a {@link Collection} so we must convert if it's not already.
 			 */
-
-			if (ids instanceof Collection) {
-				query.setParameter("ids", ids);
-			} else {
-				Collection<ID> idsCollection = StreamSupport.stream(ids.spliterator(), false)
-						.collect(Collectors.toCollection(ArrayList::new));
-				query.setParameter("ids", idsCollection);
-			}
+			Collection<ID> idCollection = toCollection(ids);
+			query.setParameter("ids", idCollection);
 
 			applyQueryHints(query);
 
@@ -414,7 +406,7 @@ public List<T> findAllById(Iterable<ID> ids) {
 			return results;
 		}
 
-		Collection<ID> idCollection = Streamable.of(ids).toList();
+		Collection<ID> idCollection = toCollection(ids);
 
 		ByIdsSpecification<T> specification = new ByIdsSpecification<>(entityInformation);
 		TypedQuery<T> query = getQuery(specification, Sort.unsorted());
@@ -918,6 +910,11 @@ private ProjectionFactory getProjectionFactory() {
 		return projectionFactory;
 	}
 
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	private static <T> Collection<T> toCollection(Iterable<T> ids) {
+		return ids instanceof Collection c ? c : Streamable.of(ids).toList();
+	}
+
 	/**
 	 * Executes a count query and transparently sums up all values returned.
 	 *