You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@grails.apache.org by bo...@apache.org on 2026/03/03 23:27:13 UTC
(grails-core) 06/24: Move InFlightMetadataCollector into ComponentBinder constructor; remove it from bindProperty, bindComponent, bindClassProperties, and bindCompositeId method signatures
This is an automated email from the ASF dual-hosted git repository.
borinquenkid pushed a commit to branch 8.0.x-hibernate7-dev
in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 0d90e57e40b7e3d97ae27d409e1a4e7870ce77fc
Author: Walter Duque de Estrada <wb...@mac.com>
AuthorDate: Mon Mar 2 10:59:23 2026 -0600
Move InFlightMetadataCollector into ComponentBinder constructor; remove it from bindProperty, bindComponent, bindClassProperties, and bindCompositeId method signatures
---
.../domainbinding/binder/ClassPropertiesBinder.java | 14 ++------------
.../cfg/domainbinding/binder/ComponentBinder.java | 9 +++++----
.../cfg/domainbinding/binder/CompositeIdBinder.java | 6 ++----
.../domainbinding/binder/GrailsDomainBinder.java | 2 +-
.../domainbinding/binder/GrailsPropertyBinder.java | 6 ++----
.../cfg/domainbinding/binder/IdentityBinder.java | 2 +-
.../RootPersistentClassCommonValuesBinder.java | 2 +-
.../domainbinding/binder/SubclassMappingBinder.java | 2 +-
.../cfg/domainbinding/CollectionBinderSpec.groovy | 3 ++-
.../cfg/domainbinding/ComponentBinderSpec.groovy | 13 +++++++------
.../cfg/domainbinding/CompositeIdBinderSpec.groovy | 10 +++++-----
.../domainbinding/GrailsPropertyBinderSpec.groovy | 21 +++++++++++----------
.../cfg/domainbinding/IdentityBinderSpec.groovy | 4 ++--
.../binder/ClassPropertiesBinderSpec.groovy | 6 +++---
...RootPersistentClassCommonValuesBinderSpec.groovy | 2 +-
.../binder/SubclassMappingBinderSpec.groovy | 6 +++---
.../secondpass/ListSecondPassBinderSpec.groovy | 3 ++-
.../secondpass/MapSecondPassBinderSpec.groovy | 3 ++-
18 files changed, 53 insertions(+), 61 deletions(-)
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ClassPropertiesBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ClassPropertiesBinder.java
index a92b21f4da..68dc35b9f0 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ClassPropertiesBinder.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ClassPropertiesBinder.java
@@ -22,7 +22,6 @@ import jakarta.annotation.Nonnull;
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentEntity;
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty;
import org.grails.orm.hibernate.cfg.domainbinding.util.PropertyFromValueCreator;
-import org.hibernate.boot.spi.InFlightMetadataCollector;
import org.hibernate.mapping.PersistentClass;
import org.hibernate.mapping.Table;
import org.hibernate.mapping.Value;
@@ -57,17 +56,9 @@ public class ClassPropertiesBinder {
this(grailsPropertyBinder, propertyFromValueCreator, new NaturalIdentifierBinder());
}
- /**
- * Binds the properties of the specified Grails domain class to the Hibernate meta-model.
- *
- * @param domainClass The Grails domain class
- * @param persistentClass The Hibernate PersistentClass instance
- * @param mappings The Hibernate InFlightMetadataCollector instance
- */
public void bindClassProperties(
@Nonnull GrailsHibernatePersistentEntity domainClass,
- PersistentClass persistentClass,
- @Nonnull InFlightMetadataCollector mappings) {
+ PersistentClass persistentClass) {
persistentClass.getTable().setComment(domainClass.getMappedForm().getComment());
Table table = persistentClass.getTable();
@@ -80,8 +71,7 @@ public class ClassPropertiesBinder {
table,
GrailsDomainBinder.EMPTY_PATH,
null,
- currentGrailsProp,
- mappings);
+ currentGrailsProp);
persistentClass.addProperty(
propertyFromValueCreator.createProperty(value, currentGrailsProp));
}
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ComponentBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ComponentBinder.java
index 837ae0257f..8765653017 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ComponentBinder.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ComponentBinder.java
@@ -18,7 +18,6 @@
*/
package org.grails.orm.hibernate.cfg.domainbinding.binder;
-import jakarta.annotation.Nonnull;
import org.grails.orm.hibernate.cfg.GrailsHibernateUtil;
import org.grails.orm.hibernate.cfg.MappingCacheHolder;
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentEntity;
@@ -36,15 +35,18 @@ public class ComponentBinder {
private final MetadataBuildingContext metadataBuildingContext;
private final MappingCacheHolder mappingCacheHolder;
private final ComponentUpdater componentUpdater;
+ private final InFlightMetadataCollector metadataCollector;
private GrailsPropertyBinder grailsPropertyBinder;
public ComponentBinder(
MetadataBuildingContext metadataBuildingContext,
MappingCacheHolder mappingCacheHolder,
- ComponentUpdater componentUpdater) {
+ ComponentUpdater componentUpdater,
+ InFlightMetadataCollector metadataCollector) {
this.metadataBuildingContext = metadataBuildingContext;
this.mappingCacheHolder = mappingCacheHolder;
this.componentUpdater = componentUpdater;
+ this.metadataCollector = metadataCollector;
}
public void setGrailsPropertyBinder(GrailsPropertyBinder grailsPropertyBinder) {
@@ -54,7 +56,6 @@ public class ComponentBinder {
public Component bindComponent(
PersistentClass owner,
HibernateEmbeddedProperty embeddedProperty,
- @Nonnull InFlightMetadataCollector mappings,
String path) {
Component component = new Component(metadataBuildingContext, owner);
Class<?> type = embeddedProperty.getType();
@@ -80,7 +81,7 @@ public class ComponentBinder {
domainClass.getHibernatePersistentProperties(propertyType)) {
var value =
grailsPropertyBinder.bindProperty(
- persistentClass, table, currentPath, embeddedProperty, peerProperty, mappings);
+ persistentClass, table, currentPath, embeddedProperty, peerProperty);
componentUpdater.updateComponent(component, embeddedProperty, peerProperty, value);
}
return component;
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 46cd356b8f..e5787eb15a 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
@@ -23,7 +23,6 @@ import org.grails.orm.hibernate.cfg.CompositeIdentity;
import org.grails.orm.hibernate.cfg.GrailsHibernateUtil;
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentEntity;
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty;
-import org.hibernate.boot.spi.InFlightMetadataCollector;
import org.hibernate.boot.spi.MetadataBuildingContext;
import org.hibernate.mapping.Component;
import org.hibernate.mapping.RootClass;
@@ -47,8 +46,7 @@ public class CompositeIdBinder {
public void bindCompositeId(
@Nonnull GrailsHibernatePersistentEntity domainClass,
RootClass root,
- CompositeIdentity compositeIdentity,
- @Nonnull InFlightMetadataCollector mappings) {
+ CompositeIdentity compositeIdentity) {
Component id = new Component(metadataBuildingContext, root);
id.setNullValue("undefined");
root.setIdentifier(id);
@@ -71,7 +69,7 @@ public class CompositeIdBinder {
for (HibernatePersistentProperty property : composite) {
var value =
grailsPropertyBinder.bindProperty(
- root, root.getTable(), "", identifierProp, property, mappings);
+ root, root.getTable(), "", identifierProp, property);
componentUpdater.updateComponent(id, identifierProp, property, value);
}
}
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 d411b136be..c7ae65c34d 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
@@ -158,7 +158,7 @@ public class GrailsDomainBinder implements AdditionalMappingContributor, TypeCon
metadataCollector);
ComponentUpdater componentUpdater = new ComponentUpdater(propertyFromValueCreator);
ComponentBinder componentBinder =
- new ComponentBinder(metadataBuildingContext, getMappingCacheHolder(), componentUpdater);
+ new ComponentBinder(metadataBuildingContext, getMappingCacheHolder(), componentUpdater, metadataCollector);
GrailsPropertyBinder grailsPropertyBinder =
new GrailsPropertyBinder(
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/GrailsPropertyBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/GrailsPropertyBinder.java
index e7332f0b24..c970dd5a32 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/GrailsPropertyBinder.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/GrailsPropertyBinder.java
@@ -25,7 +25,6 @@ import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateManyToOnePr
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateOneToOneProperty;
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty;
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateToManyProperty;
-import org.hibernate.boot.spi.InFlightMetadataCollector;
import org.hibernate.mapping.PersistentClass;
import org.hibernate.mapping.Table;
import org.hibernate.mapping.Value;
@@ -64,8 +63,7 @@ public class GrailsPropertyBinder {
Table table,
String path,
HibernatePersistentProperty parentProperty,
- @Nonnull HibernatePersistentProperty currentGrailsProp,
- @Nonnull InFlightMetadataCollector mappings) {
+ @Nonnull HibernatePersistentProperty currentGrailsProp) {
if (LOG.isDebugEnabled()) {
LOG.debug(
"[GrailsPropertyBinder] Binding persistent property ["
@@ -91,7 +89,7 @@ public class GrailsPropertyBinder {
// HibernateToManyProperty
value = collectionBinder.bindCollection(toMany, persistentClass, path);
} else if (currentGrailsProp instanceof HibernateEmbeddedProperty embedded) {
- value = componentBinder.bindComponent(persistentClass, embedded, mappings, path);
+ value = componentBinder.bindComponent(persistentClass, embedded, path);
} else {
// HibernateSimpleProperty
value = simpleValueBinder.bindSimpleValue(currentGrailsProp, parentProperty, table, path);
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/IdentityBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/IdentityBinder.java
index 46f214af41..fd06e02768 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/IdentityBinder.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/IdentityBinder.java
@@ -46,7 +46,7 @@ public class IdentityBinder {
HibernateIdentity id = gormMapping != null ? gormMapping.getIdentity() : null;
if (id instanceof CompositeIdentity
|| (id == null && domainClass.getCompositeIdentity() != null)) {
- compositeIdBinder.bindCompositeId(domainClass, root, (CompositeIdentity) id, mappings);
+ compositeIdBinder.bindCompositeId(domainClass, root, (CompositeIdentity) id);
} else {
Identity identity = id instanceof Identity ? (Identity) id : null;
if (identity != null && identity.getName() == null) {
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/RootPersistentClassCommonValuesBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/RootPersistentClassCommonValuesBinder.java
index 4433c496b1..1b8efc451d 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/RootPersistentClassCommonValuesBinder.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/RootPersistentClassCommonValuesBinder.java
@@ -111,7 +111,7 @@ public class RootPersistentClassCommonValuesBinder {
identityBinder.bindIdentity(domainClass, root, mappings, gormMapping);
versionBinder.bindVersion(domainClass.getVersion(), root);
root.createPrimaryKey();
- classPropertiesBinder.bindClassProperties(domainClass, root, mappings);
+ classPropertiesBinder.bindClassProperties(domainClass, root);
return root;
}
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/SubclassMappingBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/SubclassMappingBinder.java
index 8a80745b3e..4ec70d17d8 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/SubclassMappingBinder.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/SubclassMappingBinder.java
@@ -82,7 +82,7 @@ public class SubclassMappingBinder {
subClass.setAbstract(subEntity.isAbstract());
subClass.setEntityName(subEntity.getName());
subClass.setJpaEntityName(GrailsHibernateUtil.unqualify(subEntity.getName()));
- classPropertiesBinder.bindClassProperties(subEntity, subClass, mappings);
+ classPropertiesBinder.bindClassProperties(subEntity, subClass);
return subClass;
}
}
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 fdfbd839c9..629c3e9f6f 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
@@ -91,7 +91,8 @@ class CollectionBinderSpec extends HibernateGormDatastoreSpec {
ComponentBinder componentBinder = new ComponentBinder(
metadataBuildingContext,
binder.getMappingCacheHolder(),
- componentUpdater
+ componentUpdater,
+ collector
)
GrailsPropertyBinder propertyBinder = new GrailsPropertyBinder(
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/ComponentBinderSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/ComponentBinderSpec.groovy
index 52d939a864..352c4bb694 100644
--- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/ComponentBinderSpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/ComponentBinderSpec.groovy
@@ -79,7 +79,8 @@ class ComponentBinderSpec extends HibernateGormDatastoreSpec {
binder = new ComponentBinder(
metadataBuildingContext,
mappingCacheHolder,
- componentUpdater
+ componentUpdater,
+ metadataBuildingContext.getMetadataCollector()
)
binder.setGrailsPropertyBinder(grailsPropertyBinder)
}
@@ -126,13 +127,13 @@ class ComponentBinderSpec extends HibernateGormDatastoreSpec {
def mappings = metadataBuildingContext.getMetadataCollector()
when:
- def component = binder.bindComponent(root, embeddedProp, mappings, "")
+ def component = binder.bindComponent(root, embeddedProp, "")
then:
component.getComponentClassName() == Address.name
component.getRoleName() == Address.name + ".address"
1 * mappingCacheHolder.cacheMapping(associatedEntity)
- 1 * grailsPropertyBinder.bindProperty(root, root.getTable(), "address", embeddedProp, prop1, mappings) >> new BasicValue(metadataBuildingContext, root.getTable())
+ 1 * grailsPropertyBinder.bindProperty(root, root.getTable(), "address", embeddedProp, prop1) >> new BasicValue(metadataBuildingContext, root.getTable())
1 * componentUpdater.updateComponent(_ as Component, embeddedProp, prop1, _ as Value)
}
@@ -173,12 +174,12 @@ class ComponentBinderSpec extends HibernateGormDatastoreSpec {
def mappings = metadataBuildingContext.getMetadataCollector()
when:
- binder.bindComponent(root, embeddedProp, mappings, "")
+ binder.bindComponent(root, embeddedProp, "")
then:
0 * componentUpdater.updateComponent(_, _, idProp, _)
0 * componentUpdater.updateComponent(_, _, versionProp, _)
- 1 * grailsPropertyBinder.bindProperty(root, root.getTable(), "address", embeddedProp, normalProp, mappings) >> new BasicValue(metadataBuildingContext, root.getTable())
+ 1 * grailsPropertyBinder.bindProperty(root, root.getTable(), "address", embeddedProp, normalProp) >> new BasicValue(metadataBuildingContext, root.getTable())
1 * componentUpdater.updateComponent(_, _, normalProp, _)
}
@@ -213,7 +214,7 @@ class ComponentBinderSpec extends HibernateGormDatastoreSpec {
def mappings = metadataBuildingContext.getMetadataCollector()
when:
- def component = binder.bindComponent(root, embeddedProp, mappings, "")
+ def component = binder.bindComponent(root, embeddedProp, "")
then:
component.getParentProperty() == "myEntity"
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 95293a2a1d..3725607186 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
@@ -51,13 +51,13 @@ class CompositeIdBinderSpec extends HibernateGormDatastoreSpec {
root.setTable(table)
when:
- binder.bindCompositeId(domainClass, root, compositeIdentity, mappings)
+ binder.bindCompositeId(domainClass, root, compositeIdentity)
then:
root.getIdentifier() instanceof Component
root.getIdentifierMapper() instanceof Component
root.hasEmbeddedIdentifier()
- 2 * grailsPropertyBinder.bindProperty(root, table, "", identifierProp, _ as HibernatePersistentProperty, mappings) >> Mock(Value)
+ 2 * grailsPropertyBinder.bindProperty(root, table, "", identifierProp, _ as HibernatePersistentProperty) >> Mock(Value)
2 * componentUpdater.updateComponent(_ as Component, identifierProp, _ as HibernatePersistentProperty, _ as Value)
}
@@ -79,10 +79,10 @@ class CompositeIdBinderSpec extends HibernateGormDatastoreSpec {
root.setTable(table)
when:
- binder.bindCompositeId(domainClass, root, null, mappings)
+ binder.bindCompositeId(domainClass, root, null)
then:
- 1 * grailsPropertyBinder.bindProperty(root, table, "", identifierProp, prop1, mappings) >> Mock(Value)
+ 1 * grailsPropertyBinder.bindProperty(root, table, "", identifierProp, prop1) >> Mock(Value)
1 * componentUpdater.updateComponent(_ as Component, identifierProp, prop1, _ as Value)
}
@@ -97,7 +97,7 @@ class CompositeIdBinderSpec extends HibernateGormDatastoreSpec {
domainClass.getName() >> "MyEntity"
when:
- binder.bindCompositeId(domainClass, root, null, mappings)
+ binder.bindCompositeId(domainClass, root, null)
then:
thrown(org.hibernate.MappingException)
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 e41830b042..4c01fa8d17 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
@@ -156,7 +156,8 @@ class GrailsPropertyBinderSpec extends HibernateGormDatastoreSpec {
ComponentBinder componentBinder = new ComponentBinder(
metadataBuildingContext,
binder.getMappingCacheHolder(),
- componentUpdater
+ componentUpdater,
+ collector
)
GrailsPropertyBinder propertyBinder = new GrailsPropertyBinder(
@@ -236,7 +237,7 @@ class GrailsPropertyBinderSpec extends HibernateGormDatastoreSpec {
when:
def titleProp = persistentEntity.getPropertyByName("title") as HibernatePersistentProperty
- Value value = propertyBinder.bindProperty(rootClass, rootClass.table, EMPTY_PATH, null, titleProp, collector)
+ Value value = propertyBinder.bindProperty(rootClass, rootClass.table, EMPTY_PATH, null, titleProp)
rootClass.addProperty(new PropertyFromValueCreator().createProperty(value, titleProp))
then:
@@ -263,7 +264,7 @@ class GrailsPropertyBinderSpec extends HibernateGormDatastoreSpec {
statusProp.isValidHibernateManyToOne() >> false
when:
- Value value = propertyBinder.bindProperty(rootClass, rootClass.table, EMPTY_PATH, null, statusProp, collector)
+ Value value = propertyBinder.bindProperty(rootClass, rootClass.table, EMPTY_PATH, null, statusProp)
rootClass.addProperty(new PropertyFromValueCreator().createProperty(value, statusProp))
then:
@@ -290,7 +291,7 @@ class GrailsPropertyBinderSpec extends HibernateGormDatastoreSpec {
when:
def ownerProp = petEntity.getPropertyByName("owner") as HibernatePersistentProperty
- Value value = propertyBinder.bindProperty(rootClass, rootClass.table, EMPTY_PATH, null, ownerProp, collector)
+ Value value = propertyBinder.bindProperty(rootClass, rootClass.table, EMPTY_PATH, null, ownerProp)
rootClass.addProperty(new PropertyFromValueCreator().createProperty(value, ownerProp))
then:
@@ -313,7 +314,7 @@ class GrailsPropertyBinderSpec extends HibernateGormDatastoreSpec {
when:
def addressProp = persistentEntity.getPropertyByName("homeAddress") as HibernatePersistentProperty
- Value value = propertyBinder.bindProperty(rootClass, rootClass.table, EMPTY_PATH, null, addressProp, collector)
+ Value value = propertyBinder.bindProperty(rootClass, rootClass.table, EMPTY_PATH, null, addressProp)
rootClass.addProperty(new PropertyFromValueCreator().createProperty(value, addressProp))
then:
@@ -341,7 +342,7 @@ class GrailsPropertyBinderSpec extends HibernateGormDatastoreSpec {
when:
def petsProp = personEntity.getPropertyByName("pets") as HibernatePersistentProperty
- Value value = propertyBinder.bindProperty(rootClass, rootClass.table, EMPTY_PATH, null, petsProp, collector)
+ Value value = propertyBinder.bindProperty(rootClass, rootClass.table, EMPTY_PATH, null, petsProp)
rootClass.addProperty(new PropertyFromValueCreator().createProperty(value, petsProp))
then:
@@ -379,7 +380,7 @@ class GrailsPropertyBinderSpec extends HibernateGormDatastoreSpec {
when:
def booksProp = authorEntity.getPropertyByName("books") as HibernatePersistentProperty
- Value value = propertyBinder.bindProperty(rootClass, rootClass.table, EMPTY_PATH, null, booksProp, collector)
+ Value value = propertyBinder.bindProperty(rootClass, rootClass.table, EMPTY_PATH, null, booksProp)
rootClass.addProperty(new PropertyFromValueCreator().createProperty(value, booksProp))
collector.processSecondPasses(binder.getMetadataBuildingContext())
@@ -418,7 +419,7 @@ class GrailsPropertyBinderSpec extends HibernateGormDatastoreSpec {
when:
def booksProp = authorEntity.getPropertyByName("books") as HibernatePersistentProperty
- Value value = propertyBinder.bindProperty(rootClass, rootClass.table, EMPTY_PATH, null, booksProp, collector)
+ Value value = propertyBinder.bindProperty(rootClass, rootClass.table, EMPTY_PATH, null, booksProp)
rootClass.addProperty(new PropertyFromValueCreator().createProperty(value, booksProp))
collector.processSecondPasses(binder.getMetadataBuildingContext())
@@ -479,7 +480,7 @@ class GrailsPropertyBinderSpec extends HibernateGormDatastoreSpec {
when:
def childBookProp = authorEntity.getPropertyByName("childBook") as HibernatePersistentProperty
- Value value = propertyBinder.bindProperty(rootClass, rootClass.table, EMPTY_PATH, null, childBookProp, collector)
+ Value value = propertyBinder.bindProperty(rootClass, rootClass.table, EMPTY_PATH, null, childBookProp)
rootClass.addProperty(new PropertyFromValueCreator().createProperty(value, childBookProp))
// Process second passes to ensure Hibernate's internal mappings are finalized
collector.processSecondPasses(binder.getMetadataBuildingContext())
@@ -547,7 +548,7 @@ class GrailsPropertyBinderSpec extends HibernateGormDatastoreSpec {
when:
// Capture the return value of bindProperty
- def resultValue = propertyBinder.bindProperty(rootClass, table, EMPTY_PATH, null, currentGrailsProp, mappings)
+ def resultValue = propertyBinder.bindProperty(rootClass, table, EMPTY_PATH, null, currentGrailsProp)
then:
// Assert that bindProperty returns a Value object
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/IdentityBinderSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/IdentityBinderSpec.groovy
index df50641f47..baff483d68 100644
--- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/IdentityBinderSpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/IdentityBinderSpec.groovy
@@ -55,7 +55,7 @@ class IdentityBinderSpec extends HibernateGormDatastoreSpec {
binder.bindIdentity(domainClass, root, mappings, null)
then:
- 1 * compositeIdBinder.bindCompositeId(domainClass, root, null, mappings)
+ 1 * compositeIdBinder.bindCompositeId(domainClass, root, null)
}
def "should delegate to compositeIdBinder when mapping specifies composite identity"() {
@@ -71,7 +71,7 @@ class IdentityBinderSpec extends HibernateGormDatastoreSpec {
binder.bindIdentity(domainClass, root, mappings, gormMapping)
then:
- 1 * compositeIdBinder.bindCompositeId(domainClass, root, compositeIdentity, mappings)
+ 1 * compositeIdBinder.bindCompositeId(domainClass, root, compositeIdentity)
}
def "should delegate to simpleIdBinder when mapping specifies simple identity"() {
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ClassPropertiesBinderSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ClassPropertiesBinderSpec.groovy
index 3597e0068c..5f5be503ab 100644
--- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ClassPropertiesBinderSpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ClassPropertiesBinderSpec.groovy
@@ -43,13 +43,13 @@ class ClassPropertiesBinderSpec extends HibernateGormDatastoreSpec {
domainClass.getMappedForm() >> mapping
when:
- binder.bindClassProperties(domainClass, persistentClass, mappings)
+ binder.bindClassProperties(domainClass, persistentClass)
then:
- 1 * grailsPropertyBinder.bindProperty(persistentClass, persistentClass.table, GrailsDomainBinder.EMPTY_PATH, null, prop1, mappings) >> value1
+ 1 * grailsPropertyBinder.bindProperty(persistentClass, persistentClass.table, GrailsDomainBinder.EMPTY_PATH, null, prop1) >> value1
1 * propertyFromValueCreator.createProperty(value1, prop1) >> hibernateProp1
- 1 * grailsPropertyBinder.bindProperty(persistentClass, persistentClass.table, GrailsDomainBinder.EMPTY_PATH, null, prop2, mappings) >> value2
+ 1 * grailsPropertyBinder.bindProperty(persistentClass, persistentClass.table, GrailsDomainBinder.EMPTY_PATH, null, prop2) >> value2
1 * propertyFromValueCreator.createProperty(value2, prop2) >> hibernateProp2
persistentClass.getProperty("hibernateProp1") == hibernateProp1
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 c9b66dbe4f..49878ddaee 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
@@ -56,7 +56,7 @@ class RootPersistentClassCommonValuesBinderSpec extends HibernateGormDatastoreSp
RootClass rootClass = binder.bindRootPersistentClassCommonValues(entity, [])
then:
- 1 * classPropertiesBinder.bindClassProperties(entity, _, _)
+ 1 * classPropertiesBinder.bindClassProperties(entity, _)
rootClass != null
rootClass.getEntityName() == TestEntity.name
rootClass.isAbstract() == false
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/SubclassMappingBinderSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/SubclassMappingBinderSpec.groovy
index 3d26e162a3..55eb97790e 100644
--- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/SubclassMappingBinderSpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/SubclassMappingBinderSpec.groovy
@@ -54,7 +54,7 @@ class SubclassMappingBinderSpec extends HibernateGormDatastoreSpec {
then:
subEntity != null
1 * singleTableSubclassBinder.bindSubClass(subEntity, _ as SingleTableSubclass, mappings)
- 1 * classPropertiesBinder.bindClassProperties(subEntity, _ as Subclass, mappings)
+ 1 * classPropertiesBinder.bindClassProperties(subEntity, _ as Subclass)
subClass instanceof SingleTableSubclass
subClass.getEntityName() == SMBSSingleSub.name
}
@@ -74,7 +74,7 @@ class SubclassMappingBinderSpec extends HibernateGormDatastoreSpec {
then:
subEntity != null
1 * joinedSubClassBinder.bindJoinedSubClass(subEntity, _ as JoinedSubclass)
- 1 * classPropertiesBinder.bindClassProperties(subEntity, _ as Subclass, mappings)
+ 1 * classPropertiesBinder.bindClassProperties(subEntity, _ as Subclass)
subClass instanceof JoinedSubclass
subClass.getEntityName() == SMBSJoinedSub.name
}
@@ -94,7 +94,7 @@ class SubclassMappingBinderSpec extends HibernateGormDatastoreSpec {
then:
subEntity != null
1 * unionSubclassBinder.bindUnionSubclass(subEntity, _ as UnionSubclass)
- 1 * classPropertiesBinder.bindClassProperties(subEntity, _ as Subclass, mappings)
+ 1 * classPropertiesBinder.bindClassProperties(subEntity, _ as Subclass)
subClass instanceof UnionSubclass
subClass.getEntityName() == SMBSUnionSub.name
}
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 f136a62ced..5266866570 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
@@ -90,7 +90,8 @@ class ListSecondPassBinderSpec extends HibernateGormDatastoreSpec {
ComponentBinder componentBinder = new ComponentBinder(
metadataBuildingContext,
binder.getMappingCacheHolder(),
- componentUpdater
+ componentUpdater,
+ getCollector()
)
GrailsPropertyBinder propertyBinder = new GrailsPropertyBinder(
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 cfbb66a509..9b1c4d1b53 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
@@ -90,7 +90,8 @@ class MapSecondPassBinderSpec extends HibernateGormDatastoreSpec {
ComponentBinder componentBinder = new ComponentBinder(
metadataBuildingContext,
binder.getMappingCacheHolder(),
- componentUpdater
+ componentUpdater,
+ getCollector()
)
GrailsPropertyBinder propertyBinder = new GrailsPropertyBinder(