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

Polishing.

Browse Source 
Consistently convert Iterable to Collection for identifier parameters.

See #3580
This commit is contained in:
Mark Paluch
2024-08-14 10:15:05 +02:00
parent f7aed2a333
commit 298c1c6e3c
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/SimpleJpaRepository.java
View File

@@ -40,8 +40,6 @@ import java.util.Map;
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 class SimpleJpaRepository<T, ID> implements JpaRepositoryImplementation<T
/*
* 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 class SimpleJpaRepository<T, ID> implements JpaRepositoryImplementation<T
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 @@ public class SimpleJpaRepository<T, ID> implements JpaRepositoryImplementation<T
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.
*