From 865fd00edadd627d3a43f7d3d35feed48e2cba77 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 7 Jan 2025 16:59:21 +0100 Subject: [PATCH] Polishing. Fix class visibility. See #3719. --- .../data/jpa/repository/query/JpaCountQueryCreator.java | 6 ++---- .../jpa/repository/query/ParameterMetadataProvider.java | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/JpaCountQueryCreator.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/JpaCountQueryCreator.java index e0c6892855..59aecf0bca 100644 --- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/JpaCountQueryCreator.java +++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/JpaCountQueryCreator.java @@ -36,7 +36,7 @@ */ public class JpaCountQueryCreator extends JpaQueryCreator { - private boolean distinct; + private final boolean distinct; /** * Creates a new {@link JpaCountQueryCreator}. @@ -56,20 +56,18 @@ public JpaCountQueryCreator(PartTree tree, ReturnedType type, CriteriaBuilder bu @Override protected CriteriaQuery createCriteriaQuery(CriteriaBuilder builder, ReturnedType type) { - return builder.createQuery(Long.class); } @Override @SuppressWarnings("unchecked") protected CriteriaQuery complete(@Nullable Predicate predicate, Sort sort, - CriteriaQuery query, CriteriaBuilder builder, Root root) { + CriteriaQuery query, CriteriaBuilder builder, Root root) { CriteriaQuery select = query.select(getCountQuery(builder, root)); return predicate == null ? select : select.where(predicate); } - @SuppressWarnings("rawtypes") private Expression getCountQuery(CriteriaBuilder builder, Root root) { return distinct ? builder.countDistinct(root) : builder.count(root); diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/ParameterMetadataProvider.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/ParameterMetadataProvider.java index 3c858dd814..f269c8a51f 100644 --- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/ParameterMetadataProvider.java +++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/ParameterMetadataProvider.java @@ -54,7 +54,7 @@ * @author Donghun Shin * @author Greg Turnquist */ -class ParameterMetadataProvider { +public class ParameterMetadataProvider { private final CriteriaBuilder builder; private final Iterator parameters; @@ -191,7 +191,7 @@ EscapeCharacter getEscape() { * @author Andrey Kovalev * @param */ - static class ParameterMetadata { + public static class ParameterMetadata { static final Object PLACEHOLDER = new Object();