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 85bf74da60e3b1ebac96cc7149f906b562b56239 Author: Walter Duque de Estrada <[email protected]> AuthorDate: Sat Feb 7 13:10:38 2026 -0600 remove one layer of indirection in SecondPass --- .../grails/orm/hibernate/cfg/GrailsDomainBinder.java | 2 +- .../hibernate/cfg/domainbinding/CollectionBinder.java | 18 +++++++----------- .../cfg/domainbinding/GrailsPropertyBinder.java | 1 + .../{ => secondpass}/CollectionSecondPassBinder.java | 14 +++++++++++++- .../cfg/domainbinding/secondpass/ListSecondPass.java | 7 ------- .../{ => secondpass}/ListSecondPassBinder.java | 7 +++++-- .../cfg/domainbinding/secondpass/MapSecondPass.java | 7 ------- .../{ => secondpass}/MapSecondPassBinder.java | 10 ++++++---- .../cfg/domainbinding/secondpass/SetSecondPass.java | 6 +++++- .../CollectionSecondPassBinderSpec.groovy | 4 +++- .../domainbinding/ComponentPropertyBinderSpec.groovy | 2 -- .../cfg/domainbinding/ListSecondPassBinderSpec.groovy | 3 +++ .../cfg/domainbinding/MapSecondPassBinderSpec.groovy | 5 ++++- 13 files changed, 48 insertions(+), 38 deletions(-) diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsDomainBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsDomainBinder.java index c8592f2b5c..280dae2d33 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsDomainBinder.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsDomainBinder.java @@ -28,6 +28,7 @@ import org.grails.orm.hibernate.cfg.domainbinding.NamingStrategyProvider; import org.grails.orm.hibernate.cfg.domainbinding.SimpleValueColumnBinder; import org.grails.orm.hibernate.cfg.domainbinding.*; import org.grails.orm.hibernate.cfg.domainbinding.collectionType.CollectionHolder; +import org.grails.orm.hibernate.cfg.domainbinding.CollectionBinder; import org.checkerframework.checker.nullness.qual.NonNull; import org.hibernate.MappingException; @@ -63,7 +64,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.Collections; -import java.util.Map; import java.util.Optional; import jakarta.annotation.Nonnull; 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 c37805d35d..4d25a77699 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 @@ -10,9 +10,13 @@ import org.grails.orm.hibernate.cfg.HibernateToManyProperty; import org.grails.orm.hibernate.cfg.PersistentEntityNamingStrategy; import org.grails.orm.hibernate.cfg.PropertyConfig; import org.grails.orm.hibernate.cfg.JoinTable; -import org.grails.orm.hibernate.cfg.domainbinding.secondpass.SetSecondPass; +import org.grails.orm.hibernate.cfg.domainbinding.secondpass.CollectionSecondPassBinder; import org.grails.orm.hibernate.cfg.domainbinding.secondpass.ListSecondPass; +import org.grails.orm.hibernate.cfg.domainbinding.secondpass.ListSecondPassBinder; import org.grails.orm.hibernate.cfg.domainbinding.secondpass.MapSecondPass; +import org.grails.orm.hibernate.cfg.domainbinding.secondpass.MapSecondPassBinder; +import org.grails.orm.hibernate.cfg.domainbinding.secondpass.SetSecondPass; + import org.hibernate.FetchMode; import org.hibernate.boot.spi.InFlightMetadataCollector; import org.hibernate.boot.spi.MetadataBuildingContext; @@ -98,25 +102,17 @@ public class CollectionBinder { } // set up second pass - if (collection instanceof org.hibernate.mapping.Set) { - mappings.addSecondPass(new SetSecondPass(grailsDomainBinder, this, property, mappings, collection, sessionFactoryBeanName)); - } - else if (collection instanceof org.hibernate.mapping.List) { + if (collection instanceof org.hibernate.mapping.List) { mappings.addSecondPass(new ListSecondPass(grailsDomainBinder, this, listSecondPassBinder, property, mappings, collection, sessionFactoryBeanName)); } else if (collection instanceof org.hibernate.mapping.Map) { mappings.addSecondPass(new MapSecondPass(grailsDomainBinder, this, mapSecondPassBinder, property, mappings, collection, sessionFactoryBeanName)); } else { // Collection -> Bag - mappings.addSecondPass(new SetSecondPass(grailsDomainBinder, this, property, mappings, collection, sessionFactoryBeanName)); + mappings.addSecondPass(new SetSecondPass(grailsDomainBinder, this,collectionSecondPassBinder, property, mappings, collection, sessionFactoryBeanName)); } } - public void bindCollectionSecondPass(HibernateToManyProperty property, @Nonnull InFlightMetadataCollector mappings, - Map<?, ?> persistentClasses, Collection collection, String sessionFactoryBeanName) { - collectionSecondPassBinder.bindCollectionSecondPass(property, mappings, persistentClasses, collection, sessionFactoryBeanName); - } - private String getNameForPropertyAndPath(PersistentProperty property, String path) { if (GrailsHibernateUtil.isNotEmpty(path)) { diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/GrailsPropertyBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/GrailsPropertyBinder.java index 2f5e65a02b..c51964269e 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/GrailsPropertyBinder.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/GrailsPropertyBinder.java @@ -9,6 +9,7 @@ import org.grails.orm.hibernate.cfg.Mapping; import org.grails.orm.hibernate.cfg.PersistentEntityNamingStrategy; import org.grails.orm.hibernate.cfg.domainbinding.collectionType.CollectionType; import org.grails.orm.hibernate.cfg.domainbinding.collectionType.CollectionHolder; + import org.hibernate.boot.spi.InFlightMetadataCollector; import org.hibernate.boot.spi.MetadataBuildingContext; import org.hibernate.mapping.BasicValue; diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/CollectionSecondPassBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionSecondPassBinder.java similarity index 96% rename from grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/CollectionSecondPassBinder.java rename to grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionSecondPassBinder.java index 0d22e749e3..88317014c3 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/CollectionSecondPassBinder.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionSecondPassBinder.java @@ -1,4 +1,4 @@ -package org.grails.orm.hibernate.cfg.domainbinding; +package org.grails.orm.hibernate.cfg.domainbinding.secondpass; import jakarta.annotation.Nonnull; import org.grails.datastore.mapping.model.DatastoreConfigurationException; @@ -10,6 +10,18 @@ import org.grails.datastore.mapping.model.types.Basic; import org.grails.datastore.mapping.model.types.ManyToMany; import org.grails.datastore.mapping.model.types.TenantId; import org.grails.orm.hibernate.cfg.*; +import org.grails.orm.hibernate.cfg.domainbinding.BackticksRemover; +import org.grails.orm.hibernate.cfg.domainbinding.CollectionForPropertyConfigBinder; +import org.grails.orm.hibernate.cfg.domainbinding.ColumnConfigToColumnBinder; +import org.grails.orm.hibernate.cfg.domainbinding.CompositeIdentifierToManyToOneBinder; +import org.grails.orm.hibernate.cfg.domainbinding.DefaultColumnNameFetcher; +import org.grails.orm.hibernate.cfg.domainbinding.EnumTypeBinder; +import org.grails.orm.hibernate.cfg.domainbinding.ManyToOneBinder; +import org.grails.orm.hibernate.cfg.domainbinding.RootMappingFetcher; +import org.grails.orm.hibernate.cfg.domainbinding.SimpleValueBinder; +import org.grails.orm.hibernate.cfg.domainbinding.SimpleValueColumnBinder; +import org.grails.orm.hibernate.cfg.domainbinding.SimpleValueColumnFetcher; + import org.hibernate.FetchMode; import org.hibernate.MappingException; import org.hibernate.boot.model.internal.BinderHelper; 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 2bc3df5705..4b30fbde33 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 @@ -1,7 +1,6 @@ package org.grails.orm.hibernate.cfg.domainbinding.secondpass; import java.io.Serial; -import java.util.Iterator; import java.util.Map; import jakarta.annotation.Nonnull; @@ -9,15 +8,10 @@ import jakarta.annotation.Nonnull; import org.hibernate.MappingException; import org.hibernate.boot.spi.InFlightMetadataCollector; import org.hibernate.mapping.Collection; -import org.hibernate.mapping.IndexedCollection; -import org.hibernate.mapping.OneToMany; -import org.hibernate.mapping.Selectable; -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; -import org.grails.orm.hibernate.cfg.domainbinding.ListSecondPassBinder; public class ListSecondPass implements org.hibernate.boot.spi.SecondPass, GrailsSecondPass { @Serial @@ -46,7 +40,6 @@ public class ListSecondPass implements org.hibernate.boot.spi.SecondPass, Grails @SuppressWarnings("rawtypes") @Override public void doSecondPass(Map persistentClasses) throws MappingException { - collectionBinder.bindCollectionSecondPass(property, mappings, persistentClasses, collection, sessionFactoryBeanName); listSecondPassBinder.bindListSecondPass(property, mappings, persistentClasses, (org.hibernate.mapping.List) collection, sessionFactoryBeanName); createCollectionKeys(collection); diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/ListSecondPassBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/ListSecondPassBinder.java similarity index 93% rename from grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/ListSecondPassBinder.java rename to grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/ListSecondPassBinder.java index f5e3aa3c21..171e2f94fe 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/ListSecondPassBinder.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/ListSecondPassBinder.java @@ -1,11 +1,13 @@ -package org.grails.orm.hibernate.cfg.domainbinding; +package org.grails.orm.hibernate.cfg.domainbinding.secondpass; import jakarta.annotation.Nonnull; import org.grails.datastore.mapping.model.PersistentEntity; import org.grails.datastore.mapping.model.types.ManyToMany; import org.grails.orm.hibernate.cfg.GrailsHibernatePersistentProperty; import org.grails.orm.hibernate.cfg.HibernateToManyProperty; -import org.grails.orm.hibernate.cfg.PersistentEntityNamingStrategy; +import org.grails.orm.hibernate.cfg.domainbinding.BackticksRemover; +import org.grails.orm.hibernate.cfg.domainbinding.SimpleValueColumnBinder; + import org.hibernate.MappingException; import org.hibernate.boot.spi.InFlightMetadataCollector; import org.hibernate.boot.spi.MetadataBuildingContext; @@ -40,6 +42,7 @@ public class ListSecondPassBinder { public void bindListSecondPass(HibernateToManyProperty property, @Nonnull InFlightMetadataCollector mappings, Map<?, ?> persistentClasses, org.hibernate.mapping.List list, String sessionFactoryBeanName) { + collectionSecondPassBinder.bindCollectionSecondPass(property, mappings, persistentClasses, list, sessionFactoryBeanName); String columnName = property.getIndexColumnName(collectionSecondPassBinder.getNamingStrategy()); final boolean isManyToMany = property instanceof ManyToMany; 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 31ff7dc83b..ba437735b4 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 @@ -1,7 +1,6 @@ package org.grails.orm.hibernate.cfg.domainbinding.secondpass; import java.io.Serial; -import java.util.Iterator; import java.util.Map; import jakarta.annotation.Nonnull; @@ -9,15 +8,10 @@ import jakarta.annotation.Nonnull; import org.hibernate.MappingException; import org.hibernate.boot.spi.InFlightMetadataCollector; import org.hibernate.mapping.Collection; -import org.hibernate.mapping.IndexedCollection; -import org.hibernate.mapping.OneToMany; -import org.hibernate.mapping.Selectable; -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; -import org.grails.orm.hibernate.cfg.domainbinding.MapSecondPassBinder; public class MapSecondPass implements org.hibernate.boot.spi.SecondPass, GrailsSecondPass { @Serial @@ -47,7 +41,6 @@ public class MapSecondPass implements org.hibernate.boot.spi.SecondPass, GrailsS @SuppressWarnings("rawtypes") @Override public void doSecondPass(Map persistentClasses) throws MappingException { - collectionBinder.bindCollectionSecondPass(property, mappings, persistentClasses, collection, sessionFactoryBeanName); mapSecondPassBinder.bindMapSecondPass(property, mappings, persistentClasses, (org.hibernate.mapping.Map) collection, sessionFactoryBeanName); createCollectionKeys(collection); diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/MapSecondPassBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/MapSecondPassBinder.java similarity index 91% rename from grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/MapSecondPassBinder.java rename to grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/MapSecondPassBinder.java index 74c0fef098..5bce24e842 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/MapSecondPassBinder.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/MapSecondPassBinder.java @@ -1,4 +1,4 @@ -package org.grails.orm.hibernate.cfg.domainbinding; +package org.grails.orm.hibernate.cfg.domainbinding.secondpass; import jakarta.annotation.Nonnull; @@ -10,20 +10,21 @@ import org.grails.orm.hibernate.cfg.HibernateToManyProperty; import org.grails.orm.hibernate.cfg.Mapping; import org.grails.orm.hibernate.cfg.PersistentEntityNamingStrategy; import org.grails.orm.hibernate.cfg.PropertyConfig; +import org.grails.orm.hibernate.cfg.domainbinding.ColumnConfigToColumnBinder; +import org.grails.orm.hibernate.cfg.domainbinding.SimpleValueColumnBinder; +import org.grails.orm.hibernate.cfg.domainbinding.SimpleValueColumnFetcher; + import org.hibernate.MappingException; import org.hibernate.boot.spi.InFlightMetadataCollector; import org.hibernate.boot.spi.MetadataBuildingContext; import org.hibernate.mapping.BasicValue; import org.hibernate.mapping.Column; -import org.hibernate.mapping.IndexedCollection; import org.hibernate.mapping.SimpleValue; import org.hibernate.type.StandardBasicTypes; import java.util.List; import java.util.Map; -import static org.grails.orm.hibernate.cfg.GrailsDomainBinder.UNDERSCORE; - /** * Refactored from CollectionBinder to handle map second pass binding. */ @@ -40,6 +41,7 @@ public class MapSecondPassBinder { public void bindMapSecondPass(HibernateToManyProperty property, @Nonnull InFlightMetadataCollector mappings, Map<?, ?> persistentClasses, org.hibernate.mapping.Map map, String sessionFactoryBeanName) { + collectionSecondPassBinder.bindCollectionSecondPass(property, mappings, persistentClasses, map, sessionFactoryBeanName); SimpleValue value = new BasicValue(metadataBuildingContext, map.getCollectionTable()); String type = ((GrailsHibernatePersistentProperty) property).getIndexColumnType("string"); diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/SetSecondPass.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/SetSecondPass.java index 2154bd44e9..161109c12e 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/SetSecondPass.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/SetSecondPass.java @@ -25,6 +25,7 @@ public class SetSecondPass implements org.hibernate.boot.spi.SecondPass, GrailsS protected final GrailsDomainBinder grailsDomainBinder; protected final CollectionBinder collectionBinder; + private final CollectionSecondPassBinder collectionSecondPassBinder; protected final HibernateToManyProperty property; protected final @Nonnull InFlightMetadataCollector mappings; protected final Collection collection; @@ -32,22 +33,25 @@ public class SetSecondPass implements org.hibernate.boot.spi.SecondPass, GrailsS public SetSecondPass(GrailsDomainBinder grailsDomainBinder, CollectionBinder collectionBinder, + CollectionSecondPassBinder collectionSecondPassBinder, HibernateToManyProperty property, @Nonnull InFlightMetadataCollector mappings, Collection coll, String sessionFactoryBeanName) { this.grailsDomainBinder = grailsDomainBinder; this.collectionBinder = collectionBinder; + this.collectionSecondPassBinder = collectionSecondPassBinder; this.property = property; this.mappings = mappings; this.collection = coll; this.sessionFactoryBeanName = sessionFactoryBeanName; + } @SuppressWarnings("rawtypes") public void doSecondPass(Map persistentClasses) throws MappingException { - collectionBinder.bindCollectionSecondPass(property, mappings, persistentClasses, collection, sessionFactoryBeanName); + collectionSecondPassBinder.bindCollectionSecondPass(property, mappings, persistentClasses, collection, sessionFactoryBeanName); createCollectionKeys(collection); } } diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/CollectionSecondPassBinderSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/CollectionSecondPassBinderSpec.groovy index c0bce6e197..e1c4d87b60 100644 --- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/CollectionSecondPassBinderSpec.groovy +++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/CollectionSecondPassBinderSpec.groovy @@ -4,9 +4,11 @@ import grails.gorm.annotation.Entity import grails.gorm.specs.HibernateGormDatastoreSpec import org.grails.orm.hibernate.cfg.GrailsHibernatePersistentEntity import org.grails.orm.hibernate.cfg.HibernateToManyProperty -import org.hibernate.mapping.Collection + import org.hibernate.mapping.RootClass +import org.grails.orm.hibernate.cfg.domainbinding.secondpass.CollectionSecondPassBinder + class CollectionSecondPassBinderSpec extends HibernateGormDatastoreSpec { void setupSpec() { diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/ComponentPropertyBinderSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/ComponentPropertyBinderSpec.groovy index 44c5ed8ed4..265b8d8715 100644 --- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/ComponentPropertyBinderSpec.groovy +++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/ComponentPropertyBinderSpec.groovy @@ -5,7 +5,6 @@ import org.grails.datastore.mapping.model.MappingContext import org.grails.datastore.mapping.model.PersistentEntity import org.grails.datastore.mapping.model.PersistentProperty import org.grails.datastore.mapping.model.types.Association -import org.grails.datastore.mapping.model.types.Embedded import org.grails.datastore.mapping.model.types.ManyToOne as GormManyToOne import org.grails.datastore.mapping.model.types.OneToOne as GormOneToOne import org.grails.orm.hibernate.cfg.GrailsHibernatePersistentEntity @@ -21,7 +20,6 @@ import org.hibernate.mapping.Column import org.hibernate.mapping.Component import org.hibernate.mapping.ManyToOne as HibernateManyToOne import org.hibernate.mapping.OneToOne as HibernateOneToOne -import org.hibernate.mapping.PersistentClass import org.hibernate.mapping.Property import org.hibernate.mapping.RootClass import org.hibernate.mapping.Table diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/ListSecondPassBinderSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/ListSecondPassBinderSpec.groovy index d1ab83a687..9f7ac201df 100644 --- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/ListSecondPassBinderSpec.groovy +++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/ListSecondPassBinderSpec.groovy @@ -8,6 +8,9 @@ import org.grails.orm.hibernate.cfg.HibernateToManyProperty import org.hibernate.mapping.RootClass import org.hibernate.mapping.SimpleValue +import org.grails.orm.hibernate.cfg.domainbinding.secondpass.CollectionSecondPassBinder +import org.grails.orm.hibernate.cfg.domainbinding.secondpass.ListSecondPassBinder + class ListSecondPassBinderSpec extends HibernateGormDatastoreSpec { void setupSpec() { diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/MapSecondPassBinderSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/MapSecondPassBinderSpec.groovy index f3b0fedaaf..fe69450589 100644 --- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/MapSecondPassBinderSpec.groovy +++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/MapSecondPassBinderSpec.groovy @@ -4,10 +4,13 @@ import grails.gorm.annotation.Entity import grails.gorm.specs.HibernateGormDatastoreSpec import org.grails.orm.hibernate.cfg.GrailsHibernatePersistentEntity import org.grails.orm.hibernate.cfg.HibernateToManyProperty -import org.hibernate.mapping.Map + import org.hibernate.mapping.RootClass import org.hibernate.mapping.SimpleValue +import org.grails.orm.hibernate.cfg.domainbinding.secondpass.CollectionSecondPassBinder +import org.grails.orm.hibernate.cfg.domainbinding.secondpass.MapSecondPassBinder + class MapSecondPassBinderSpec extends HibernateGormDatastoreSpec { void setupSpec() {
