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 03cc0dcb442c379f42d91dc40993c8060df2a7eb Author: Walter Duque de Estrada <[email protected]> AuthorDate: Tue Feb 24 12:16:29 2026 -0600 clean up ctors --- .../cfg/domainbinding/binder/CompositeIdBinder.java | 3 --- .../binder/CompositeIdentifierToManyToOneBinder.java | 6 +----- .../cfg/domainbinding/binder/GrailsDomainBinder.java | 11 ++++------- .../cfg/domainbinding/binder/OneToOneBinder.java | 6 +----- .../cfg/domainbinding/binder/SimpleIdBinder.java | 18 ------------------ .../cfg/domainbinding/CollectionBinderSpec.groovy | 8 ++++---- .../cfg/domainbinding/CompositeIdBinderSpec.groovy | 2 +- .../CompositeIdentifierToManyToOneBinderSpec.groovy | 4 ++-- .../cfg/domainbinding/GrailsPropertyBinderSpec.groovy | 8 ++++---- .../cfg/domainbinding/OneToOneBinderSpec.groovy | 2 +- .../cfg/domainbinding/SimpleIdBinderSpec.groovy | 2 +- .../RootPersistentClassCommonValuesBinderSpec.groovy | 13 +++---------- .../secondpass/ListSecondPassBinderSpec.groovy | 8 ++++---- .../secondpass/MapSecondPassBinderSpec.groovy | 8 ++++---- 14 files changed, 30 insertions(+), 69 deletions(-) diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/CompositeIdBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/CompositeIdBinder.java index f58b631422..2d3b7be25f 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/CompositeIdBinder.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/CompositeIdBinder.java @@ -31,17 +31,14 @@ import org.hibernate.mapping.RootClass; public class CompositeIdBinder { private final MetadataBuildingContext metadataBuildingContext; - private final ComponentBinder componentBinder; private final ComponentUpdater componentUpdater; private final GrailsPropertyBinder grailsPropertyBinder; public CompositeIdBinder( MetadataBuildingContext metadataBuildingContext, - ComponentBinder componentBinder, ComponentUpdater componentUpdater, GrailsPropertyBinder grailsPropertyBinder) { this.metadataBuildingContext = metadataBuildingContext; - this.componentBinder = componentBinder; this.componentUpdater = componentUpdater; this.grailsPropertyBinder = grailsPropertyBinder; } diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/CompositeIdentifierToManyToOneBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/CompositeIdentifierToManyToOneBinder.java index 8da736bc7b..570f3d0d16 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/CompositeIdentifierToManyToOneBinder.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/CompositeIdentifierToManyToOneBinder.java @@ -37,7 +37,6 @@ import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; import org.hibernate.mapping.SimpleValue; public class CompositeIdentifierToManyToOneBinder { - private final MetadataBuildingContext metadataBuildingContext; private final ForeignKeyColumnCountCalculator foreignKeyColumnCountCalculator; private final PersistentEntityNamingStrategy namingStrategy; private final DefaultColumnNameFetcher defaultColumnNameFetcher; @@ -45,13 +44,11 @@ public class CompositeIdentifierToManyToOneBinder { private final SimpleValueBinder simpleValueBinder; public CompositeIdentifierToManyToOneBinder( - MetadataBuildingContext metadataBuildingContext, ForeignKeyColumnCountCalculator foreignKeyColumnCountCalculator, PersistentEntityNamingStrategy namingStrategy, DefaultColumnNameFetcher defaultColumnNameFetcher, BackticksRemover backticksRemover, SimpleValueBinder simpleValueBinder) { - this.metadataBuildingContext = metadataBuildingContext; this.foreignKeyColumnCountCalculator = foreignKeyColumnCountCalculator; this.namingStrategy = namingStrategy; this.defaultColumnNameFetcher = defaultColumnNameFetcher; @@ -64,8 +61,7 @@ public class CompositeIdentifierToManyToOneBinder { PersistentEntityNamingStrategy namingStrategy, JdbcEnvironment jdbcEnvironment) { this( - metadataBuildingContext, - new ForeignKeyColumnCountCalculator(), + new ForeignKeyColumnCountCalculator(), namingStrategy, new DefaultColumnNameFetcher(namingStrategy), new BackticksRemover(), 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 07b51a651c..e1b47891ec 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 @@ -128,14 +128,13 @@ public class GrailsDomainBinder implements AdditionalMappingContributor, TypeCon SimpleValueColumnFetcher simpleValueColumnFetcher = new SimpleValueColumnFetcher(); CompositeIdentifierToManyToOneBinder compositeIdentifierToManyToOneBinder = new CompositeIdentifierToManyToOneBinder( - metadataBuildingContext, - new org.grails.orm.hibernate.cfg.domainbinding.util.ForeignKeyColumnCountCalculator(), + new org.grails.orm.hibernate.cfg.domainbinding.util.ForeignKeyColumnCountCalculator(), namingStrategy, defaultColumnNameFetcher, backticksRemover, simpleValueBinder); OneToOneBinder oneToOneBinder = - new OneToOneBinder(metadataBuildingContext, namingStrategy, simpleValueBinder); + new OneToOneBinder(metadataBuildingContext, simpleValueBinder); ManyToOneBinder manyToOneBinder = new ManyToOneBinder( metadataBuildingContext, @@ -171,14 +170,12 @@ public class GrailsDomainBinder implements AdditionalMappingContributor, TypeCon componentBinder.setGrailsPropertyBinder(grailsPropertyBinder); CompositeIdBinder compositeIdBinder = new CompositeIdBinder( - metadataBuildingContext, componentBinder, componentUpdater, grailsPropertyBinder); + metadataBuildingContext, componentUpdater, grailsPropertyBinder); PropertyBinder propertyBinder = new PropertyBinder(); SimpleIdBinder simpleIdBinder = new SimpleIdBinder( metadataBuildingContext, - namingStrategy, - jdbcEnvironment, - new BasicValueIdCreator(jdbcEnvironment, namingStrategy), + new BasicValueIdCreator(jdbcEnvironment, namingStrategy), simpleValueBinder, propertyBinder); IdentityBinder identityBinder = new IdentityBinder(simpleIdBinder, compositeIdBinder); diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/OneToOneBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/OneToOneBinder.java index 456df9adb6..93b2df2f18 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/OneToOneBinder.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/OneToOneBinder.java @@ -32,15 +32,12 @@ import org.hibernate.type.ForeignKeyDirection; public class OneToOneBinder { private final MetadataBuildingContext metadataBuildingContext; - private final PersistentEntityNamingStrategy namingStrategy; private final SimpleValueBinder simpleValueBinder; public OneToOneBinder( MetadataBuildingContext metadataBuildingContext, - PersistentEntityNamingStrategy namingStrategy, SimpleValueBinder simpleValueBinder) { this.metadataBuildingContext = metadataBuildingContext; - this.namingStrategy = namingStrategy; this.simpleValueBinder = simpleValueBinder; } @@ -50,8 +47,7 @@ public class OneToOneBinder { JdbcEnvironment jdbcEnvironment) { this( metadataBuildingContext, - namingStrategy, - new SimpleValueBinder(metadataBuildingContext, namingStrategy, jdbcEnvironment)); + new SimpleValueBinder(metadataBuildingContext, namingStrategy, jdbcEnvironment)); } public OneToOne bindOneToOne( diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/SimpleIdBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/SimpleIdBinder.java index 60e5f4fe72..e4c2934711 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/SimpleIdBinder.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/SimpleIdBinder.java @@ -23,13 +23,11 @@ import static org.grails.orm.hibernate.cfg.domainbinding.binder.GrailsDomainBind import jakarta.annotation.Nonnull; import org.grails.orm.hibernate.cfg.Identity; import org.grails.orm.hibernate.cfg.Mapping; -import org.grails.orm.hibernate.cfg.PersistentEntityNamingStrategy; import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentEntity; import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty; import org.grails.orm.hibernate.cfg.domainbinding.util.BasicValueIdCreator; import org.hibernate.MappingException; import org.hibernate.boot.spi.MetadataBuildingContext; -import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; import org.hibernate.mapping.BasicValue; import org.hibernate.mapping.PrimaryKey; import org.hibernate.mapping.Property; @@ -39,20 +37,16 @@ import org.hibernate.mapping.Table; public class SimpleIdBinder { private final MetadataBuildingContext metadataBuildingContext; - private final JdbcEnvironment jdbcEnvironment; private final SimpleValueBinder simpleValueBinder; private final PropertyBinder propertyBinder; private final BasicValueIdCreator basicValueIdCreator; public SimpleIdBinder( MetadataBuildingContext metadataBuildingContext, - PersistentEntityNamingStrategy namingStrategy, - JdbcEnvironment jdbcEnvironment, BasicValueIdCreator basicValueIdCreator, SimpleValueBinder simpleValueBinder, PropertyBinder propertyBinder) { this.metadataBuildingContext = metadataBuildingContext; - this.jdbcEnvironment = jdbcEnvironment; this.simpleValueBinder = simpleValueBinder; this.propertyBinder = propertyBinder; this.basicValueIdCreator = basicValueIdCreator; @@ -62,18 +56,6 @@ public class SimpleIdBinder { return metadataBuildingContext; } - protected SimpleIdBinder( - MetadataBuildingContext metadataBuildingContext, - JdbcEnvironment jdbcEnvironment, - BasicValueIdCreator basicValueIdCreator, - SimpleValueBinder simpleValueBinder, - PropertyBinder propertyBinder) { - this.metadataBuildingContext = metadataBuildingContext; - this.jdbcEnvironment = jdbcEnvironment; - this.simpleValueBinder = simpleValueBinder; - this.propertyBinder = propertyBinder; - this.basicValueIdCreator = basicValueIdCreator; - } public void bindSimpleId( @Nonnull GrailsHibernatePersistentEntity domainClass, 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 84db282240..ac9864dc77 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 @@ -62,14 +62,14 @@ class CollectionBinderSpec extends HibernateGormDatastoreSpec { EnumTypeBinder enumTypeBinderToUse = new EnumTypeBinder(metadataBuildingContext, columnNameForPropertyAndPathFetcher) SimpleValueColumnFetcher simpleValueColumnFetcher = new SimpleValueColumnFetcher() CompositeIdentifierToManyToOneBinder compositeIdentifierToManyToOneBinder = new CompositeIdentifierToManyToOneBinder( - metadataBuildingContext, + new org.grails.orm.hibernate.cfg.domainbinding.util.ForeignKeyColumnCountCalculator(), namingStrategy, defaultColumnNameFetcher, backticksRemover, simpleValueBinder ) - OneToOneBinder oneToOneBinder = new OneToOneBinder(metadataBuildingContext, namingStrategy, simpleValueBinder) + OneToOneBinder oneToOneBinder = new OneToOneBinder(metadataBuildingContext, simpleValueBinder) ManyToOneBinder manyToOneBinder = new ManyToOneBinder(metadataBuildingContext, namingStrategy, simpleValueBinder, new ManyToOneValuesBinder(), compositeIdentifierToManyToOneBinder, simpleValueColumnFetcher) CollectionBinder collectionBinder = new CollectionBinder( @@ -104,9 +104,9 @@ class CollectionBinderSpec extends HibernateGormDatastoreSpec { manyToOneBinder ) - CompositeIdBinder compositeIdBinder = new CompositeIdBinder(metadataBuildingContext, componentBinder, componentUpdater, propertyBinder) + CompositeIdBinder compositeIdBinder = new CompositeIdBinder(metadataBuildingContext, componentUpdater, propertyBinder) PropertyBinder propertyBinderHelper = new PropertyBinder() - SimpleIdBinder simpleIdBinder = new SimpleIdBinder(metadataBuildingContext, namingStrategy, jdbcEnvironment, new BasicValueIdCreator(jdbcEnvironment, namingStrategy), simpleValueBinder, propertyBinderHelper) + SimpleIdBinder simpleIdBinder = new SimpleIdBinder(metadataBuildingContext, new BasicValueIdCreator(jdbcEnvironment, namingStrategy), simpleValueBinder, propertyBinderHelper) IdentityBinder identityBinder = new IdentityBinder(simpleIdBinder, compositeIdBinder) VersionBinder versionBinder = new VersionBinder(metadataBuildingContext, simpleValueBinder, propertyBinderHelper, BasicValue::new) diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/CompositeIdBinderSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/CompositeIdBinderSpec.groovy index 934ee976ab..e41abea561 100644 --- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/CompositeIdBinderSpec.groovy +++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/CompositeIdBinderSpec.groovy @@ -26,7 +26,7 @@ class CompositeIdBinderSpec extends HibernateGormDatastoreSpec { CompositeIdBinder binder def setup() { - binder = new CompositeIdBinder(getGrailsDomainBinder().getMetadataBuildingContext(), componentBinder, componentUpdater, grailsPropertyBinder) + binder = new CompositeIdBinder(getGrailsDomainBinder().getMetadataBuildingContext(), componentUpdater, grailsPropertyBinder) } def "should bind composite id using property names from CompositeIdentity"() { diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/CompositeIdentifierToManyToOneBinderSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/CompositeIdentifierToManyToOneBinderSpec.groovy index a569797bb5..1dd788b879 100644 --- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/CompositeIdentifierToManyToOneBinderSpec.groovy +++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/CompositeIdentifierToManyToOneBinderSpec.groovy @@ -31,7 +31,7 @@ class CompositeIdentifierToManyToOneBinderSpec extends Specification { def metadataBuildingContext = Mock(org.hibernate.boot.spi.MetadataBuildingContext) // Instantiate the binder with stubs - def binder = new CompositeIdentifierToManyToOneBinder(metadataBuildingContext, calculator, namingStrategy, columnNameFetcher, backticksRemover, simpleValueBinder) + def binder = new CompositeIdentifierToManyToOneBinder(calculator, namingStrategy, columnNameFetcher, backticksRemover, simpleValueBinder) // 2. Set up stubs for the method arguments def association = Mock(ToOne) @@ -97,7 +97,7 @@ class CompositeIdentifierToManyToOneBinderSpec extends Specification { def simpleValueBinder = Mock(SimpleValueBinder) def metadataBuildingContext = Mock(org.hibernate.boot.spi.MetadataBuildingContext) - def binder = new CompositeIdentifierToManyToOneBinder(metadataBuildingContext, calculator, namingStrategy, columnNameFetcher, backticksRemover, simpleValueBinder) + def binder = new CompositeIdentifierToManyToOneBinder(calculator, namingStrategy, columnNameFetcher, backticksRemover, simpleValueBinder) // 2. Set up arguments def association = Mock(ToOne) 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 54a2611a8e..a3cdacfd7e 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 @@ -121,14 +121,14 @@ class GrailsPropertyBinderSpec extends HibernateGormDatastoreSpec { EnumTypeBinder enumTypeBinderToUse = new EnumTypeBinder(metadataBuildingContext, columnNameForPropertyAndPathFetcher) SimpleValueColumnFetcher simpleValueColumnFetcher = new SimpleValueColumnFetcher() CompositeIdentifierToManyToOneBinder compositeIdentifierToManyToOneBinder = new CompositeIdentifierToManyToOneBinder( - metadataBuildingContext, + new org.grails.orm.hibernate.cfg.domainbinding.util.ForeignKeyColumnCountCalculator(), namingStrategy, defaultColumnNameFetcher, backticksRemover, simpleValueBinder ) - OneToOneBinder oneToOneBinder = new OneToOneBinder(metadataBuildingContext, namingStrategy, simpleValueBinder) + OneToOneBinder oneToOneBinder = new OneToOneBinder(metadataBuildingContext, simpleValueBinder) ManyToOneBinder manyToOneBinder = new ManyToOneBinder(metadataBuildingContext, namingStrategy, simpleValueBinder, new ManyToOneValuesBinder(), compositeIdentifierToManyToOneBinder, simpleValueColumnFetcher) CollectionBinder collectionBinder = new CollectionBinder( @@ -163,9 +163,9 @@ class GrailsPropertyBinderSpec extends HibernateGormDatastoreSpec { ) componentBinder.setGrailsPropertyBinder(propertyBinder) - CompositeIdBinder compositeIdBinder = new CompositeIdBinder(metadataBuildingContext, componentBinder, componentUpdater, propertyBinder); + CompositeIdBinder compositeIdBinder = new CompositeIdBinder(metadataBuildingContext, componentUpdater, propertyBinder); PropertyBinder propertyBinderHelper = new PropertyBinder() - SimpleIdBinder simpleIdBinder = new SimpleIdBinder(metadataBuildingContext, namingStrategy, jdbcEnvironment, new BasicValueIdCreator(jdbcEnvironment, namingStrategy), simpleValueBinder, propertyBinderHelper) + SimpleIdBinder simpleIdBinder = new SimpleIdBinder(metadataBuildingContext, new BasicValueIdCreator(jdbcEnvironment, namingStrategy), simpleValueBinder, propertyBinderHelper) IdentityBinder identityBinder = new IdentityBinder(simpleIdBinder, compositeIdBinder) VersionBinder versionBinder = new VersionBinder(metadataBuildingContext, simpleValueBinder, propertyBinderHelper, BasicValue::new) NaturalIdentifierBinder naturalIdentifierBinder = new NaturalIdentifierBinder() diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/OneToOneBinderSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/OneToOneBinderSpec.groovy index a08789ba9e..8b834b5d76 100644 --- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/OneToOneBinderSpec.groovy +++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/OneToOneBinderSpec.groovy @@ -22,7 +22,7 @@ class OneToOneBinderSpec extends HibernateGormDatastoreSpec { SimpleValueBinder mockSimpleValueBinder = Mock(SimpleValueBinder) def setup() { - binder = new OneToOneBinder(getGrailsDomainBinder().getMetadataBuildingContext(), getGrailsDomainBinder().getNamingStrategy(), mockSimpleValueBinder) + binder = new OneToOneBinder(getGrailsDomainBinder().getMetadataBuildingContext(), mockSimpleValueBinder) } def "should bind one-to-one mapping with defaults"() { diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/SimpleIdBinderSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/SimpleIdBinderSpec.groovy index b29a6ec855..a3453fb7e6 100644 --- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/SimpleIdBinderSpec.groovy +++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/SimpleIdBinderSpec.groovy @@ -50,7 +50,7 @@ class SimpleIdBinderSpec extends HibernateGormDatastoreSpec { simpleValueBinder = Mock(SimpleValueBinder) propertyBinder = Spy(PropertyBinder) - simpleIdBinder = new SimpleIdBinder(metadataBuildingContext, jdbcEnvironment, basicValueIdCreator, simpleValueBinder, propertyBinder) + simpleIdBinder = new SimpleIdBinder(metadataBuildingContext, basicValueIdCreator, simpleValueBinder, propertyBinder) } def "bindSimpleId with identity generator"() { diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/RootPersistentClassCommonValuesBinderSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/RootPersistentClassCommonValuesBinderSpec.groovy index 8ff83544ce..a1ea763a5a 100644 --- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/RootPersistentClassCommonValuesBinderSpec.groovy +++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/RootPersistentClassCommonValuesBinderSpec.groovy @@ -5,15 +5,8 @@ import grails.gorm.specs.HibernateGormDatastoreSpec import org.hibernate.mapping.RootClass import org.hibernate.boot.spi.MetadataBuildingContext import org.grails.orm.hibernate.cfg.PersistentEntityNamingStrategy -import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment import org.grails.orm.hibernate.cfg.domainbinding.util.BasicValueIdCreator -import org.grails.orm.hibernate.cfg.domainbinding.util.BackticksRemover -import org.grails.orm.hibernate.cfg.domainbinding.util.DefaultColumnNameFetcher -import org.grails.orm.hibernate.cfg.Mapping -import org.grails.datastore.mapping.model.PersistentEntity -import org.hibernate.mapping.SimpleValue -import org.hibernate.mapping.Column -import org.hibernate.mapping.Table + import org.hibernate.mapping.BasicValue class RootPersistentClassCommonValuesBinderSpec extends HibernateGormDatastoreSpec { @@ -36,8 +29,8 @@ class RootPersistentClassCommonValuesBinderSpec extends HibernateGormDatastoreSp def jdbcEnvironment = gormDomainBinder.getJdbcEnvironment() def simpleValueBinder = new SimpleValueBinder(metadataBuildingContext, namingStrategy, jdbcEnvironment) def propertyBinder = new PropertyBinder() - def simpleIdBinder = new SimpleIdBinder(metadataBuildingContext, namingStrategy, jdbcEnvironment, new BasicValueIdCreator(jdbcEnvironment, namingStrategy), simpleValueBinder, propertyBinder) - def compositeIdBinder = new CompositeIdBinder(metadataBuildingContext, null, null, null) + def simpleIdBinder = new SimpleIdBinder(metadataBuildingContext, new BasicValueIdCreator(jdbcEnvironment, namingStrategy), simpleValueBinder, propertyBinder) + def compositeIdBinder = new CompositeIdBinder(metadataBuildingContext, null, null) identityBinder = new IdentityBinder(simpleIdBinder, compositeIdBinder) versionBinder = new VersionBinder(metadataBuildingContext, simpleValueBinder, propertyBinder, BasicValue::new) classBinder = new ClassBinder() 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 0ec9dd2006..335cc736c5 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 @@ -61,14 +61,14 @@ class ListSecondPassBinderSpec extends HibernateGormDatastoreSpec { EnumTypeBinder enumTypeBinderToUse = new EnumTypeBinder(metadataBuildingContext, columnNameForPropertyAndPathFetcher) SimpleValueColumnFetcher simpleValueColumnFetcher = new SimpleValueColumnFetcher() CompositeIdentifierToManyToOneBinder compositeIdentifierToManyToOneBinder = new CompositeIdentifierToManyToOneBinder( - metadataBuildingContext, + new org.grails.orm.hibernate.cfg.domainbinding.util.ForeignKeyColumnCountCalculator(), namingStrategy, defaultColumnNameFetcher, backticksRemover, simpleValueBinder ) - OneToOneBinder oneToOneBinder = new OneToOneBinder(metadataBuildingContext, namingStrategy, simpleValueBinder) + OneToOneBinder oneToOneBinder = new OneToOneBinder(metadataBuildingContext, simpleValueBinder) ManyToOneBinder manyToOneBinder = new ManyToOneBinder(metadataBuildingContext, namingStrategy, simpleValueBinder, new ManyToOneValuesBinder(), compositeIdentifierToManyToOneBinder, simpleValueColumnFetcher) CollectionBinder collectionBinder = new CollectionBinder( @@ -103,9 +103,9 @@ class ListSecondPassBinderSpec extends HibernateGormDatastoreSpec { manyToOneBinder ) - CompositeIdBinder compositeIdBinder = new CompositeIdBinder(metadataBuildingContext, componentBinder, componentUpdater, propertyBinder) + CompositeIdBinder compositeIdBinder = new CompositeIdBinder(metadataBuildingContext, componentUpdater, propertyBinder) PropertyBinder propertyBinderHelper = new PropertyBinder() - SimpleIdBinder simpleIdBinder = new SimpleIdBinder(metadataBuildingContext, namingStrategy, jdbcEnvironment, new BasicValueIdCreator(jdbcEnvironment, namingStrategy), simpleValueBinder, propertyBinderHelper) + SimpleIdBinder simpleIdBinder = new SimpleIdBinder(metadataBuildingContext, new BasicValueIdCreator(jdbcEnvironment, namingStrategy), simpleValueBinder, propertyBinderHelper) IdentityBinder identityBinder = new IdentityBinder(simpleIdBinder, compositeIdBinder) VersionBinder versionBinder = new VersionBinder(metadataBuildingContext, simpleValueBinder, propertyBinderHelper, BasicValue::new) 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 52c238fa53..063c5ac1c9 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 @@ -61,14 +61,14 @@ class MapSecondPassBinderSpec extends HibernateGormDatastoreSpec { EnumTypeBinder enumTypeBinderToUse = new EnumTypeBinder(metadataBuildingContext, columnNameForPropertyAndPathFetcher) SimpleValueColumnFetcher simpleValueColumnFetcher = new SimpleValueColumnFetcher() CompositeIdentifierToManyToOneBinder compositeIdentifierToManyToOneBinder = new CompositeIdentifierToManyToOneBinder( - metadataBuildingContext, + new org.grails.orm.hibernate.cfg.domainbinding.util.ForeignKeyColumnCountCalculator(), namingStrategy, defaultColumnNameFetcher, backticksRemover, simpleValueBinder ) - OneToOneBinder oneToOneBinder = new OneToOneBinder(metadataBuildingContext, namingStrategy, simpleValueBinder) + OneToOneBinder oneToOneBinder = new OneToOneBinder(metadataBuildingContext, simpleValueBinder) ManyToOneBinder manyToOneBinder = new ManyToOneBinder(metadataBuildingContext, namingStrategy, simpleValueBinder, new ManyToOneValuesBinder(), compositeIdentifierToManyToOneBinder, simpleValueColumnFetcher) CollectionBinder collectionBinder = new CollectionBinder( @@ -103,9 +103,9 @@ class MapSecondPassBinderSpec extends HibernateGormDatastoreSpec { manyToOneBinder ) - CompositeIdBinder compositeIdBinder = new CompositeIdBinder(metadataBuildingContext, componentBinder, componentUpdater, propertyBinder) + CompositeIdBinder compositeIdBinder = new CompositeIdBinder(metadataBuildingContext, componentUpdater, propertyBinder) PropertyBinder propertyBinderHelper = new PropertyBinder() - SimpleIdBinder simpleIdBinder = new SimpleIdBinder(metadataBuildingContext, namingStrategy, jdbcEnvironment, new BasicValueIdCreator(jdbcEnvironment, namingStrategy), simpleValueBinder, propertyBinderHelper) + SimpleIdBinder simpleIdBinder = new SimpleIdBinder(metadataBuildingContext, new BasicValueIdCreator(jdbcEnvironment, namingStrategy), simpleValueBinder, propertyBinderHelper) IdentityBinder identityBinder = new IdentityBinder(simpleIdBinder, compositeIdBinder) VersionBinder versionBinder = new VersionBinder(metadataBuildingContext, simpleValueBinder, propertyBinderHelper, BasicValue::new)
