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 e8e0ce00d48dfabc609362cf42a3beb2616ab6dd Author: Walter Duque de Estrada <[email protected]> AuthorDate: Tue Feb 24 07:21:55 2026 -0600 clean up RootBinder --- .../hibernate/cfg/domainbinding/binder/GrailsDomainBinder.java | 6 ++---- .../grails/orm/hibernate/cfg/domainbinding/binder/RootBinder.java | 6 ------ .../orm/hibernate/cfg/domainbinding/CollectionBinderSpec.groovy | 2 +- .../hibernate/cfg/domainbinding/GrailsPropertyBinderSpec.groovy | 2 +- .../orm/hibernate/cfg/domainbinding/binder/RootBinderSpec.groovy | 8 +++----- .../cfg/domainbinding/secondpass/ListSecondPassBinderSpec.groovy | 2 +- .../cfg/domainbinding/secondpass/MapSecondPassBinderSpec.groovy | 2 +- 7 files changed, 9 insertions(+), 19 deletions(-) diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/GrailsDomainBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/GrailsDomainBinder.java index 6aeb23b2ab..dfd3fad2a6 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/GrailsDomainBinder.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/GrailsDomainBinder.java @@ -237,10 +237,8 @@ public class GrailsDomainBinder implements AdditionalMappingContributor, TypeCon new ColumnConfigToColumnBinder()); RootBinder rootBinder = new RootBinder( - metadataBuildingContext, - dataSourceName, - getNamingStrategy(), - multiTenantFilterBinder, + dataSourceName, + multiTenantFilterBinder, subClassBinder, defaultColumnNameFetcher, rootPersistentClassCommonValuesBinder, diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/RootBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/RootBinder.java index 5510e7bac0..1be4e73412 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/RootBinder.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/RootBinder.java @@ -36,9 +36,7 @@ public class RootBinder { private static final Logger LOG = LoggerFactory.getLogger(RootBinder.class); - private final MetadataBuildingContext metadataBuildingContext; private final String dataSourceName; - private final PersistentEntityNamingStrategy namingStrategy; private final MultiTenantFilterBinder multiTenantFilterBinder; private final SubClassBinder subClassBinder; private final DefaultColumnNameFetcher defaultColumnNameFetcher; @@ -46,17 +44,13 @@ public class RootBinder { private final DiscriminatorPropertyBinder discriminatorPropertyBinder; public RootBinder( - MetadataBuildingContext metadataBuildingContext, String dataSourceName, - PersistentEntityNamingStrategy namingStrategy, MultiTenantFilterBinder multiTenantFilterBinder, SubClassBinder subClassBinder, DefaultColumnNameFetcher defaultColumnNameFetcher, RootPersistentClassCommonValuesBinder rootPersistentClassCommonValuesBinder, DiscriminatorPropertyBinder discriminatorPropertyBinder) { - this.metadataBuildingContext = metadataBuildingContext; this.dataSourceName = dataSourceName; - this.namingStrategy = namingStrategy; this.multiTenantFilterBinder = multiTenantFilterBinder; this.subClassBinder = subClassBinder; this.defaultColumnNameFetcher = defaultColumnNameFetcher; diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/CollectionBinderSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/CollectionBinderSpec.groovy index 58ca44c4d6..175f9b7e05 100644 --- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/CollectionBinderSpec.groovy +++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/CollectionBinderSpec.groovy @@ -121,7 +121,7 @@ class CollectionBinderSpec extends HibernateGormDatastoreSpec { SubClassBinder subClassBinder = new SubClassBinder(binder.getMappingCacheHolder(), subclassMappingBinder, multiTenantFilterBinder, defaultColumnNameFetcher, "dataSource") RootPersistentClassCommonValuesBinder rootPersistentClassCommonValuesBinder = new RootPersistentClassCommonValuesBinder(metadataBuildingContext, namingStrategy, identityBinder, versionBinder, classBinder, classPropertiesBinder) DiscriminatorPropertyBinder discriminatorPropertyBinder = new DiscriminatorPropertyBinder(metadataBuildingContext, new org.grails.orm.hibernate.cfg.domainbinding.binder.SimpleValueColumnBinder(), new ColumnConfigToColumnBinder()) - RootBinder rootBinder = new RootBinder(metadataBuildingContext, "default", namingStrategy, multiTenantFilterBinder, subClassBinder, defaultColumnNameFetcher, rootPersistentClassCommonValuesBinder, discriminatorPropertyBinder) + RootBinder rootBinder = new RootBinder("default", multiTenantFilterBinder, subClassBinder, defaultColumnNameFetcher, rootPersistentClassCommonValuesBinder, discriminatorPropertyBinder) return [ propertyBinder: propertyBinder, diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/GrailsPropertyBinderSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/GrailsPropertyBinderSpec.groovy index c5f1ad56eb..60cb5c805f 100644 --- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/GrailsPropertyBinderSpec.groovy +++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/GrailsPropertyBinderSpec.groovy @@ -181,7 +181,7 @@ class GrailsPropertyBinderSpec extends HibernateGormDatastoreSpec { SubClassBinder subClassBinder = new SubClassBinder(binder.getMappingCacheHolder(), subclassMappingBinder, multiTenantFilterBinder, defaultColumnNameFetcher, "dataSource") RootPersistentClassCommonValuesBinder rootPersistentClassCommonValuesBinder = new RootPersistentClassCommonValuesBinder(metadataBuildingContext, namingStrategy, identityBinder, versionBinder, classBinder, classPropertiesBinder) DiscriminatorPropertyBinder discriminatorPropertyBinder = new DiscriminatorPropertyBinder(metadataBuildingContext, new org.grails.orm.hibernate.cfg.domainbinding.binder.SimpleValueColumnBinder(), new ColumnConfigToColumnBinder()) - RootBinder rootBinder = new RootBinder(metadataBuildingContext, "default", namingStrategy, multiTenantFilterBinder, subClassBinder, defaultColumnNameFetcher, rootPersistentClassCommonValuesBinder, discriminatorPropertyBinder) + RootBinder rootBinder = new RootBinder("default", multiTenantFilterBinder, subClassBinder, defaultColumnNameFetcher, rootPersistentClassCommonValuesBinder, discriminatorPropertyBinder) return [ propertyBinder: propertyBinder, diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/RootBinderSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/RootBinderSpec.groovy index 3e68798d1f..e7a80f6008 100644 --- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/RootBinderSpec.groovy +++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/RootBinderSpec.groovy @@ -1,6 +1,6 @@ package org.grails.orm.hibernate.cfg.domainbinding.binder -import grails.gorm.annotation.Entity + import grails.gorm.specs.HibernateGormDatastoreSpec import org.grails.orm.hibernate.cfg.Mapping import org.grails.orm.hibernate.cfg.PersistentEntityNamingStrategy @@ -9,7 +9,6 @@ import org.grails.orm.hibernate.cfg.domainbinding.util.DefaultColumnNameFetcher import org.grails.orm.hibernate.cfg.domainbinding.util.MultiTenantFilterBinder import org.hibernate.boot.spi.MetadataBuildingContext import org.hibernate.mapping.RootClass -import spock.lang.Shared class RootBinderSpec extends HibernateGormDatastoreSpec { @@ -34,9 +33,8 @@ class RootBinderSpec extends HibernateGormDatastoreSpec { discriminatorPropertyBinder = Mock(DiscriminatorPropertyBinder) binder = new RootBinder( - metadataBuildingContext, - "default", - namingStrategy, + "default" + , multiTenantFilterBinder, subClassBinder, defaultColumnNameFetcher, diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/ListSecondPassBinderSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/ListSecondPassBinderSpec.groovy index 81c173c3d8..9660078251 100644 --- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/ListSecondPassBinderSpec.groovy +++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/ListSecondPassBinderSpec.groovy @@ -120,7 +120,7 @@ class ListSecondPassBinderSpec extends HibernateGormDatastoreSpec { SubClassBinder subClassBinder = new SubClassBinder(binder.getMappingCacheHolder(), subclassMappingBinder, multiTenantFilterBinder, defaultColumnNameFetcher, "dataSource") RootPersistentClassCommonValuesBinder rootPersistentClassCommonValuesBinder = new RootPersistentClassCommonValuesBinder(metadataBuildingContext, namingStrategy, identityBinder, versionBinder, classBinder, classPropertiesBinder) DiscriminatorPropertyBinder discriminatorPropertyBinder = new DiscriminatorPropertyBinder(metadataBuildingContext, new org.grails.orm.hibernate.cfg.domainbinding.binder.SimpleValueColumnBinder(), new ColumnConfigToColumnBinder()) - RootBinder rootBinder = new RootBinder(metadataBuildingContext, "default", namingStrategy, multiTenantFilterBinder, subClassBinder, defaultColumnNameFetcher, rootPersistentClassCommonValuesBinder, discriminatorPropertyBinder) + RootBinder rootBinder = new RootBinder("default", multiTenantFilterBinder, subClassBinder, defaultColumnNameFetcher, rootPersistentClassCommonValuesBinder, discriminatorPropertyBinder) return [ propertyBinder: propertyBinder, diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/MapSecondPassBinderSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/MapSecondPassBinderSpec.groovy index 8449daef7c..b21654289e 100644 --- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/MapSecondPassBinderSpec.groovy +++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/MapSecondPassBinderSpec.groovy @@ -120,7 +120,7 @@ class MapSecondPassBinderSpec extends HibernateGormDatastoreSpec { SubClassBinder subClassBinder = new SubClassBinder(binder.getMappingCacheHolder(), subclassMappingBinder, multiTenantFilterBinder, defaultColumnNameFetcher, "dataSource") RootPersistentClassCommonValuesBinder rootPersistentClassCommonValuesBinder = new RootPersistentClassCommonValuesBinder(metadataBuildingContext, namingStrategy, identityBinder, versionBinder, classBinder, classPropertiesBinder) DiscriminatorPropertyBinder discriminatorPropertyBinder = new DiscriminatorPropertyBinder(metadataBuildingContext, new org.grails.orm.hibernate.cfg.domainbinding.binder.SimpleValueColumnBinder(), new ColumnConfigToColumnBinder()) - RootBinder rootBinder = new RootBinder(metadataBuildingContext, "default", namingStrategy, multiTenantFilterBinder, subClassBinder, defaultColumnNameFetcher, rootPersistentClassCommonValuesBinder, discriminatorPropertyBinder) + RootBinder rootBinder = new RootBinder("default", multiTenantFilterBinder, subClassBinder, defaultColumnNameFetcher, rootPersistentClassCommonValuesBinder, discriminatorPropertyBinder) return [ propertyBinder: propertyBinder,
