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 2334ce725b41e6c9a07bec0060ee8fdab3e94cbc Author: Walter Duque de Estrada <[email protected]> AuthorDate: Sat Mar 7 17:47:51 2026 -0600 hibernate7: more CodeNarc --- .../{orm => gorm}/hibernate/HibernateEntity.groovy | 20 ++++---- .../HibernateConnectionSourceSettings.groovy | 56 +++++++--------------- ...HibernateConnectionSourceSettingsBuilder.groovy | 17 +++---- ...rnateDatastoreConnectionSourcesRegistrar.groovy | 9 ++-- 4 files changed, 41 insertions(+), 61 deletions(-) diff --git a/grails-data-hibernate7/core/src/main/groovy/grails/orm/hibernate/HibernateEntity.groovy b/grails-data-hibernate7/core/src/main/groovy/grails/gorm/hibernate/HibernateEntity.groovy similarity index 80% rename from grails-data-hibernate7/core/src/main/groovy/grails/orm/hibernate/HibernateEntity.groovy rename to grails-data-hibernate7/core/src/main/groovy/grails/gorm/hibernate/HibernateEntity.groovy index 8519635f20..76dc35c1ed 100644 --- a/grails-data-hibernate7/core/src/main/groovy/grails/orm/hibernate/HibernateEntity.groovy +++ b/grails-data-hibernate7/core/src/main/groovy/grails/gorm/hibernate/HibernateEntity.groovy @@ -24,7 +24,7 @@ trait HibernateEntity<D> extends GormEntity<D> { */ @Generated static List<D> findAllWithNativeSql(CharSequence sql) { - currentHibernateStaticApi().findAllWithNativeSql sql, Collections.emptyMap() + HibernateEntity.currentHibernateStaticApi().findAllWithNativeSql sql, Collections.emptyMap() } /** @@ -36,7 +36,7 @@ trait HibernateEntity<D> extends GormEntity<D> { */ @Generated static D findWithNativeSql(CharSequence sql) { - currentHibernateStaticApi().findWithNativeSql(sql, Collections.emptyMap()) + HibernateEntity.currentHibernateStaticApi().findWithNativeSql(sql, Collections.emptyMap()) } /** @@ -49,7 +49,7 @@ trait HibernateEntity<D> extends GormEntity<D> { */ @Generated static List<D> findAllWithNativeSql(CharSequence sql, Map args) { - currentHibernateStaticApi().findAllWithNativeSql sql, args + HibernateEntity.currentHibernateStaticApi().findAllWithNativeSql sql, args } /** @@ -62,7 +62,7 @@ trait HibernateEntity<D> extends GormEntity<D> { */ @Generated static D findWithNativeSql(CharSequence sql, Map args) { - currentHibernateStaticApi().findWithNativeSql(sql, args) + HibernateEntity.currentHibernateStaticApi().findWithNativeSql(sql, args) } /** @@ -71,7 +71,7 @@ trait HibernateEntity<D> extends GormEntity<D> { @Deprecated @Generated static List<D> findAllWithSql(CharSequence sql) { - currentHibernateStaticApi().findAllWithNativeSql sql, Collections.emptyMap() + HibernateEntity.currentHibernateStaticApi().findAllWithNativeSql sql, Collections.emptyMap() } /** @@ -80,7 +80,7 @@ trait HibernateEntity<D> extends GormEntity<D> { @Deprecated @Generated static D findWithSql(CharSequence sql) { - currentHibernateStaticApi().findWithNativeSql(sql, Collections.emptyMap()) + HibernateEntity.currentHibernateStaticApi().findWithNativeSql(sql, Collections.emptyMap()) } /** @@ -89,7 +89,7 @@ trait HibernateEntity<D> extends GormEntity<D> { @Deprecated @Generated static List<D> findAllWithSql(CharSequence sql, Map args) { - currentHibernateStaticApi().findAllWithNativeSql sql, args + HibernateEntity.currentHibernateStaticApi().findAllWithNativeSql sql, args } /** @@ -98,11 +98,11 @@ trait HibernateEntity<D> extends GormEntity<D> { @Deprecated @Generated static D findWithSql(CharSequence sql, Map args) { - currentHibernateStaticApi().findWithNativeSql(sql, args) + HibernateEntity.currentHibernateStaticApi().findWithNativeSql(sql, args) } @Generated private static HibernateGormStaticApi currentHibernateStaticApi() { - (HibernateGormStaticApi)GormEnhancer.findStaticApi(this) + (HibernateGormStaticApi) GormEnhancer.findStaticApi(this) } -} \ No newline at end of file +} diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.groovy b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.groovy index f3a18c27aa..bd8a55da4d 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.groovy +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.groovy @@ -10,9 +10,8 @@ import org.grails.datastore.gorm.jdbc.connections.DataSourceSettings import org.grails.orm.hibernate.dirty.GrailsEntityDirtinessStrategy import org.grails.orm.hibernate.support.ClosureEventTriggeringInterceptor import org.hibernate.CustomEntityDirtinessStrategy -import org.hibernate.boot.model.naming.CamelCaseToUnderscoresNamingStrategy +import org.hibernate.boot.model.naming.PhysicalNamingStrategySnakeCaseImpl import org.hibernate.boot.model.naming.PhysicalNamingStrategy -import org.hibernate.cfg.AvailableSettings import org.hibernate.cfg.Configuration import org.springframework.core.io.Resource @@ -47,12 +46,11 @@ class HibernateConnectionSourceSettings extends ConnectionSourceSettings { */ Properties toProperties() { Properties properties = new Properties() - properties.putAll( dataSource.toHibernateProperties() ) - properties.putAll( hibernate.toProperties() ) + properties.putAll(dataSource.toHibernateProperties()) + properties.putAll(hibernate.toProperties()) return properties } - @Builder(builderStrategy = SimpleStrategy, prefix = '') @AutoClone static class HibernateSettings extends LinkedHashMap<String, String> { @@ -80,7 +78,6 @@ class HibernateConnectionSourceSettings extends ConnectionSourceSettings { */ FlushSettings flush = new FlushSettings() - /** * The configuration class */ @@ -89,7 +86,7 @@ class HibernateConnectionSourceSettings extends ConnectionSourceSettings { /** * The naming strategy */ - Class<? extends PhysicalNamingStrategy> naming_strategy = CamelCaseToUnderscoresNamingStrategy + Class<? extends PhysicalNamingStrategy> naming_strategy = PhysicalNamingStrategySnakeCaseImpl /** * @@ -191,8 +188,8 @@ class HibernateConnectionSourceSettings extends ConnectionSourceSettings { Properties additionalProperties = new Properties() @CompileStatic - Map<String, Object> toHibernateEventListeners(ClosureEventTriggeringInterceptor eventTriggeringInterceptor) { - if(eventTriggeringInterceptor != null) { + static Map<String, Object> toHibernateEventListeners(ClosureEventTriggeringInterceptor eventTriggeringInterceptor) { + if (eventTriggeringInterceptor != null) { return [ // 'save': eventTriggeringInterceptor, // 'save-update': eventTriggeringInterceptor, @@ -206,7 +203,7 @@ class HibernateConnectionSourceSettings extends ConnectionSourceSettings { 'post-update': eventTriggeringInterceptor, 'pre-delete': eventTriggeringInterceptor, 'post-delete': eventTriggeringInterceptor - ] as Map<String,Object> + ] as Map<String, Object> } return Collections.emptyMap() } @@ -219,11 +216,11 @@ class HibernateConnectionSourceSettings extends ConnectionSourceSettings { @CompileStatic Properties toProperties() { Properties props = new Properties() - if(naming_strategy != null) { - props.put("hibernate.naming_strategy".toString(), naming_strategy.name) + if (naming_strategy != null) { + props.put('hibernate.naming_strategy'.toString(), naming_strategy.name) } - if(configClass != null) { - props.put("hibernate.config_class".toString(), configClass.name) + if (configClass != null) { + props.put('hibernate.config_class'.toString(), configClass.name) } props.put('hibernate.use_query_cache', String.valueOf(cache.queries)) props.put('hibernate.jpa.compliance.cascade', String.valueOf(jpa.compliance.cascade)) @@ -232,26 +229,11 @@ class HibernateConnectionSourceSettings extends ConnectionSourceSettings { props.put('hibernate.entity_dirtiness_strategy', entity_dirtiness_strategy.name) } - // Hibernate 5.1/5.2: manually enforce connection release mode ON_CLOSE (the former default) - try { - // Try Hibernate 5.2 - AvailableSettings.class.getField("CONNECTION_HANDLING") - props.put("hibernate.connection.handling_mode", "DELAYED_ACQUISITION_AND_HOLD") - } - catch (NoSuchFieldException ex) { - // Try Hibernate 5.1 - try { - AvailableSettings.class.getField("ACQUIRE_CONNECTIONS") - props.put("hibernate.connection.release_mode", "ON_CLOSE") - } - catch (NoSuchFieldException ex2) { - // on Hibernate 5.0.x or lower - no need to change the default there - } - } + props.put('hibernate.connection.handling_mode', 'DELAYED_ACQUISITION_AND_HOLD') - String prefix = "hibernate" - props.putAll( additionalProperties ) - populateProperties(props, this,prefix) + String prefix = 'hibernate' + props.putAll(additionalProperties) + populateProperties(props, this, prefix) return props } @@ -259,8 +241,8 @@ class HibernateConnectionSourceSettings extends ConnectionSourceSettings { protected void populateProperties(Properties props, Map current, String prefix) { for (key in current.keySet()) { def value = current.get(key) - if(value instanceof Map) { - populateProperties(props, (Map)value, "${prefix}.$key") + if (value instanceof Map) { + populateProperties(props, (Map) value, "${prefix}.$key") } else { props.put("$prefix.$key".toString(), value) @@ -328,14 +310,12 @@ class HibernateConnectionSourceSettings extends ConnectionSourceSettings { @Builder(builderStrategy = SimpleStrategy, prefix = '') @AutoClone static class JpaSettings { - JpaComplianceSettings compliance = new JpaComplianceSettings(); + JpaComplianceSettings compliance = new JpaComplianceSettings() } @Builder(builderStrategy = SimpleStrategy, prefix = '') static class JpaComplianceSettings { boolean cascade = true } - - } } diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettingsBuilder.groovy b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettingsBuilder.groovy index 8f832be811..4afd817657 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettingsBuilder.groovy +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettingsBuilder.groovy @@ -13,31 +13,32 @@ import org.springframework.core.env.PropertyResolver */ @CompileStatic class HibernateConnectionSourceSettingsBuilder extends ConfigurationBuilder<HibernateConnectionSourceSettings, HibernateConnectionSourceSettings> { + HibernateConnectionSourceSettings fallBackHibernateSettings - HibernateConnectionSourceSettingsBuilder(PropertyResolver propertyResolver, String configurationPrefix = "", ConnectionSourceSettings fallBackConfiguration = null) { + HibernateConnectionSourceSettingsBuilder(PropertyResolver propertyResolver, String configurationPrefix = '', ConnectionSourceSettings fallBackConfiguration = null) { super(propertyResolver, configurationPrefix, fallBackConfiguration) - if(fallBackConfiguration instanceof HibernateConnectionSourceSettings) { - fallBackHibernateSettings = (HibernateConnectionSourceSettings)fallBackConfiguration + if (fallBackConfiguration instanceof HibernateConnectionSourceSettings) { + fallBackHibernateSettings = (HibernateConnectionSourceSettings) fallBackConfiguration } } @Override protected HibernateConnectionSourceSettings createBuilder() { def settings = new HibernateConnectionSourceSettings() - if(fallBackHibernateSettings != null) { - settings.getHibernate().putAll( fallBackHibernateSettings.getHibernate() ) + if (fallBackHibernateSettings != null) { + settings.getHibernate().putAll(fallBackHibernateSettings.getHibernate()) } return settings } @Override HibernateConnectionSourceSettings build() { - HibernateConnectionSourceSettings finalSettings = (HibernateConnectionSourceSettings)super.build() - Map orgHibernateProperties = propertyResolver.getProperty("org.hibernate", Map.class, Collections.emptyMap()) + HibernateConnectionSourceSettings finalSettings = (HibernateConnectionSourceSettings) super.build() + Map orgHibernateProperties = propertyResolver.getProperty('org.hibernate', Map, Collections.emptyMap()) Properties additionalProperties = finalSettings.getHibernate().getAdditionalProperties() - for(key in orgHibernateProperties.keySet()) { + for (key in orgHibernateProperties.keySet()) { additionalProperties.put("org.hibernate.$key".toString(), orgHibernateProperties.get(key)) } return finalSettings diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/support/HibernateDatastoreConnectionSourcesRegistrar.groovy b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/support/HibernateDatastoreConnectionSourcesRegistrar.groovy index 167c741c3a..bd0e26db3a 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/support/HibernateDatastoreConnectionSourcesRegistrar.groovy +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/support/HibernateDatastoreConnectionSourcesRegistrar.groovy @@ -17,7 +17,6 @@ import org.springframework.transaction.PlatformTransactionManager import javax.sql.DataSource - /** * A factory bean that looks up a datastore by connection name * @@ -35,12 +34,12 @@ class HibernateDatastoreConnectionSourcesRegistrar implements BeanDefinitionRegi @Override void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) throws BeansException { - for(String dataSourceName in dataSourceNames) { + for (String dataSourceName in dataSourceNames) { boolean isDefault = dataSourceName == ConnectionSource.DEFAULT || dataSourceName == Settings.SETTING_DATASOURCE - boolean shouldConfigureDataSourceBean = GrailsVersion.isAtLeastMajorMinor(3,3) + boolean shouldConfigureDataSourceBean = GrailsVersion.isAtLeastMajorMinor(3, 3) String dataSourceBeanName = isDefault ? Settings.SETTING_DATASOURCE : "${Settings.SETTING_DATASOURCE}_$dataSourceName" - if(!registry.containsBeanDefinition(dataSourceBeanName) && shouldConfigureDataSourceBean) { + if (!registry.containsBeanDefinition(dataSourceBeanName) && shouldConfigureDataSourceBean) { def dataSourceBean = new RootBeanDefinition() dataSourceBean.setTargetType(DataSource) dataSourceBean.setBeanClass(InstanceFactoryBean) @@ -53,7 +52,7 @@ class HibernateDatastoreConnectionSourcesRegistrar implements BeanDefinitionRegi registry.registerBeanDefinition(dataSourceBeanName, dataSourceBean) } - if(!isDefault) { + if (!isDefault) { String suffix = '_' + dataSourceName String sessionFactoryName = "sessionFactory$suffix" String transactionManagerBeanName = "transactionManager$suffix"
