This is an automated email from the ASF dual-hosted git repository. borinquenkid pushed a commit to branch test/document-datamapping-core-finders in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 6a3ca3c0ab8954569ae6add8ffeec9e2fee41d30 Author: Walter Duque de Estrada <[email protected]> AuthorDate: Sat Aug 15 14:34:15 2026 -0500 Fix IntelliJ raw-type warnings on CountFinder FinderMethod declares invoke(Class, String, ...) with raw Class/ Closure parameters (suppressed at the interface level), so every override necessarily reintroduces the same raw-type warning at its own call site - IntelliJ flags each override individually, and ListOrderByFinder already suppresses per-method for the same reason. Apply the same @SuppressWarnings("rawtypes") to CountFinder's three invoke overloads, including the DetachedCriteria one, which stays raw to match DynamicFinderInvocation.setDetachedCriteria's existing raw parameter type rather than diverging from it. Co-Authored-By: Claude Sonnet 5 <[email protected]> --- .../org/grails/datastore/gorm/finders/CountFinder.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/finders/CountFinder.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/finders/CountFinder.java index 3057c50fa8..4a532c8b91 100644 --- a/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/finders/CountFinder.java +++ b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/finders/CountFinder.java @@ -25,7 +25,6 @@ import groovy.lang.Closure; import grails.gorm.DetachedCriteria; import org.grails.datastore.mapping.core.Datastore; import org.grails.datastore.mapping.core.Session; -import org.grails.datastore.mapping.core.SessionCallback; import org.grails.datastore.mapping.model.MappingContext; import org.grails.datastore.mapping.query.Query; @@ -71,11 +70,13 @@ public class CountFinder implements FinderMethod, QueryBuildingFinder { } @Override + @SuppressWarnings("rawtypes") public Object invoke(Class clazz, String methodName, Object[] arguments) { return invoke(clazz, methodName, (Closure) null, arguments); } @Override + @SuppressWarnings("rawtypes") public Object invoke(Class clazz, String methodName, Closure additionalCriteria, Object[] arguments) { DynamicFinderInvocation invocation = grammar.createFinderInvocation(clazz, methodName, additionalCriteria, arguments); return doInvoke(invocation); @@ -92,6 +93,7 @@ public class CountFinder implements FinderMethod, QueryBuildingFinder { * @param arguments The method call arguments * @return The result of the method call */ + @SuppressWarnings("rawtypes") public Object invoke(Class clazz, String methodName, DetachedCriteria detachedCriteria, Object[] arguments) { DynamicFinderInvocation invocation = grammar.createFinderInvocation(clazz, methodName, null, arguments); if (detachedCriteria != null) { @@ -101,12 +103,9 @@ public class CountFinder implements FinderMethod, QueryBuildingFinder { } private Object doInvoke(final DynamicFinderInvocation invocation) { - return FinderSupport.execute(datastore, new SessionCallback<Object>() { - @Override - public Object doInSession(Session session) { - Query query = buildQuery(invocation, session); - return query.singleResult(); - } + return FinderSupport.execute(datastore, session -> { + Query query = buildQuery(invocation, session); + return query.singleResult(); }); } @@ -129,7 +128,6 @@ public class CountFinder implements FinderMethod, QueryBuildingFinder { * @param query The already-created query to apply criteria to * @return The same query, for chaining */ - @SuppressWarnings("unchecked") public static Query applyCriteriaAndCount(DynamicFinderInvocation invocation, Class<?> clazz, Query query) { DynamicFinder.applyAdditionalCriteria(query, invocation.getCriteria()); DynamicFinder.applyDetachedCriteria(query, invocation.getDetachedCriteria());
