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 e9fa6e1141ae7e0b7dc9016e28858481be79fa0a Author: Walter Duque de Estrada <[email protected]> AuthorDate: Mon Feb 16 22:00:22 2026 -0600 NamingStrategyWrapper.resolveForeignKeyForPropertyDomainClass more specific argument --- .../grails/orm/hibernate/cfg/PersistentEntityNamingStrategy.java | 2 +- .../orm/hibernate/cfg/domainbinding/util/NamingStrategyWrapper.java | 6 ++---- .../hibernate/cfg/domainbinding/NamingStrategyWrapperSpec.groovy | 3 ++- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/PersistentEntityNamingStrategy.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/PersistentEntityNamingStrategy.java index 8390da42b7..1a955a2cc7 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/PersistentEntityNamingStrategy.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/PersistentEntityNamingStrategy.java @@ -18,5 +18,5 @@ public interface PersistentEntityNamingStrategy { String resolveTableName(String logicalName); - String resolveForeignKeyForPropertyDomainClass(PersistentProperty property); + String resolveForeignKeyForPropertyDomainClass(GrailsHibernatePersistentProperty property); } diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/NamingStrategyWrapper.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/NamingStrategyWrapper.java index ba21d57d14..b69992ba4d 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/NamingStrategyWrapper.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/NamingStrategyWrapper.java @@ -64,11 +64,9 @@ public class NamingStrategyWrapper implements PersistentEntityNamingStrategy { } @Override - public String resolveForeignKeyForPropertyDomainClass(PersistentProperty property) { + public String resolveForeignKeyForPropertyDomainClass(GrailsHibernatePersistentProperty property) { return Optional.ofNullable(property) - .map(PersistentProperty::getOwner) - .filter(GrailsHibernatePersistentEntity.class::isInstance) - .map(GrailsHibernatePersistentEntity.class::cast) + .map(GrailsHibernatePersistentProperty::getHibernateOwner) .map(GrailsHibernatePersistentEntity::getJavaClass) .map(Class::getSimpleName) .map(NameUtils::decapitalize) diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/NamingStrategyWrapperSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/NamingStrategyWrapperSpec.groovy index fd892c1c0a..693d1d3122 100644 --- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/NamingStrategyWrapperSpec.groovy +++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/NamingStrategyWrapperSpec.groovy @@ -9,6 +9,7 @@ import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment import spock.lang.Subject import spock.lang.Unroll +import org.grails.orm.hibernate.cfg.GrailsHibernatePersistentProperty import org.grails.orm.hibernate.cfg.domainbinding.util.NamingStrategyWrapper import static org.grails.orm.hibernate.cfg.GrailsDomainBinder.FOREIGN_KEY_SUFFIX @@ -114,7 +115,7 @@ class NamingStrategyWrapperSpec extends HibernateGormDatastoreSpec { def "should correctly generate a foreign key name for a property"() { given: "A persistent property and a captured argument" def ownerEntity = createPersistentEntity(Owner, getGrailsDomainBinder()) - PersistentProperty property = ownerEntity.getPropertyByName("someProperty") + def property = ownerEntity.getPropertyByName("someProperty") as GrailsHibernatePersistentProperty def capturedIdentifier and: "The wrapper's internal call to getColumnName is stubbed to capture its argument"
