This is an automated email from the ASF dual-hosted git repository. borinquenkid pushed a commit to branch 8.0.x-hibernate7 in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 6ca2e73c32e9bad7cab9e32de14a67dbd4121001 Author: Walter Duque de Estrada <[email protected]> AuthorDate: Wed Feb 25 23:11:58 2026 -0600 Fix PMD violations in HibernateCriteriaBuilder --- grails-data-hibernate7/core/PMD.md | 20 ++++++++++---------- .../groovy/grails/orm/HibernateCriteriaBuilder.java | 12 +++++++++--- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/grails-data-hibernate7/core/PMD.md b/grails-data-hibernate7/core/PMD.md index 173ec625d3..0e9146a25d 100644 --- a/grails-data-hibernate7/core/PMD.md +++ b/grails-data-hibernate7/core/PMD.md @@ -9,16 +9,16 @@ DataflowAnomalyAnalysis,grails.orm.CriteriaMethodInvoker,210,YES DataflowAnomalyAnalysis,grails.orm.CriteriaMethodInvoker,220,YES DataflowAnomalyAnalysis,grails.orm.CriteriaMethodInvoker,221,YES DataflowAnomalyAnalysis,grails.orm.CriteriaMethodInvoker,240,YES -AvoidFieldNameMatchingMethodName,grails.orm.HibernateCriteriaBuilder,101, -AvoidFieldNameMatchingMethodName,grails.orm.HibernateCriteriaBuilder,102, -AvoidFieldNameMatchingMethodName,grails.orm.HibernateCriteriaBuilder,114, -AvoidFieldNameMatchingMethodName,grails.orm.HibernateCriteriaBuilder,115, -AvoidDuplicateLiterals,grails.orm.HibernateCriteriaBuilder,117, -ConstructorCallsOverridableMethod,grails.orm.HibernateCriteriaBuilder,121, -ConstructorCallsOverridableMethod,grails.orm.HibernateCriteriaBuilder,128, -AvoidDuplicateLiterals,grails.orm.HibernateCriteriaBuilder,504, -CompareObjectsWithEquals,grails.orm.HibernateCriteriaBuilder,855, -NullAssignment,grails.orm.HibernateCriteriaBuilder,1213, +AvoidFieldNameMatchingMethodName,grails.orm.HibernateCriteriaBuilder,101,YES +AvoidFieldNameMatchingMethodName,grails.orm.HibernateCriteriaBuilder,102,YES +AvoidFieldNameMatchingMethodName,grails.orm.HibernateCriteriaBuilder,114,YES +AvoidFieldNameMatchingMethodName,grails.orm.HibernateCriteriaBuilder,115,YES +AvoidDuplicateLiterals,grails.orm.HibernateCriteriaBuilder,117,YES +ConstructorCallsOverridableMethod,grails.orm.HibernateCriteriaBuilder,121,YES +ConstructorCallsOverridableMethod,grails.orm.HibernateCriteriaBuilder,128,YES +AvoidDuplicateLiterals,grails.orm.HibernateCriteriaBuilder,504,YES +CompareObjectsWithEquals,grails.orm.HibernateCriteriaBuilder,855,YES +NullAssignment,grails.orm.HibernateCriteriaBuilder,1213,YES AvoidFieldNameMatchingMethodName,org.grails.orm.hibernate.AbstractHibernateDatastore,112, CloseResource,org.grails.orm.hibernate.AbstractHibernateDatastore,137, CloseResource,org.grails.orm.hibernate.AbstractHibernateDatastore,265, diff --git a/grails-data-hibernate7/core/src/main/groovy/grails/orm/HibernateCriteriaBuilder.java b/grails-data-hibernate7/core/src/main/groovy/grails/orm/HibernateCriteriaBuilder.java index 5dbb7cc5df..1f0b0ab774 100644 --- a/grails-data-hibernate7/core/src/main/groovy/grails/orm/HibernateCriteriaBuilder.java +++ b/grails-data-hibernate7/core/src/main/groovy/grails/orm/HibernateCriteriaBuilder.java @@ -84,6 +84,7 @@ import org.springframework.core.convert.ConversionService; * @author Graeme Rocher */ @Slf4j +@SuppressWarnings("PMD.AvoidDuplicateLiterals") public class HibernateCriteriaBuilder extends GroovyObjectSupport implements BuildableCriteria, ProjectionList { /* @@ -98,7 +99,9 @@ public class HibernateCriteriaBuilder extends GroovyObjectSupport protected CriteriaQuery criteriaQuery; protected boolean uniqueResult = false; protected boolean participate; + @SuppressWarnings("PMD.AvoidFieldNameMatchingMethodName") protected boolean scroll; + @SuppressWarnings("PMD.AvoidFieldNameMatchingMethodName") protected boolean count; protected List<String> aliasStack = new ArrayList<String>(); protected static final String ALIAS = "_alias"; @@ -111,7 +114,9 @@ public class HibernateCriteriaBuilder extends GroovyObjectSupport protected HibernateQuery hibernateQuery; private boolean shouldLock; private boolean shouldCache; + @SuppressWarnings("PMD.AvoidFieldNameMatchingMethodName") private boolean readOnly; + @SuppressWarnings("PMD.AvoidFieldNameMatchingMethodName") protected boolean distinct = false; @SuppressWarnings("rawtypes") @@ -128,7 +133,7 @@ public class HibernateCriteriaBuilder extends GroovyObjectSupport setDefaultFlushMode(GrailsHibernateTemplate.FLUSH_AUTO); } - public void setDatastore(AbstractHibernateDatastore datastore) { + public final void setDatastore(AbstractHibernateDatastore datastore) { this.datastore = datastore; if (MultiTenant.class.isAssignableFrom(targetClass) && datastore.getMultiTenancyMode() == MultiTenancySettings.MultiTenancyMode.DISCRIMINATOR) { @@ -852,7 +857,7 @@ public class HibernateCriteriaBuilder extends GroovyObjectSupport */ @SuppressWarnings("rawtypes") public Criteria eq(String propertyName, Object propertyValue, Map params) { - if (params.get("ignoreCase") == Boolean.TRUE) { + if (Boolean.TRUE.equals(params.get("ignoreCase"))) { hibernateQuery.like(propertyName, "%" + propertyValue.toString() + "%"); } else { hibernateQuery.eq(propertyName, propertyValue); @@ -1208,6 +1213,7 @@ public class HibernateCriteriaBuilder extends GroovyObjectSupport throw t; } + @SuppressWarnings("PMD.NullAssignment") private void closeSessionFollowingException() { closeSession(); criteriaQuery = null; @@ -1224,7 +1230,7 @@ public class HibernateCriteriaBuilder extends GroovyObjectSupport return defaultFlushMode; } - public void setDefaultFlushMode(int defaultFlushMode) { + public final void setDefaultFlushMode(int defaultFlushMode) { this.defaultFlushMode = defaultFlushMode; } }
