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 3fee034f150c99c4edd43dc3203b9aa42697a25c Author: Walter Duque de Estrada <[email protected]> AuthorDate: Thu Mar 5 12:29:21 2026 -0600 cleanup(hibernate7): use Hibernate-specific types in ForeignKeyColumnCountCalculator and related specs --- .../org/grails/orm/hibernate/HibernateSession.java | 5 +++-- .../orm/hibernate/cfg/CompositeIdentity.groovy | 2 +- .../cfg/domainbinding/binder/SimpleIdBinder.java | 3 +-- .../hibernate/GrailsHibernatePersistentEntity.java | 3 +-- .../secondpass/CollectionOrderByBinder.java | 2 +- .../cfg/domainbinding/util/CreateKeyForProps.java | 2 +- .../util/ForeignKeyColumnCountCalculator.java | 11 ++++++----- .../event/listener/HibernateEventListener.java | 3 ++- .../grails/orm/hibernate/query/HibernateQuery.java | 3 ++- .../orm/hibernate/support/ClosureEventListener.java | 8 +++++--- .../orm/hibernate/cfg/CompositeIdentitySpec.groovy | 8 ++++---- .../cfg/domainbinding/CompositeIdBinderSpec.groovy | 4 ++-- .../cfg/domainbinding/CreateKeyForPropsSpec.groovy | 12 ++++++------ .../ForeignKeyColumnCountCalculatorSpec.groovy | 21 ++++++++++----------- .../cfg/domainbinding/IdentityBinderSpec.groovy | 2 +- .../cfg/domainbinding/SimpleIdBinderSpec.groovy | 2 +- 16 files changed, 47 insertions(+), 44 deletions(-) diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/HibernateSession.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/HibernateSession.java index 03e44da550..db4dc54ab3 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/HibernateSession.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/HibernateSession.java @@ -48,6 +48,7 @@ import org.grails.datastore.mapping.query.jpa.JpaQueryBuilder; import org.grails.datastore.mapping.query.jpa.JpaQueryInfo; import org.grails.datastore.mapping.reflect.ClassPropertyFetcher; import org.grails.datastore.mapping.transactions.Transaction; +import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentEntity; import org.grails.orm.hibernate.proxy.HibernateProxyHandler; import org.grails.orm.hibernate.query.HibernateHqlQuery; import org.grails.orm.hibernate.query.HibernateQuery; @@ -335,9 +336,9 @@ public class HibernateSession extends AbstractAttributeStoringSession JpaQueryBuilder builder = new JpaQueryBuilder(criteria); builder.setConversionService(getMappingContext().getConversionService()); builder.setHibernateCompatible(true); - PersistentEntity targetEntity = criteria.getPersistentEntity(); + HibernatePersistentEntity targetEntity = (HibernatePersistentEntity)criteria.getPersistentEntity(); PersistentProperty lastUpdated = - targetEntity.getPropertyByName(GormProperties.LAST_UPDATED); + targetEntity.getHibernatePropertyByName(GormProperties.LAST_UPDATED); if (lastUpdated != null && targetEntity.getMapping().getMappedForm().isAutoTimestamp()) { if (timestampProvider == null) { diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/CompositeIdentity.groovy b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/CompositeIdentity.groovy index 6d70451131..c9613af565 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/CompositeIdentity.groovy +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/CompositeIdentity.groovy @@ -67,7 +67,7 @@ class CompositeIdentity extends Property implements HibernateIdentity { */ HibernatePersistentProperty[] getHibernateProperties(GrailsHibernatePersistentEntity domainClass) { HibernatePersistentProperty[] composite = propertyNames ? - propertyNames.collect { domainClass.getPropertyByName(it) as HibernatePersistentProperty } as HibernatePersistentProperty[] : + propertyNames.collect { domainClass.getHibernatePropertyByName(it) as HibernatePersistentProperty } as HibernatePersistentProperty[] : domainClass.compositeIdentity if (!composite) { 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 092505e1ed..45e4af2455 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 @@ -75,8 +75,7 @@ public class SimpleIdBinder { if (mappedId != null) { String propertyName = mappedId.getName(); if (propertyName != null && !propertyName.equals(domainClass.getName())) { - var namedIdentityProp = - (HibernatePersistentProperty) domainClass.getPropertyByName(propertyName); + var namedIdentityProp = domainClass.getHibernatePropertyByName(propertyName); if (namedIdentityProp == null) { throw new MappingException( "Mapping specifies an identifier property name that doesn't exist [" diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/GrailsHibernatePersistentEntity.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/GrailsHibernatePersistentEntity.java index dce9ea001b..4aaa7796d0 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/GrailsHibernatePersistentEntity.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/GrailsHibernatePersistentEntity.java @@ -161,8 +161,7 @@ public interface GrailsHibernatePersistentEntity extends PersistentEntity { * or {@code null} if no such property exists. */ default HibernatePersistentProperty getHibernatePropertyByName(String name) { - var property = getPropertyByName(name); - return property instanceof HibernatePersistentProperty hpp ? hpp : null; + return (HibernatePersistentProperty) getPropertyByName(name); } /** diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionOrderByBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionOrderByBinder.java index 2adc916c07..726a3c567e 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionOrderByBinder.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionOrderByBinder.java @@ -63,7 +63,7 @@ public class CollectionOrderByBinder { + "] are not supported with unidirectional one to many relationships."); } HibernatePersistentProperty sortBy = - (HibernatePersistentProperty) referenced.getPropertyByName(property.getSort()); + referenced.getHibernatePropertyByName(property.getSort()); String order = Optional.ofNullable(property.getOrder()).orElse("asc"); collection.setOrderBy( orderByClauseBuilder.buildOrderByClause( diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/CreateKeyForProps.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/CreateKeyForProps.java index bbbfb33a26..aee203a3f0 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/CreateKeyForProps.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/CreateKeyForProps.java @@ -58,7 +58,7 @@ public class CreateKeyForProps { GrailsHibernatePersistentEntity owner = grailsProp.getHibernateOwner(); for (String propertyName : propertyNames) { HibernatePersistentProperty otherProp = - (HibernatePersistentProperty) owner.getPropertyByName(propertyName); + owner.getHibernatePropertyByName(propertyName); if (otherProp == null) { throw new MappingException( owner.getJavaClass().getName() + " references an unknown property " + propertyName); diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/ForeignKeyColumnCountCalculator.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/ForeignKeyColumnCountCalculator.java index 4649668028..88380097e4 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/ForeignKeyColumnCountCalculator.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/ForeignKeyColumnCountCalculator.java @@ -18,20 +18,21 @@ */ package org.grails.orm.hibernate.cfg.domainbinding.util; -import org.grails.datastore.mapping.model.PersistentEntity; import org.grails.datastore.mapping.model.PersistentProperty; -import org.grails.datastore.mapping.model.types.ToOne; +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.hibernate.HibernateToOneProperty; // each property may consist of one or many columns (due to composite ids) so in order to get the // number of columns required for a column key we have to perform the calculation here @SuppressWarnings("PMD.DataflowAnomalyAnalysis") public class ForeignKeyColumnCountCalculator { public int calculateForeignKeyColumnCount( - PersistentEntity refDomainClass, String[] propertyNames) { + GrailsHibernatePersistentEntity refDomainClass, String[] propertyNames) { int expectedForeignKeyColumnLength = 0; for (String propertyName : propertyNames) { - PersistentProperty referencedProperty = refDomainClass.getPropertyByName(propertyName); - if (referencedProperty instanceof ToOne toOne) { + HibernatePersistentProperty referencedProperty = refDomainClass.getHibernatePropertyByName(propertyName); + if (referencedProperty instanceof HibernateToOneProperty toOne) { PersistentProperty[] compositeIdentity = toOne.getAssociatedEntity().getCompositeIdentity(); if (compositeIdentity != null) { expectedForeignKeyColumnLength += compositeIdentity.length; diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/event/listener/HibernateEventListener.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/event/listener/HibernateEventListener.java index bee8eb02e5..ae10a33026 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/event/listener/HibernateEventListener.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/event/listener/HibernateEventListener.java @@ -30,6 +30,7 @@ import org.grails.datastore.mapping.engine.event.AbstractPersistenceEventListene import org.grails.datastore.mapping.engine.event.ValidationEvent; import org.grails.datastore.mapping.model.PersistentEntity; import org.grails.orm.hibernate.HibernateDatastore; +import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentEntity; import org.grails.orm.hibernate.connections.HibernateConnectionSourceSettings; import org.grails.orm.hibernate.support.ClosureEventListener; import org.grails.orm.hibernate.support.SoftKey; @@ -237,7 +238,7 @@ public class HibernateEventListener extends AbstractPersistenceEventListener { MultiTenant.class.isAssignableFrom(clazz) || factory == null || datastore.getSessionFactory().equals(factory); - PersistentEntity persistentEntity = + HibernatePersistentEntity persistentEntity = (HibernatePersistentEntity) datastore.getMappingContext().getPersistentEntity(clazz.getName()); shouldTrigger = (persistentEntity != null && isValidSessionFactory); if (shouldTrigger) { diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/HibernateQuery.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/HibernateQuery.java index e0aaf8c1d2..21b8c06d62 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/HibernateQuery.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/HibernateQuery.java @@ -37,6 +37,7 @@ import org.grails.datastore.mapping.query.api.QueryableCriteria; import org.grails.orm.hibernate.HibernateSession; import org.grails.orm.hibernate.GrailsHibernateTemplate; import org.grails.orm.hibernate.IHibernateTemplate; +import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentEntity; import org.grails.orm.hibernate.proxy.HibernateProxyHandler; import org.hibernate.FlushMode; import org.hibernate.query.QueryFlushMode; @@ -311,7 +312,7 @@ public class HibernateQuery extends Query { @Override public AssociationQuery createQuery(String associationName) { final PersistentProperty property = - entity.getPropertyByName(calculatePropertyName(associationName)); + ((HibernatePersistentEntity)entity).getHibernatePropertyByName(calculatePropertyName(associationName)); if ((property instanceof Association association)) { String alias = generateAlias(associationName); CriteriaAndAlias subCriteria = getOrCreateAlias(associationName, alias); diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/support/ClosureEventListener.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/support/ClosureEventListener.java index a5f426f050..ae25ba60cc 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/support/ClosureEventListener.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/support/ClosureEventListener.java @@ -36,6 +36,8 @@ import org.grails.datastore.mapping.reflect.ClassUtils; import org.grails.datastore.mapping.reflect.EntityReflector; import org.grails.datastore.mapping.validation.ValidationException; import org.grails.orm.hibernate.HibernateGormValidationApi; +import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentEntity; + import org.hibernate.FlushMode; import org.hibernate.HibernateException; import org.hibernate.Session; @@ -75,13 +77,13 @@ public class ClosureEventListener private final EventTriggerCaller preDeleteEventListener; private final EventTriggerCaller preUpdateEventListener; private final BeforeValidateEventTriggerCaller beforeValidateEventListener; - private final PersistentEntity persistentEntity; + private final GrailsHibernatePersistentEntity persistentEntity; private final MetaClass domainMetaClass; private final boolean failOnErrorEnabled; private final Map validateParams; public ClosureEventListener( - PersistentEntity persistentEntity, boolean failOnError, List failOnErrorPackages) { + GrailsHibernatePersistentEntity persistentEntity, boolean failOnError, List failOnErrorPackages) { this.persistentEntity = persistentEntity; Class domainClazz = persistentEntity.getJavaClass(); this.domainMetaClass = GroovySystem.getMetaClassRegistry().getMetaClass(domainClazz); @@ -251,7 +253,7 @@ public class ClosureEventListener if (attributeMapping == null) continue; int index = attributeMapping.getStateArrayPosition(); - PersistentProperty property = persistentEntity.getPropertyByName(p); + PersistentProperty property = persistentEntity.getHibernatePropertyByName(p); if (property != null && !GormProperties.VERSION.equals(property.getName())) { state[index] = reflector.getProperty(entity, property.getName()); diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/CompositeIdentitySpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/CompositeIdentitySpec.groovy index bdce4d9dd8..c7df24a6b0 100644 --- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/CompositeIdentitySpec.groovy +++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/CompositeIdentitySpec.groovy @@ -18,8 +18,8 @@ class CompositeIdentitySpec extends Specification { def properties = compositeIdentity.getHibernateProperties(domainClass) then: - 1 * domainClass.getPropertyByName("prop1") >> prop1 - 1 * domainClass.getPropertyByName("prop2") >> prop2 + 1 * domainClass.getHibernatePropertyByName("prop1") >> prop1 + 1 * domainClass.getHibernatePropertyByName("prop2") >> prop2 properties.length == 2 properties[0] == prop1 properties[1] == prop2 @@ -36,7 +36,7 @@ class CompositeIdentitySpec extends Specification { then: 1 * domainClass.getCompositeIdentity() >> ([prop1] as HibernatePersistentProperty[]) - 0 * domainClass.getPropertyByName(_) + 0 * domainClass.getHibernatePropertyByName(_) properties.length == 1 properties[0] == prop1 } @@ -63,7 +63,7 @@ class CompositeIdentitySpec extends Specification { compositeIdentity.getHibernateProperties(domainClass) then: - 1 * domainClass.getPropertyByName("invalid") >> null + 1 * domainClass.getHibernatePropertyByName("invalid") >> null thrown(MappingException) } } 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 3725607186..7eaf7f56ba 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 @@ -42,8 +42,8 @@ class CompositeIdBinderSpec extends HibernateGormDatastoreSpec { def prop1 = Mock(HibernatePersistentProperty) def prop2 = Mock(HibernatePersistentProperty) def identifierProp = Mock(HibernatePersistentProperty) - domainClass.getPropertyByName("prop1") >> prop1 - domainClass.getPropertyByName("prop2") >> prop2 + domainClass.getHibernatePropertyByName("prop1") >> prop1 + domainClass.getHibernatePropertyByName("prop2") >> prop2 domainClass.getIdentity() >> identifierProp domainClass.getName() >> "MyEntity" diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/CreateKeyForPropsSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/CreateKeyForPropsSpec.groovy index 79ca66422d..0c3296641f 100644 --- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/CreateKeyForPropsSpec.groovy +++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/CreateKeyForPropsSpec.groovy @@ -32,8 +32,8 @@ class CreateKeyForPropsSpec extends Specification { def otherProp1 = Mock(HibernatePersistentProperty) def otherProp2 = Mock(HibernatePersistentProperty) - owner.getPropertyByName("p1") >> otherProp1 - owner.getPropertyByName("p2") >> otherProp2 + owner.getHibernatePropertyByName("p1") >> otherProp1 + owner.getHibernatePropertyByName("p2") >> otherProp2 String path = "some_path" def table = new Table("t") @@ -51,8 +51,8 @@ class CreateKeyForPropsSpec extends Specification { 1 * mappedForm.isUnique() >> true 1 * mappedForm.isUniqueWithinGroup() >> true 1 * mappedForm.getUniquenessGroup() >> ["p1", "p2"] - 1 * owner.getPropertyByName("p1") >> otherProp1 - 1 * owner.getPropertyByName("p2") >> otherProp2 + 1 * owner.getHibernatePropertyByName("p1") >> otherProp1 + 1 * owner.getHibernatePropertyByName("p2") >> otherProp2 1 * columnNameFetcher.getColumnNameForPropertyAndPath(otherProp1, path, null) 1 * columnNameFetcher.getColumnNameForPropertyAndPath(otherProp2, path, null) 1 * uniqueKeyCreator.createUniqueKeyForColumns(table, _ as List) @@ -102,7 +102,7 @@ class CreateKeyForPropsSpec extends Specification { } grailsProp.getMappedForm() >> mappedForm - owner.getPropertyByName("missingProp") >> null + owner.getHibernatePropertyByName("missingProp") >> null when: subject.createKeyForProps(grailsProp, null, new Table("t"), "base") @@ -115,7 +115,7 @@ class CreateKeyForPropsSpec extends Specification { 1 * mappedForm.isUniqueWithinGroup() >> true 1 * mappedForm.getUniquenessGroup() >> ["missingProp"] 1 * owner.getJavaClass() >> CreateKeyForPropsSpec - 1 * owner.getPropertyByName("missingProp") + 1 * owner.getHibernatePropertyByName("missingProp") 0 * uniqueKeyCreator._ 0 * columnNameFetcher._ } diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/ForeignKeyColumnCountCalculatorSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/ForeignKeyColumnCountCalculatorSpec.groovy index f31ccabc05..b2c94ecdc1 100644 --- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/ForeignKeyColumnCountCalculatorSpec.groovy +++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/ForeignKeyColumnCountCalculatorSpec.groovy @@ -1,10 +1,9 @@ package org.grails.orm.hibernate.cfg.domainbinding -import org.grails.datastore.mapping.model.PersistentEntity -import org.grails.datastore.mapping.model.PersistentProperty -import org.grails.datastore.mapping.model.types.ToOne -import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty +import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentEntity import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentEntity +import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty +import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateToOneProperty import spock.lang.Specification import spock.lang.Unroll @@ -16,24 +15,24 @@ class ForeignKeyColumnCountCalculatorSpec extends Specification { def "Test calculateForeignKeyColumnCount with #scenario"() { given: def calculator = new ForeignKeyColumnCountCalculator() - def refDomainClass = Mock(HibernatePersistentEntity) as PersistentEntity + def refDomainClass = Mock(GrailsHibernatePersistentEntity) // Mock for a simple property - def simpleProp = Mock(PersistentProperty) - refDomainClass.getPropertyByName("simple") >> simpleProp + def simpleProp = Mock(HibernatePersistentProperty) + refDomainClass.getHibernatePropertyByName("simple") >> simpleProp // Mocks for a ToOne association with a simple ID - def toOneSimpleIdProp = Mock(ToOne) + def toOneSimpleIdProp = Mock(HibernateToOneProperty) def associatedEntitySimpleId = Mock(HibernatePersistentEntity) - refDomainClass.getPropertyByName("toOneSimple") >> toOneSimpleIdProp + refDomainClass.getHibernatePropertyByName("toOneSimple") >> toOneSimpleIdProp toOneSimpleIdProp.getAssociatedEntity() >> associatedEntitySimpleId associatedEntitySimpleId.getCompositeIdentity() >> null // Mocks for a ToOne association with a composite ID of length 2 - def toOneCompositeIdProp = Mock(ToOne) + def toOneCompositeIdProp = Mock(HibernateToOneProperty) def associatedEntityCompositeId = Mock(HibernatePersistentEntity) def compositeId = [Mock(HibernatePersistentProperty), Mock(HibernatePersistentProperty)] as HibernatePersistentProperty[] - refDomainClass.getPropertyByName("toOneComposite") >> toOneCompositeIdProp + refDomainClass.getHibernatePropertyByName("toOneComposite") >> toOneCompositeIdProp toOneCompositeIdProp.getAssociatedEntity() >> associatedEntityCompositeId associatedEntityCompositeId.getCompositeIdentity() >> compositeId 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 d7fa1be417..673b3799af 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 @@ -83,7 +83,7 @@ class IdentityBinderSpec extends HibernateGormDatastoreSpec { def identity = new Identity(name: "foo") gormMapping.getIdentity() >> identity def identifierProp = Mock(HibernatePersistentProperty) - domainClass.getPropertyByName("foo") >> identifierProp + domainClass.getHibernatePropertyByName("foo") >> identifierProp domainClass.getIdentity() >> identifierProp domainClass.getName() >> "MyEntity" 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 15683b1fcf..c0a20a4067 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 @@ -117,7 +117,7 @@ class SimpleIdBinderSpec extends HibernateGormDatastoreSpec { given: def domainClass = Mock(GrailsHibernatePersistentEntity) { getName() >> "TestEntity" - getPropertyByName("nonExistent") >> null + getHibernatePropertyByName("nonExistent") >> null getIdentity() >> Mock(HibernatePersistentProperty) } def rootClass = new RootClass(metadataBuildingContext)
