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 e0412d31ecba511d40eb47bd615965d4ef33b1b3 Author: Walter Duque de Estrada <[email protected]> AuthorDate: Thu Mar 12 16:25:38 2026 -0500 hibernate 7: reducing arguments to HibernatePersistentEntity --- .../orm/hibernate/cfg/domainbinding/binder/SubClassBinder.java | 5 +++-- .../cfg/domainbinding/util/MultiTenantFilterBinder.java | 10 +++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/SubClassBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/SubClassBinder.java index 2a96cc6b86..609b1b37e4 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/SubClassBinder.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/SubClassBinder.java @@ -31,6 +31,7 @@ import org.hibernate.mapping.UnionSubclass; import org.grails.orm.hibernate.cfg.MappingCacheHolder; 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.util.MultiTenantFilterBinder; /** Binder for subclasses. */ @@ -59,7 +60,7 @@ public class SubClassBinder { * @param parent The parent persistent class instance * @return The list of subclasses created */ - public List<Subclass> bindSubClass(@Nonnull GrailsHibernatePersistentEntity sub, PersistentClass parent) { + public List<Subclass> bindSubClass(@Nonnull HibernatePersistentEntity sub, PersistentClass parent) { mappingCacheHolder.cacheMapping(sub); Subclass subClass = subclassMappingBinder.createSubclassMapping(sub, parent); parent.addSubclass(subClass); @@ -70,7 +71,7 @@ public class SubClassBinder { return subclasses; } - private void bindMultiTenantFilter(GrailsHibernatePersistentEntity sub, Subclass subClass) { + private void bindMultiTenantFilter(HibernatePersistentEntity sub, Subclass subClass) { if (subClass instanceof SingleTableSubclass singleTableSubclass) { multiTenantFilterBinder.bind(sub, singleTableSubclass); } else if (subClass instanceof JoinedSubclass joinedSubclass) { diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/MultiTenantFilterBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/MultiTenantFilterBinder.java index 526c2750d7..78c2ec5d8f 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/MultiTenantFilterBinder.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/MultiTenantFilterBinder.java @@ -83,7 +83,7 @@ public class MultiTenantFilterBinder { */ @Nullable public FilterDefinition bind( - @Nonnull GrailsHibernatePersistentEntity entity, @Nonnull SingleTableSubclass subclass) { + @Nonnull HibernatePersistentEntity entity, @Nonnull SingleTableSubclass subclass) { return null; // Redundant for SingleTableSubclass } @@ -95,7 +95,7 @@ public class MultiTenantFilterBinder { * @return The filter definition applied, or null if none */ @Nullable - public FilterDefinition bind(@Nonnull GrailsHibernatePersistentEntity entity, @Nonnull JoinedSubclass subclass) { + public FilterDefinition bind(@Nonnull HibernatePersistentEntity entity, @Nonnull JoinedSubclass subclass) { return doBind(entity, subclass); } @@ -107,13 +107,13 @@ public class MultiTenantFilterBinder { * @return The filter definition applied, or null if none */ @Nullable - public FilterDefinition bind(@Nonnull GrailsHibernatePersistentEntity entity, @Nonnull UnionSubclass subclass) { + public FilterDefinition bind(@Nonnull HibernatePersistentEntity entity, @Nonnull UnionSubclass subclass) { return doBind(entity, subclass); } @Nullable private FilterDefinition doBind( - @Nonnull GrailsHibernatePersistentEntity entity, @Nonnull PersistentClass persistentClass) { + @Nonnull HibernatePersistentEntity entity, @Nonnull PersistentClass persistentClass) { if (!entity.isMultiTenant()) { return null; @@ -149,7 +149,7 @@ public class MultiTenantFilterBinder { } private boolean shouldApplyFilter( - GrailsHibernatePersistentEntity entity, PersistentClass persistentClass, Property property) { + HibernatePersistentEntity entity, PersistentClass persistentClass, Property property) { if (!(property.getValue() instanceof BasicValue)) { return false; }
