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 b4d40682e3ce60647530d91dd77af3e7dd59e705 Author: Walter Duque de Estrada <[email protected]> AuthorDate: Fri Feb 6 20:49:30 2026 -0600 progress --- .../grails/orm/hibernate/cfg/domainbinding/CollectionBinder.java | 8 ++++---- .../cfg/domainbinding/secondpass/GrailsCollectionSecondPass.java | 6 +++++- .../hibernate/cfg/domainbinding/secondpass/ListSecondPass.java | 7 ++++--- .../orm/hibernate/cfg/domainbinding/secondpass/MapSecondPass.java | 7 ++++--- 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/CollectionBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/CollectionBinder.java index 612037a84c..180fcd6cf3 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/CollectionBinder.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/CollectionBinder.java @@ -117,16 +117,16 @@ public class CollectionBinder { // set up second pass if (collection instanceof org.hibernate.mapping.Set) { - mappings.addSecondPass(new GrailsCollectionSecondPass(grailsDomainBinder, property, mappings, collection, sessionFactoryBeanName)); + mappings.addSecondPass(new GrailsCollectionSecondPass(grailsDomainBinder, this, property, mappings, collection, sessionFactoryBeanName)); } else if (collection instanceof org.hibernate.mapping.List) { - mappings.addSecondPass(new ListSecondPass(grailsDomainBinder, property, mappings, collection, sessionFactoryBeanName)); + mappings.addSecondPass(new ListSecondPass(grailsDomainBinder, this, property, mappings, collection, sessionFactoryBeanName)); } else if (collection instanceof org.hibernate.mapping.Map) { - mappings.addSecondPass(new MapSecondPass(grailsDomainBinder, property, mappings, collection, sessionFactoryBeanName)); + mappings.addSecondPass(new MapSecondPass(grailsDomainBinder, this, property, mappings, collection, sessionFactoryBeanName)); } else { // Collection -> Bag - mappings.addSecondPass(new GrailsCollectionSecondPass(grailsDomainBinder, property, mappings, collection, sessionFactoryBeanName)); + mappings.addSecondPass(new GrailsCollectionSecondPass(grailsDomainBinder, this, property, mappings, collection, sessionFactoryBeanName)); } } diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/GrailsCollectionSecondPass.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/GrailsCollectionSecondPass.java index 15344cd02e..f092d07abf 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/GrailsCollectionSecondPass.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/GrailsCollectionSecondPass.java @@ -15,6 +15,7 @@ import org.hibernate.mapping.Value; import org.grails.orm.hibernate.cfg.GrailsDomainBinder; import org.grails.orm.hibernate.cfg.HibernateToManyProperty; +import org.grails.orm.hibernate.cfg.domainbinding.CollectionBinder; /** * Second pass class for grails relationships. This is required as all @@ -28,6 +29,7 @@ public class GrailsCollectionSecondPass implements org.hibernate.boot.spi.Second private static final long serialVersionUID = -5540526942092611348L; protected final GrailsDomainBinder grailsDomainBinder; + protected final CollectionBinder collectionBinder; HibernateToManyProperty property; @Nonnull InFlightMetadataCollector mappings; @@ -35,11 +37,13 @@ public class GrailsCollectionSecondPass implements org.hibernate.boot.spi.Second String sessionFactoryBeanName; public GrailsCollectionSecondPass(GrailsDomainBinder grailsDomainBinder, + CollectionBinder collectionBinder, HibernateToManyProperty property, @Nonnull InFlightMetadataCollector mappings, Collection coll, String sessionFactoryBeanName) { this.grailsDomainBinder = grailsDomainBinder; + this.collectionBinder = collectionBinder; this.property = property; this.mappings = mappings; this.collection = coll; @@ -77,7 +81,7 @@ public class GrailsCollectionSecondPass implements org.hibernate.boot.spi.Second @SuppressWarnings("rawtypes") public void doSecondPass(Map persistentClasses) throws MappingException { - grailsDomainBinder.bindCollectionSecondPass(property, mappings, persistentClasses, collection, sessionFactoryBeanName); + collectionBinder.bindCollectionSecondPass(property, mappings, persistentClasses, collection, sessionFactoryBeanName); createCollectionKeys(); } } diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/ListSecondPass.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/ListSecondPass.java index bf5f8edf7f..991098b224 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/ListSecondPass.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/ListSecondPass.java @@ -10,21 +10,22 @@ import org.hibernate.mapping.Collection; import org.grails.orm.hibernate.cfg.GrailsDomainBinder; import org.grails.orm.hibernate.cfg.HibernateToManyProperty; +import org.grails.orm.hibernate.cfg.domainbinding.CollectionBinder; public class ListSecondPass extends GrailsCollectionSecondPass { private static final long serialVersionUID = -3024674993774205193L; - public ListSecondPass(GrailsDomainBinder grailsDomainBinder, HibernateToManyProperty property, @Nonnull InFlightMetadataCollector mappings, + public ListSecondPass(GrailsDomainBinder grailsDomainBinder, CollectionBinder collectionBinder, HibernateToManyProperty property, @Nonnull InFlightMetadataCollector mappings, Collection coll, String sessionFactoryBeanName) { - super(grailsDomainBinder, property, mappings, coll, sessionFactoryBeanName); + super(grailsDomainBinder, collectionBinder, property, mappings, coll, sessionFactoryBeanName); } @SuppressWarnings("rawtypes") @Override public void doSecondPass(Map persistentClasses) throws MappingException { - grailsDomainBinder.bindListSecondPass(property, mappings, persistentClasses, + collectionBinder.bindListSecondPass(property, mappings, persistentClasses, (org.hibernate.mapping.List) collection, sessionFactoryBeanName); } } diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/MapSecondPass.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/MapSecondPass.java index 45006c3b2c..49a5f5ecc0 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/MapSecondPass.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/MapSecondPass.java @@ -10,14 +10,15 @@ import org.hibernate.mapping.Collection; import org.grails.orm.hibernate.cfg.GrailsDomainBinder; import org.grails.orm.hibernate.cfg.HibernateToManyProperty; +import org.grails.orm.hibernate.cfg.domainbinding.CollectionBinder; public class MapSecondPass extends GrailsCollectionSecondPass { private static final long serialVersionUID = -3244991685626409031L; - public MapSecondPass(GrailsDomainBinder grailsDomainBinder, HibernateToManyProperty property, @Nonnull InFlightMetadataCollector mappings, + public MapSecondPass(GrailsDomainBinder grailsDomainBinder, CollectionBinder collectionBinder, HibernateToManyProperty property, @Nonnull InFlightMetadataCollector mappings, Collection coll, String sessionFactoryBeanName) { - super(grailsDomainBinder, property, mappings, coll, sessionFactoryBeanName); + super(grailsDomainBinder, collectionBinder, property, mappings, coll, sessionFactoryBeanName); } @@ -25,7 +26,7 @@ public class MapSecondPass extends GrailsCollectionSecondPass { @SuppressWarnings("rawtypes") @Override public void doSecondPass(Map persistentClasses) throws MappingException { - grailsDomainBinder.bindMapSecondPass(property, mappings, persistentClasses, + collectionBinder.bindMapSecondPass(property, mappings, persistentClasses, (org.hibernate.mapping.Map) collection, sessionFactoryBeanName); } }
