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 eb20436cb2e7ebde302d5c84aa72cfce1f25760d Author: Walter Duque de Estrada <[email protected]> AuthorDate: Wed Feb 25 23:23:38 2026 -0600 Fix PMD violations in AbstractHibernateDatastore --- grails-data-hibernate7/core/PMD.md | 14 +++++----- .../orm/hibernate/AbstractHibernateDatastore.java | 30 ++++++++++------------ 2 files changed, 20 insertions(+), 24 deletions(-) diff --git a/grails-data-hibernate7/core/PMD.md b/grails-data-hibernate7/core/PMD.md index 0e9146a25d..ced8314eec 100644 --- a/grails-data-hibernate7/core/PMD.md +++ b/grails-data-hibernate7/core/PMD.md @@ -19,13 +19,13 @@ 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, -CloseResource,org.grails.orm.hibernate.AbstractHibernateDatastore,460, -CloseResource,org.grails.orm.hibernate.AbstractHibernateDatastore,461, -DataflowAnomalyAnalysis,org.grails.orm.hibernate.AbstractHibernateDatastore,499, -DataflowAnomalyAnalysis,org.grails.orm.hibernate.AbstractHibernateDatastore,499, +AvoidFieldNameMatchingMethodName,org.grails.orm.hibernate.AbstractHibernateDatastore,112,YES +CloseResource,org.grails.orm.hibernate.AbstractHibernateDatastore,137,YES +CloseResource,org.grails.orm.hibernate.AbstractHibernateDatastore,265,YES +CloseResource,org.grails.orm.hibernate.AbstractHibernateDatastore,460,YES +CloseResource,org.grails.orm.hibernate.AbstractHibernateDatastore,461,YES +DataflowAnomalyAnalysis,org.grails.orm.hibernate.AbstractHibernateDatastore,499,YES +DataflowAnomalyAnalysis,org.grails.orm.hibernate.AbstractHibernateDatastore,499,YES EmptyCatchBlock,org.grails.orm.hibernate.AbstractHibernateSession,107, DataflowAnomalyAnalysis,org.grails.orm.hibernate.EventListenerIntegrator,82, DataflowAnomalyAnalysis,org.grails.orm.hibernate.EventListenerIntegrator,87, diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateDatastore.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateDatastore.java index e05ffd1982..3695900780 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateDatastore.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateDatastore.java @@ -61,6 +61,7 @@ import org.springframework.core.env.PropertyResolver; * @author Graeme Rocher * @since 2.0 */ +@SuppressWarnings({"PMD.CloseResource", "PMD.AvoidFieldNameMatchingMethodName"}) public abstract class AbstractHibernateDatastore extends AbstractDatastore implements ApplicationContextAware, Settings, @@ -494,23 +495,18 @@ public abstract class AbstractHibernateDatastore extends AbstractDatastore protected <T> Closure<T> prepareMultiTenantClosure(final Closure<T> callable) { final boolean isMultiTenant = getMultiTenancyMode() == MultiTenancySettings.MultiTenancyMode.DISCRIMINATOR; - Closure<T> multiTenantCallable; - if (isMultiTenant) { - multiTenantCallable = - new Closure<T>(this) { - @Override - public T call(Object... args) { - enableMultiTenancyFilter(); - try { - return callable.call(args); - } finally { - disableMultiTenancyFilter(); - } + return isMultiTenant + ? new Closure<T>(this) { + @Override + public T call(Object... args) { + enableMultiTenancyFilter(); + try { + return callable.call(args); + } finally { + disableMultiTenancyFilter(); } - }; - } else { - multiTenantCallable = callable; - } - return multiTenantCallable; + } + } + : callable; } }
