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 f5e236019df50f08117b3efe8f55b70a8a2933cd Author: Walter Duque de Estrada <[email protected]> AuthorDate: Thu Feb 26 12:18:15 2026 -0600 Fix PMD issues in HibernateDatastore --- grails-data-hibernate7/core/PMD.md | 86 +++++++++++----------- .../grails/orm/hibernate/HibernateDatastore.java | 11 ++- 2 files changed, 51 insertions(+), 46 deletions(-) diff --git a/grails-data-hibernate7/core/PMD.md b/grails-data-hibernate7/core/PMD.md index df4e1b2667..90359d002c 100644 --- a/grails-data-hibernate7/core/PMD.md +++ b/grails-data-hibernate7/core/PMD.md @@ -54,49 +54,49 @@ CloseResource,org.grails.orm.hibernate.GrailsSessionContext,209,YES DataflowAnomalyAnalysis,org.grails.orm.hibernate.GrailsSessionContext,209,YES DataflowAnomalyAnalysis,org.grails.orm.hibernate.GrailsSessionContext,209,YES CloseResource,org.grails.orm.hibernate.GrailsSessionContext,213,YES -ConstructorCallsOverridableMethod,org.grails.orm.hibernate.HibernateDatastore,111, -CloseResource,org.grails.orm.hibernate.HibernateDatastore,113, -ConstructorCallsOverridableMethod,org.grails.orm.hibernate.HibernateDatastore,131, -ConstructorCallsOverridableMethod,org.grails.orm.hibernate.HibernateDatastore,132, -CloseResource,org.grails.orm.hibernate.HibernateDatastore,144, -CloseResource,org.grails.orm.hibernate.HibernateDatastore,147, -CloseResource,org.grails.orm.hibernate.HibernateDatastore,150, -DataflowAnomalyAnalysis,org.grails.orm.hibernate.HibernateDatastore,150, -DataflowAnomalyAnalysis,org.grails.orm.hibernate.HibernateDatastore,150, -CloseResource,org.grails.orm.hibernate.HibernateDatastore,153, -ConstructorCallsOverridableMethod,org.grails.orm.hibernate.HibernateDatastore,198, -ConstructorCallsOverridableMethod,org.grails.orm.hibernate.HibernateDatastore,198, -ConstructorCallsOverridableMethod,org.grails.orm.hibernate.HibernateDatastore,198, -CloseResource,org.grails.orm.hibernate.HibernateDatastore,488, -CloseResource,org.grails.orm.hibernate.HibernateDatastore,542, -CompareObjectsWithEquals,org.grails.orm.hibernate.HibernateDatastore,543, -CloseResource,org.grails.orm.hibernate.HibernateDatastore,580, -DataflowAnomalyAnalysis,org.grails.orm.hibernate.HibernateDatastore,581, -DataflowAnomalyAnalysis,org.grails.orm.hibernate.HibernateDatastore,582, -DataflowAnomalyAnalysis,org.grails.orm.hibernate.HibernateDatastore,589, -CloseResource,org.grails.orm.hibernate.HibernateDatastore,632, -CloseResource,org.grails.orm.hibernate.HibernateDatastore,641, -DataflowAnomalyAnalysis,org.grails.orm.hibernate.HibernateDatastore,669, -DataflowAnomalyAnalysis,org.grails.orm.hibernate.HibernateDatastore,669, -DataflowAnomalyAnalysis,org.grails.orm.hibernate.HibernateDatastore,669, -DataflowAnomalyAnalysis,org.grails.orm.hibernate.HibernateDatastore,669, -CloseResource,org.grails.orm.hibernate.HibernateDatastore,671, -DataflowAnomalyAnalysis,org.grails.orm.hibernate.HibernateDatastore,671, -DataflowAnomalyAnalysis,org.grails.orm.hibernate.HibernateDatastore,671, -DataflowAnomalyAnalysis,org.grails.orm.hibernate.HibernateDatastore,671, -DataflowAnomalyAnalysis,org.grails.orm.hibernate.HibernateDatastore,671, -DataflowAnomalyAnalysis,org.grails.orm.hibernate.HibernateDatastore,675, -DataflowAnomalyAnalysis,org.grails.orm.hibernate.HibernateDatastore,675, -DataflowAnomalyAnalysis,org.grails.orm.hibernate.HibernateDatastore,675, -DataflowAnomalyAnalysis,org.grails.orm.hibernate.HibernateDatastore,675, -EmptyCatchBlock,org.grails.orm.hibernate.HibernateDatastore,707, -CloseResource,org.grails.orm.hibernate.HibernateDatastore,731, -CloseResource,org.grails.orm.hibernate.HibernateDatastore,733, -CloseResource,org.grails.orm.hibernate.HibernateDatastore,736, -CloseResource,org.grails.orm.hibernate.HibernateDatastore,739, -DataflowAnomalyAnalysis,org.grails.orm.hibernate.HibernateDatastore,751, -CloseResource,org.grails.orm.hibernate.HibernateDatastore,752, -DataflowAnomalyAnalysis,org.grails.orm.hibernate.HibernateDatastore,760, +ConstructorCallsOverridableMethod,org.grails.orm.hibernate.HibernateDatastore,111,YES +CloseResource,org.grails.orm.hibernate.HibernateDatastore,113,YES +ConstructorCallsOverridableMethod,org.grails.orm.hibernate.HibernateDatastore,131,YES +ConstructorCallsOverridableMethod,org.grails.orm.hibernate.HibernateDatastore,132,YES +CloseResource,org.grails.orm.hibernate.HibernateDatastore,144,YES +CloseResource,org.grails.orm.hibernate.HibernateDatastore,147,YES +CloseResource,org.grails.orm.hibernate.HibernateDatastore,150,YES +DataflowAnomalyAnalysis,org.grails.orm.hibernate.HibernateDatastore,150,YES +DataflowAnomalyAnalysis,org.grails.orm.hibernate.HibernateDatastore,150,YES +CloseResource,org.grails.orm.hibernate.HibernateDatastore,153,YES +ConstructorCallsOverridableMethod,org.grails.orm.hibernate.HibernateDatastore,198,YES +ConstructorCallsOverridableMethod,org.grails.orm.hibernate.HibernateDatastore,198,YES +ConstructorCallsOverridableMethod,org.grails.orm.hibernate.HibernateDatastore,198,YES +CloseResource,org.grails.orm.hibernate.HibernateDatastore,488,YES +CloseResource,org.grails.orm.hibernate.HibernateDatastore,542,YES +CompareObjectsWithEquals,org.grails.orm.hibernate.HibernateDatastore,543,YES +CloseResource,org.grails.orm.hibernate.HibernateDatastore,580,YES +DataflowAnomalyAnalysis,org.grails.orm.hibernate.HibernateDatastore,581,YES +DataflowAnomalyAnalysis,org.grails.orm.hibernate.HibernateDatastore,582,YES +DataflowAnomalyAnalysis,org.grails.orm.hibernate.HibernateDatastore,589,YES +CloseResource,org.grails.orm.hibernate.HibernateDatastore,632,YES +CloseResource,org.grails.orm.hibernate.HibernateDatastore,641,YES +DataflowAnomalyAnalysis,org.grails.orm.hibernate.HibernateDatastore,669,YES +DataflowAnomalyAnalysis,org.grails.orm.hibernate.HibernateDatastore,669,YES +DataflowAnomalyAnalysis,org.grails.orm.hibernate.HibernateDatastore,669,YES +DataflowAnomalyAnalysis,org.grails.orm.hibernate.HibernateDatastore,669,YES +CloseResource,org.grails.orm.hibernate.HibernateDatastore,671,YES +DataflowAnomalyAnalysis,org.grails.orm.hibernate.HibernateDatastore,671,YES +DataflowAnomalyAnalysis,org.grails.orm.hibernate.HibernateDatastore,671,YES +DataflowAnomalyAnalysis,org.grails.orm.hibernate.HibernateDatastore,671,YES +DataflowAnomalyAnalysis,org.grails.orm.hibernate.HibernateDatastore,671,YES +DataflowAnomalyAnalysis,org.grails.orm.hibernate.HibernateDatastore,675,YES +DataflowAnomalyAnalysis,org.grails.orm.hibernate.HibernateDatastore,675,YES +DataflowAnomalyAnalysis,org.grails.orm.hibernate.HibernateDatastore,675,YES +DataflowAnomalyAnalysis,org.grails.orm.hibernate.HibernateDatastore,675,YES +EmptyCatchBlock,org.grails.orm.hibernate.HibernateDatastore,707,YES +CloseResource,org.grails.orm.hibernate.HibernateDatastore,731,YES +CloseResource,org.grails.orm.hibernate.HibernateDatastore,733,YES +CloseResource,org.grails.orm.hibernate.HibernateDatastore,736,YES +CloseResource,org.grails.orm.hibernate.HibernateDatastore,739,YES +DataflowAnomalyAnalysis,org.grails.orm.hibernate.HibernateDatastore,751,YES +CloseResource,org.grails.orm.hibernate.HibernateDatastore,752,YES +DataflowAnomalyAnalysis,org.grails.orm.hibernate.HibernateDatastore,760,YES DataflowAnomalyAnalysis,org.grails.orm.hibernate.HibernateSession,80, DataflowAnomalyAnalysis,org.grails.orm.hibernate.HibernateSession,183, NullAssignment,org.grails.orm.hibernate.access.TraitPropertyAccessStrategy,50, diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/HibernateDatastore.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/HibernateDatastore.java index 7a99849d67..cad9f8cf06 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/HibernateDatastore.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/HibernateDatastore.java @@ -85,6 +85,11 @@ import org.springframework.transaction.support.TransactionSynchronizationManager * @author Graeme Rocher * @since 2.0 */ +@SuppressWarnings({ + "PMD.CloseResource", + "PMD.DataflowAnomalyAnalysis", + "PMD.ConstructorCallsOverridableMethod" +}) public class HibernateDatastore extends AbstractHibernateDatastore implements MessageSourceAware { private static final Logger LOG = LoggerFactory.getLogger(HibernateDatastore.class); @@ -540,7 +545,7 @@ public class HibernateDatastore extends AbstractHibernateDatastore implements Me super.setApplicationContext(applicationContext); for (HibernateDatastore hibernateDatastore : datastoresByConnectionSource.values()) { - if (hibernateDatastore != this) { + if (!Objects.equals(hibernateDatastore, this)) { hibernateDatastore.setApplicationContext(applicationContext); } } @@ -650,7 +655,7 @@ public class HibernateDatastore extends AbstractHibernateDatastore implements Me } } - public Metadata getMetadata() { + public final Metadata getMetadata() { return metadata; } @@ -705,7 +710,7 @@ public class HibernateDatastore extends AbstractHibernateDatastore implements Me schemaHandler.useDefaultSchema(connection); connection.close(); } catch (SQLException e) { - // ignore + LOG.trace("Failed to reset to default schema: {}", e.getMessage()); } } }
