This is an automated email from the ASF dual-hosted git repository. borinquenkid pushed a commit to branch 8.0.x-hibernate7-dev in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit ad31671b7b8228806da80010a89b8f0a98b8e240 Author: Walter Duque de Estrada <[email protected]> AuthorDate: Sat Mar 7 18:47:21 2026 -0600 hibernate7: more CodeNarc --- .../grails/gorm/hibernate/HibernateEntity.groovy | 29 ++++++++++++---------- .../GrailsHibernateTransactionManager.groovy | 24 +++--------------- .../generator/GrailsSequenceGeneratorEnum.groovy | 25 ++++++++++--------- .../dirty/GrailsEntityDirtinessStrategy.groovy | 8 +++--- .../HibernateConnectionSourceSettingsSpec.groovy | 2 +- 5 files changed, 37 insertions(+), 51 deletions(-) diff --git a/grails-data-hibernate7/core/src/main/groovy/grails/gorm/hibernate/HibernateEntity.groovy b/grails-data-hibernate7/core/src/main/groovy/grails/gorm/hibernate/HibernateEntity.groovy index 76dc35c1ed..59864c3d12 100644 --- a/grails-data-hibernate7/core/src/main/groovy/grails/gorm/hibernate/HibernateEntity.groovy +++ b/grails-data-hibernate7/core/src/main/groovy/grails/gorm/hibernate/HibernateEntity.groovy @@ -24,7 +24,8 @@ trait HibernateEntity<D> extends GormEntity<D> { */ @Generated static List<D> findAllWithNativeSql(CharSequence sql) { - HibernateEntity.currentHibernateStaticApi().findAllWithNativeSql sql, Collections.emptyMap() + HibernateGormStaticApi<D> api = (HibernateGormStaticApi<D>) GormEnhancer.findStaticApi(this) + return (List<D>) api.findAllWithNativeSql(sql, Collections.emptyMap()) } /** @@ -36,7 +37,8 @@ trait HibernateEntity<D> extends GormEntity<D> { */ @Generated static D findWithNativeSql(CharSequence sql) { - HibernateEntity.currentHibernateStaticApi().findWithNativeSql(sql, Collections.emptyMap()) + HibernateGormStaticApi<D> api = (HibernateGormStaticApi<D>) GormEnhancer.findStaticApi(this) + return (D) api.findWithNativeSql(sql, Collections.emptyMap()) } /** @@ -49,7 +51,8 @@ trait HibernateEntity<D> extends GormEntity<D> { */ @Generated static List<D> findAllWithNativeSql(CharSequence sql, Map args) { - HibernateEntity.currentHibernateStaticApi().findAllWithNativeSql sql, args + HibernateGormStaticApi<D> api = (HibernateGormStaticApi<D>) GormEnhancer.findStaticApi(this) + return (List<D>) api.findAllWithNativeSql(sql, args) } /** @@ -62,7 +65,8 @@ trait HibernateEntity<D> extends GormEntity<D> { */ @Generated static D findWithNativeSql(CharSequence sql, Map args) { - HibernateEntity.currentHibernateStaticApi().findWithNativeSql(sql, args) + HibernateGormStaticApi<D> api = (HibernateGormStaticApi<D>) GormEnhancer.findStaticApi(this) + return (D) api.findWithNativeSql(sql, args) } /** @@ -71,7 +75,8 @@ trait HibernateEntity<D> extends GormEntity<D> { @Deprecated @Generated static List<D> findAllWithSql(CharSequence sql) { - HibernateEntity.currentHibernateStaticApi().findAllWithNativeSql sql, Collections.emptyMap() + HibernateGormStaticApi<D> api = (HibernateGormStaticApi<D>) GormEnhancer.findStaticApi(this) + return (List<D>) api.findAllWithNativeSql(sql, Collections.emptyMap()) } /** @@ -80,7 +85,8 @@ trait HibernateEntity<D> extends GormEntity<D> { @Deprecated @Generated static D findWithSql(CharSequence sql) { - HibernateEntity.currentHibernateStaticApi().findWithNativeSql(sql, Collections.emptyMap()) + HibernateGormStaticApi<D> api = (HibernateGormStaticApi<D>) GormEnhancer.findStaticApi(this) + return (D) api.findWithNativeSql(sql, Collections.emptyMap()) } /** @@ -89,7 +95,8 @@ trait HibernateEntity<D> extends GormEntity<D> { @Deprecated @Generated static List<D> findAllWithSql(CharSequence sql, Map args) { - HibernateEntity.currentHibernateStaticApi().findAllWithNativeSql sql, args + HibernateGormStaticApi<D> api = (HibernateGormStaticApi<D>) GormEnhancer.findStaticApi(this) + return (List<D>) api.findAllWithNativeSql(sql, args) } /** @@ -98,11 +105,7 @@ trait HibernateEntity<D> extends GormEntity<D> { @Deprecated @Generated static D findWithSql(CharSequence sql, Map args) { - HibernateEntity.currentHibernateStaticApi().findWithNativeSql(sql, args) - } - - @Generated - private static HibernateGormStaticApi currentHibernateStaticApi() { - (HibernateGormStaticApi) GormEnhancer.findStaticApi(this) + HibernateGormStaticApi<D> api = (HibernateGormStaticApi<D>) GormEnhancer.findStaticApi(this) + return (D) api.findWithNativeSql(sql, args) } } diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/GrailsHibernateTransactionManager.groovy b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/GrailsHibernateTransactionManager.groovy index 17b9b5aa1c..f0575c24cf 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/GrailsHibernateTransactionManager.groovy +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/GrailsHibernateTransactionManager.groovy @@ -18,16 +18,11 @@ package org.grails.orm.hibernate import groovy.transform.CompileStatic import groovy.util.logging.Slf4j import org.hibernate.FlushMode -import org.hibernate.Session import org.hibernate.SessionFactory -import org.hibernate.engine.jdbc.spi.JdbcCoordinator -import org.hibernate.engine.spi.SessionImplementor import org.springframework.orm.hibernate5.HibernateTransactionManager import org.springframework.orm.hibernate5.SessionHolder import org.springframework.transaction.TransactionDefinition -import org.springframework.transaction.support.DefaultTransactionStatus import org.springframework.transaction.support.TransactionSynchronizationManager -import org.springframework.util.Assert import javax.sql.DataSource @@ -42,15 +37,6 @@ class GrailsHibernateTransactionManager extends HibernateTransactionManager { final FlushMode defaultFlushMode - GrailsHibernateTransactionManager(FlushMode defaultFlushMode = FlushMode.AUTO) { - this.defaultFlushMode = defaultFlushMode - } - - GrailsHibernateTransactionManager(SessionFactory sessionFactory, FlushMode defaultFlushMode = FlushMode.AUTO) { - super(sessionFactory) - this.defaultFlushMode = defaultFlushMode - } - GrailsHibernateTransactionManager(SessionFactory sessionFactory, DataSource dataSource, FlushMode defaultFlushMode = FlushMode.AUTO) { super(sessionFactory) setDataSource(dataSource) @@ -65,16 +51,12 @@ class GrailsHibernateTransactionManager extends HibernateTransactionManager { // transaction is HibernateTransactionManager.HibernateTransactionObject private class instance // always set to manual; the base class doesn't because the OSIV has already registered a session - SessionHolder holder = (SessionHolder)TransactionSynchronizationManager.getResource(sessionFactory) + SessionHolder holder = (SessionHolder) TransactionSynchronizationManager.getResource(sessionFactory) holder.session.setHibernateFlushMode(FlushMode.MANUAL) } - else if(defaultFlushMode != FlushMode.AUTO) { - SessionHolder holder = (SessionHolder)TransactionSynchronizationManager.getResource(sessionFactory) + else if (defaultFlushMode != FlushMode.AUTO) { + SessionHolder holder = (SessionHolder) TransactionSynchronizationManager.getResource(sessionFactory) holder.session.setHibernateFlushMode(defaultFlushMode) } } - - - - } diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/generator/GrailsSequenceGeneratorEnum.groovy b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/generator/GrailsSequenceGeneratorEnum.groovy index 04e1f4dc44..69f1477672 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/generator/GrailsSequenceGeneratorEnum.groovy +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/generator/GrailsSequenceGeneratorEnum.groovy @@ -16,17 +16,18 @@ import org.grails.orm.hibernate.cfg.Identity */ @CompileStatic enum GrailsSequenceGeneratorEnum { - IDENTITY("identity"), - SEQUENCE("sequence"), - SEQUENCE_IDENTITY("sequence-identity"), - INCREMENT("increment"), - UUID("uuid"), - UUID2("uuid2"), - ASSIGNED("assigned"), - TABLE("table"), - ENHANCED_TABLE("enhanced-table"), - HILO("hilo"), - NATIVE("native") + + IDENTITY('identity'), + SEQUENCE('sequence'), + SEQUENCE_IDENTITY('sequence-identity'), + INCREMENT('increment'), + UUID('uuid'), + UUID2('uuid2'), + ASSIGNED('assigned'), + TABLE('table'), + ENHANCED_TABLE('enhanced-table'), + HILO('hilo'), + NATIVE('native') private final String name @@ -83,4 +84,4 @@ enum GrailsSequenceGeneratorEnum { return new GrailsNativeGenerator(context) } } -} \ No newline at end of file +} diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/dirty/GrailsEntityDirtinessStrategy.groovy b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/dirty/GrailsEntityDirtinessStrategy.groovy index d6684f9a6a..621573b5c9 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/dirty/GrailsEntityDirtinessStrategy.groovy +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/dirty/GrailsEntityDirtinessStrategy.groovy @@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory @CompileStatic class GrailsEntityDirtinessStrategy implements CustomEntityDirtinessStrategy { - protected static final Logger LOG = LoggerFactory.getLogger(GrailsEntityDirtinessStrategy.class) + protected static final Logger LOG = LoggerFactory.getLogger(GrailsEntityDirtinessStrategy) @Override boolean canDirtyCheck(Object entity, EntityPersister persister, Session session) { @@ -111,13 +111,13 @@ class GrailsEntityDirtinessStrategy implements CustomEntityDirtinessStrategy { } as AttributeChecker) } - Status getStatus(Session session, Object entity) { + static Status getStatus(Session session, Object entity) { SessionImplementor si = (SessionImplementor) session EntityEntry entry = si.getPersistenceContext().getEntry(entity) return entry != null ? entry.getStatus() : null } - private DirtyCheckable cast(Object entity) { - return DirtyCheckable.class.cast(entity) + private static DirtyCheckable cast(Object entity) { + return DirtyCheckable.cast(entity) } } diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettingsSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettingsSpec.groovy index 443f208ac5..b233ce8464 100644 --- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettingsSpec.groovy +++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettingsSpec.groovy @@ -79,7 +79,7 @@ class HibernateConnectionSourceSettingsSpec extends Specification { hibernateProperties['hibernate.hbm2ddl.auto'] == 'create' hibernateProperties['hibernate.cache.queries'] == 'true' hibernateProperties['hibernate.flush.mode'] == 'commit' - hibernateProperties['hibernate.naming_strategy'] == 'org.hibernate.boot.model.naming.CamelCaseToUnderscoresNamingStrategy' + hibernateProperties['hibernate.naming_strategy'] == 'org.hibernate.boot.model.naming.PhysicalNamingStrategySnakeCaseImpl' hibernateProperties['hibernate.entity_dirtiness_strategy'] == 'org.grails.orm.hibernate.dirty.GrailsEntityDirtinessStrategy' hibernateProperties['hibernate.configLocations'] == 'file:hibernate.cfg.xml' hibernateProperties['hibernate.use_query_cache'] == 'true'
