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 8d186f7c21f7cc1981ddee8e823c74308831129d Author: Walter Duque de Estrada <[email protected]> AuthorDate: Tue Feb 24 09:42:55 2026 -0600 clean up GrailsPropertyBinder --- .../cfg/domainbinding/binder/CollectionBinder.java | 37 ++-------------------- .../domainbinding/binder/GrailsDomainBinder.java | 6 ++-- .../cfg/domainbinding/CollectionBinderSpec.groovy | 8 ++--- .../domainbinding/GrailsPropertyBinderSpec.groovy | 8 ++--- .../secondpass/ListSecondPassBinderSpec.groovy | 8 ++--- .../secondpass/MapSecondPassBinderSpec.groovy | 8 ++--- 6 files changed, 20 insertions(+), 55 deletions(-) diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/CollectionBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/CollectionBinder.java index 49ce08aa53..a1f64484ee 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/CollectionBinder.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/CollectionBinder.java @@ -41,7 +41,6 @@ import org.grails.orm.hibernate.cfg.domainbinding.secondpass.PrimaryKeyValueCrea import org.grails.orm.hibernate.cfg.domainbinding.secondpass.SetSecondPass; import org.grails.orm.hibernate.cfg.domainbinding.secondpass.UnidirectionalOneToManyBinder; import org.grails.orm.hibernate.cfg.domainbinding.secondpass.UnidirectionalOneToManyInverseValuesBinder; -import org.grails.orm.hibernate.cfg.domainbinding.util.BackticksRemover; import org.grails.orm.hibernate.cfg.domainbinding.util.CascadeBehavior; import org.grails.orm.hibernate.cfg.domainbinding.util.ColumnNameForPropertyAndPathFetcher; import org.grails.orm.hibernate.cfg.domainbinding.util.DefaultColumnNameFetcher; @@ -52,7 +51,6 @@ import org.grails.orm.hibernate.cfg.domainbinding.util.TableForManyCalculator; import org.hibernate.FetchMode; import org.hibernate.boot.spi.InFlightMetadataCollector; import org.hibernate.boot.spi.MetadataBuildingContext; -import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; import org.hibernate.mapping.Collection; import org.hibernate.mapping.OneToMany; import org.hibernate.mapping.PersistentClass; @@ -68,27 +66,22 @@ public class CollectionBinder { private final MetadataBuildingContext metadataBuildingContext; private final PersistentEntityNamingStrategy namingStrategy; private final CollectionHolder collectionHolder; - private final ColumnNameForPropertyAndPathFetcher columnNameForPropertyAndPathFetcher; private final ListSecondPassBinder listSecondPassBinder; private final CollectionSecondPassBinder collectionSecondPassBinder; - private final UnidirectionalOneToManyBinder unidirectionalOneToManyBinder; private final MapSecondPassBinder mapSecondPassBinder; /** Creates a new {@link CollectionBinder} instance. */ public CollectionBinder( MetadataBuildingContext metadataBuildingContext, PersistentEntityNamingStrategy namingStrategy, - JdbcEnvironment jdbcEnvironment, SimpleValueBinder simpleValueBinder, EnumTypeBinder enumTypeBinder, ManyToOneBinder manyToOneBinder, CompositeIdentifierToManyToOneBinder compositeIdentifierToManyToOneBinder, SimpleValueColumnFetcher simpleValueColumnFetcher, - ColumnNameForPropertyAndPathFetcher columnNameForPropertyAndPathFetcher, CollectionHolder collectionHolder) { this.metadataBuildingContext = metadataBuildingContext; this.namingStrategy = namingStrategy; - this.columnNameForPropertyAndPathFetcher = columnNameForPropertyAndPathFetcher; this.collectionHolder = collectionHolder; GrailsPropertyResolver grailsPropertyResolver = new GrailsPropertyResolver(); CollectionForPropertyConfigBinder collectionForPropertyConfigBinder = @@ -107,8 +100,6 @@ public class CollectionBinder { collectionForPropertyConfigBinder, simpleValueColumnBinder, new ColumnConfigToColumnBinder()); - this.unidirectionalOneToManyBinder = - new UnidirectionalOneToManyBinder(collectionWithJoinTableBinder); this.collectionSecondPassBinder = new CollectionSecondPassBinder( manyToOneBinder, @@ -116,7 +107,7 @@ public class CollectionBinder { new CollectionKeyColumnUpdater(), new BidirectionalOneToManyLinker(grailsPropertyResolver), new DependentKeyValueBinder(simpleValueBinder, compositeIdentifierToManyToOneBinder), - unidirectionalOneToManyBinder, + new UnidirectionalOneToManyBinder(collectionWithJoinTableBinder), collectionWithJoinTableBinder, collectionForPropertyConfigBinder, new DefaultColumnNameFetcher(namingStrategy), @@ -137,31 +128,7 @@ public class CollectionBinder { simpleValueColumnFetcher); } - /** Creates a new {@link CollectionBinder} instance. */ - public CollectionBinder( - MetadataBuildingContext metadataBuildingContext, - PersistentEntityNamingStrategy namingStrategy, - JdbcEnvironment jdbcEnvironment, - CollectionHolder collectionHolder) { - this( - metadataBuildingContext, - namingStrategy, - jdbcEnvironment, - new SimpleValueBinder(metadataBuildingContext, namingStrategy, jdbcEnvironment), - new EnumTypeBinder( - metadataBuildingContext, - new ColumnNameForPropertyAndPathFetcher( - namingStrategy, - new DefaultColumnNameFetcher(namingStrategy), - new BackticksRemover())), - new ManyToOneBinder(metadataBuildingContext, namingStrategy, jdbcEnvironment), - new CompositeIdentifierToManyToOneBinder( - metadataBuildingContext, namingStrategy, jdbcEnvironment), - new SimpleValueColumnFetcher(), - new ColumnNameForPropertyAndPathFetcher( - namingStrategy, new DefaultColumnNameFetcher(namingStrategy), new BackticksRemover()), - collectionHolder); - } + /** * First pass to bind collection to Hibernate metamodel, sets up second pass 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 01d379f1aa..07b51a651c 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 @@ -149,14 +149,12 @@ public class GrailsDomainBinder implements AdditionalMappingContributor, TypeCon new CollectionBinder( metadataBuildingContext, namingStrategy, - jdbcEnvironment, - simpleValueBinder, + simpleValueBinder, enumTypeBinder, manyToOneBinder, compositeIdentifierToManyToOneBinder, simpleValueColumnFetcher, - columnNameForPropertyAndPathFetcher, - collectionHolder); + collectionHolder); ComponentUpdater componentUpdater = new ComponentUpdater(propertyFromValueCreator); ComponentBinder componentBinder = new ComponentBinder(metadataBuildingContext, getMappingCacheHolder(), componentUpdater); 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 785603456f..84db282240 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 @@ -74,14 +74,14 @@ class CollectionBinderSpec extends HibernateGormDatastoreSpec { CollectionBinder collectionBinder = new CollectionBinder( metadataBuildingContext, - namingStrategy, - jdbcEnvironment, + namingStrategy + , simpleValueBinder, enumTypeBinderToUse, manyToOneBinder, compositeIdentifierToManyToOneBinder, - simpleValueColumnFetcher, - columnNameForPropertyAndPathFetcher, + simpleValueColumnFetcher + , collectionHolder ) PropertyFromValueCreator propertyFromValueCreator = new PropertyFromValueCreator() 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 d624f999bd..54a2611a8e 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 @@ -133,14 +133,14 @@ class GrailsPropertyBinderSpec extends HibernateGormDatastoreSpec { CollectionBinder collectionBinder = new CollectionBinder( metadataBuildingContext, - namingStrategy, - jdbcEnvironment, + namingStrategy + , simpleValueBinder, enumTypeBinderToUse, manyToOneBinder, compositeIdentifierToManyToOneBinder, - simpleValueColumnFetcher, - columnNameForPropertyAndPathFetcher, + simpleValueColumnFetcher + , collectionHolder ) PropertyFromValueCreator propertyFromValueCreator = new PropertyFromValueCreator() 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 633db309d6..0ec9dd2006 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 @@ -73,14 +73,14 @@ class ListSecondPassBinderSpec extends HibernateGormDatastoreSpec { CollectionBinder collectionBinder = new CollectionBinder( metadataBuildingContext, - namingStrategy, - jdbcEnvironment, + namingStrategy + , simpleValueBinder, enumTypeBinderToUse, manyToOneBinder, compositeIdentifierToManyToOneBinder, - simpleValueColumnFetcher, - columnNameForPropertyAndPathFetcher, + simpleValueColumnFetcher + , collectionHolder ) PropertyFromValueCreator propertyFromValueCreator = new PropertyFromValueCreator() 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 3f9eed99ee..52c238fa53 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 @@ -73,14 +73,14 @@ class MapSecondPassBinderSpec extends HibernateGormDatastoreSpec { CollectionBinder collectionBinder = new CollectionBinder( metadataBuildingContext, - namingStrategy, - jdbcEnvironment, + namingStrategy + , simpleValueBinder, enumTypeBinderToUse, manyToOneBinder, compositeIdentifierToManyToOneBinder, - simpleValueColumnFetcher, - columnNameForPropertyAndPathFetcher, + simpleValueColumnFetcher + , collectionHolder ) PropertyFromValueCreator propertyFromValueCreator = new PropertyFromValueCreator()
