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/05 18:31:05 UTC

(grails-core) branch 8.0.x-hibernate7-dev updated (dab82d7d34 -> 3fee034f15)

This is an automated email from the ASF dual-hosted git repository.

borinquenkid pushed a change to branch 8.0.x-hibernate7-dev
in repository https://gitbox.apache.org/repos/asf/grails-core.git


    from dab82d7d34 Restore NamedCriteria to Hibernate 5
     new 7eda481ca6 refactor: fold AbstractHibernateGormValidationApi into HibernateGormValidationApi
     new b7acdb8245 refactor(hibernate7): fold AbstractHibernateSession into HibernateSession
     new d76b7ef1bb refactor(hibernate7): fold AbstractClosureEventTriggeringInterceptor into ClosureEventTriggeringInterceptor
     new bd2d1f812b refactor(hibernate7): fold AbstractHibernateEventListener into HibernateEventListener
     new 67b42acfba clean up PredicateGenerator
     new 56fc42990f clean up HibernateQuery
     new ecd0263d1b clean up HibernateHqlQuery
     new fec3c5eaa6 refactor(hibernate7): replace dual-field HibernateHqlQuery with HqlQueryDelegate composition
     new 11bdca20ac fix: tighten PersistentEntity.getJavaClass() return type to Class<?>
     new f08ee3a364 clean up HibernateQuery
     new 4eae096763 change HibernateQueryConstants to HibernateQueryArgument
     new bab38a15c9 refactor(hibernate7): replace HibernateDatastore.FlushMode with org.hibernate.FlushMode
     new b47d7c88e1 refactor(hibernate7): more cleanup HibernateDatastore
     new fd162edc7d refactor(hibernate7): more cleanup HibernateGormStaticApi
     new 755ba4f983 refactor(hibernate7): cleanup HibernateSession
     new 5daf86f074 refactor(hibernate7): cleanup HibernateProxyHandler
     new 19c8b9bdf2 refactor(hibernate7): type safety, API modernisation, and spec coverage
     new cc37cc3467 cleanup(hibernate7): ColumnBinder using more GrailsHibernate types
     new 6588810b5e cleanup(hibernate7):  Remove unused InFlightMetadataCollector from ComponentBinder, simplify ComponentUpdater.updateComponen
     new e639f023f1 cleanup(hibernate7):  Make SimpleValueBinder.bindSimpleValue return SimpleValue
     new 836afaa799 cleanup(hibernate7):  General cleanup
     new ef73dd20f9 cleanup(hibernate7):  Fix Generics
     new 6e6a79c184 cleanup(hibernate7):  Make sure updateable is not used internally.
     new e75113a7b7 cleanup(hibernate7): general clean up
     new d412c74b72 cleanup(hibernate7): DefaultColumnNameFetcher
     new d29d3122c2 cleanup(hibernate7): ConfigureDerivedPropertiesConsumer
     new 3fee034f15 cleanup(hibernate7):  use Hibernate-specific types in ForeignKeyColumnCountCalculator and related specs

The 27 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 grails-data-hibernate7/README.md                   |   1 -
 .../groovy/grails/orm/CriteriaMethodInvoker.java   |   8 +-
 .../grails/orm/HibernateCriteriaBuilder.java       |   4 +-
 .../AbstractHibernateGormValidationApi.groovy      | 167 -------------
 .../orm/hibernate/AbstractHibernateSession.java    | 242 -------------------
 .../orm/hibernate/GrailsHibernateTemplate.java     |  18 +-
 .../grails/orm/hibernate/HibernateDatastore.java   | 206 +++++++---------
 .../orm/hibernate/HibernateGormStaticApi.groovy    |  31 +--
 .../hibernate/HibernateGormValidationApi.groovy    | 117 ++++++++-
 .../org/grails/orm/hibernate/HibernateSession.java | 263 +++++++++++++++++----
 .../orm/hibernate/SchemaTenantDataSource.groovy    |  57 +++++
 .../orm/hibernate/cfg/CompositeIdentity.groovy     |   2 +-
 .../orm/hibernate/cfg/GrailsHibernateUtil.java     |  57 +++--
 .../grails/orm/hibernate/cfg/InstanceProxy.groovy  |   6 +-
 .../grails/orm/hibernate/cfg/PropertyConfig.groovy |  13 +-
 .../binder/ClassPropertiesBinder.java              |  16 +-
 .../cfg/domainbinding/binder/CollectionBinder.java |   5 +-
 .../cfg/domainbinding/binder/ColumnBinder.java     |  27 +--
 .../cfg/domainbinding/binder/ComponentBinder.java  |  10 +-
 .../cfg/domainbinding/binder/ComponentUpdater.java |  14 +-
 .../CompositeIdentifierToManyToOneBinder.java      |   2 +-
 .../cfg/domainbinding/binder/EnumTypeBinder.java   |   6 +-
 .../domainbinding/binder/GrailsDomainBinder.java   |   6 +-
 .../domainbinding/binder/GrailsPropertyBinder.java |   6 +-
 .../cfg/domainbinding/binder/IdentityBinder.java   |   3 +-
 .../domainbinding/binder/JoinedSubClassBinder.java |   7 +-
 .../binder/ManyToOneValuesBinder.java              |   2 +-
 .../cfg/domainbinding/binder/RootBinder.java       |   2 +-
 .../RootPersistentClassCommonValuesBinder.java     |   7 +-
 .../cfg/domainbinding/binder/SimpleIdBinder.java   |   3 +-
 .../domainbinding/binder/SimpleValueBinder.java    |  18 +-
 .../binder/SingleTableSubclassBinder.java          |   8 +-
 .../cfg/domainbinding/binder/SubClassBinder.java   |   3 +-
 .../binder/SubclassMappingBinder.java              |   7 +-
 .../cfg/domainbinding/binder/VersionBinder.java    |  12 -
 .../generator/GrailsIdentityGenerator.java         |   2 +
 .../generator/GrailsIncrementGenerator.java        |   5 +-
 .../generator/GrailsNativeGenerator.java           |   5 +-
 .../generator/GrailsSequenceStyleGenerator.java    |   2 +
 .../generator/GrailsTableGenerator.java            |   2 +
 .../hibernate/GrailsHibernatePersistentEntity.java |  12 +-
 .../hibernate/HibernateAssociation.java            |   8 +
 .../hibernate/HibernateEmbeddedClassMapping.java   |   2 +-
 .../HibernateEmbeddedPersistentEntity.java         |   4 +-
 .../hibernate/HibernateIdentityMapping.java        |   6 +-
 .../hibernate/HibernateManyToManyProperty.java     |   5 +
 .../hibernate/HibernateMappingBuilder.groovy       |   7 +-
 .../hibernate/HibernateOneToOneProperty.java       |   9 +
 .../hibernate/HibernatePersistentEntity.java       |  20 +-
 .../hibernate/HibernateToManyProperty.java         |   8 +
 .../secondpass/BasicCollectionElementBinder.java   |   3 +-
 .../secondpass/CollectionKeyColumnUpdater.java     |   3 +-
 .../secondpass/CollectionOrderByBinder.java        |   2 +-
 .../secondpass/CollectionSecondPassBinder.java     |   2 +-
 .../secondpass/CollectionWithJoinTableBinder.java  |   3 +-
 .../domainbinding/secondpass/ListSecondPass.java   |   1 -
 .../secondpass/ListSecondPassBinder.java           |   5 +-
 .../domainbinding/secondpass/MapSecondPass.java    |   1 -
 .../secondpass/MapSecondPassBinder.java            |   6 +-
 .../domainbinding/secondpass/SetSecondPass.java    |   1 -
 .../secondpass/UnidirectionalOneToManyBinder.java  |   2 +-
 .../domainbinding/util/CascadeBehaviorFetcher.java |   8 -
 .../util/ConfigureDerivedPropertiesConsumer.java   |   5 +-
 .../cfg/domainbinding/util/CreateKeyForProps.java  |  28 +--
 .../util/DefaultColumnNameFetcher.java             |   9 +-
 .../util/ForeignKeyColumnCountCalculator.java      |  11 +-
 .../HibernateConnectionSourceFactory.java          |  22 +-
 .../HibernateConnectionSourceSettings.groovy       |  10 +-
 .../dirty/GrailsEntityDirtinessStrategy.groovy     |  69 ++----
 .../listener/AbstractHibernateEventListener.java   |  76 ------
 .../event/listener/HibernateEventListener.java     |  29 ++-
 .../multitenancy/MultiTenantEventListener.java     |  16 +-
 .../orm/hibernate/proxy/HibernateProxyHandler.java |   8 +-
 .../hibernate/query/GrailsHibernateQueryUtils.java |  74 +++---
 .../hibernate/query/HibernateAssociationQuery.java |   4 +-
 .../orm/hibernate/query/HibernateHqlQuery.java     | 106 +++++----
 .../grails/orm/hibernate/query/HibernateQuery.java |  35 +--
 .../hibernate/query/HibernateQueryArgument.java    |  75 ++++++
 .../hibernate/query/HibernateQueryConstants.java   |  41 ++--
 .../hibernate/query/HibernateQueryExecutor.java    |   8 +-
 .../orm/hibernate/query/HqlQueryDelegate.java      |  86 +++++++
 .../orm/hibernate/query/JpaFromProvider.java       |   5 +-
 .../orm/hibernate/query/MutationQueryDelegate.java |  99 ++++++++
 .../orm/hibernate/query/PredicateGenerator.java    |  24 +-
 .../orm/hibernate/query/SelectQueryDelegate.java   | 115 +++++++++
 .../AbstractClosureEventTriggeringInterceptor.java |  43 ----
 .../hibernate/support/ClosureEventListener.java    |  12 +-
 .../support/ClosureEventTriggeringInterceptor.java |  28 ++-
 .../mapping/HibernateMappingBuilderSpec.groovy     |   4 +-
 .../mapping/HibernateMappingBuilderTests.groovy    |   8 +-
 .../gorm/specs/HibernateGormDatastoreSpec.groovy   |   6 +-
 .../HibernateAssociationQuerySpec.groovy           |   4 +-
 .../specs/hibernatequery/HibernateQuerySpec.groovy |  21 +-
 .../JpaCriteriaQueryCreatorSpec.groovy             |   1 -
 .../HibernateDatastoreIntegrationSpec.groovy       |  30 +--
 .../hibernate/HibernateGormStaticApiSpec.groovy    |  51 ++++
 .../hibernate/SchemaTenantDataSourceSpec.groovy    |  78 ++++++
 .../orm/hibernate/cfg/CompositeIdentitySpec.groovy |   8 +-
 .../orm/hibernate/cfg/PropertyConfigSpec.groovy    |  14 +-
 .../cfg/domainbinding/CollectionBinderSpec.groovy  |   3 +-
 .../cfg/domainbinding/ComponentBinderSpec.groovy   |   3 +-
 .../cfg/domainbinding/CompositeIdBinderSpec.groovy |   4 +-
 .../ConfigureDerivedPropertiesConsumerSpec.groovy  |  68 +++---
 .../cfg/domainbinding/CreateKeyForPropsSpec.groovy |  32 +--
 .../ForeignKeyColumnCountCalculatorSpec.groovy     |  21 +-
 .../domainbinding/GrailsPropertyBinderSpec.groovy  |   3 +-
 .../HibernateOneToOnePropertySpec.groovy           |  42 +++-
 .../cfg/domainbinding/IdentityBinderSpec.groovy    |  14 +-
 .../cfg/domainbinding/SimpleIdBinderSpec.groovy    |   2 +-
 .../binder/ComponentUpdaterSpec.groovy             |  70 +++---
 .../cfg/domainbinding/binder/RootBinderSpec.groovy |   4 +-
 ...ootPersistentClassCommonValuesBinderSpec.groovy |   4 +-
 .../binder/SingleTableSubclassBinderSpec.groovy    |   2 +-
 .../domainbinding/binder/SubClassBinderSpec.groovy |  11 +-
 .../binder/SubclassMappingBinderSpec.groovy        |  13 +-
 .../hibernate/HibernateToManyPropertySpec.groovy   |  27 ++-
 .../CollectionWithJoinTableBinderSpec.groovy       |   4 +-
 .../secondpass/ListSecondPassBinderSpec.groovy     |   3 +-
 .../secondpass/MapSecondPassBinderSpec.groovy      |   3 +-
 .../HibernateEntityTransformationSpec.groovy       |   2 +
 .../hibernate/query/HibernateHqlQuerySpec.groovy   |  36 +++
 .../gorm/finders/DynamicFinderInvocation.java      |   2 +-
 .../ConnectionSourcesInitializer.groovy            |   6 +-
 .../mapping/model/AbstractPersistentEntity.java    |   2 +-
 .../datastore/mapping/model/PersistentEntity.java  |   2 +-
 .../mapping/reflect/ClassPropertyFetcher.java      |   2 +-
 grails-doc/src/en/guide/index.adoc                 |   5 +
 grails-doc/src/en/guide/reference.adoc             |   5 +
 .../src/en/ref/Database Mapping/insertable.adoc    |   4 +-
 .../{updateable.adoc => updatable.adoc}            |  12 +-
 .../src/en/ref/Database Mapping/updateable.adoc    |  43 +---
 org/hibernate/engine/spi/ManagedEntity.class       | Bin 0 -> 1528 bytes
 .../spi/PersistentAttributeInterceptable.class     | Bin 0 -> 707 bytes
 .../spi/PersistentAttributeInterceptor.class       | Bin 0 -> 2373 bytes
 134 files changed, 1824 insertions(+), 1383 deletions(-)
 delete mode 100644 grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormValidationApi.groovy
 delete mode 100644 grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateSession.java
 create mode 100644 grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/SchemaTenantDataSource.groovy
 delete mode 100644 grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/event/listener/AbstractHibernateEventListener.java
 create mode 100644 grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/HibernateQueryArgument.java
 create mode 100644 grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/HqlQueryDelegate.java
 create mode 100644 grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/MutationQueryDelegate.java
 create mode 100644 grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/SelectQueryDelegate.java
 delete mode 100644 grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/support/AbstractClosureEventTriggeringInterceptor.java
 create mode 100644 grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/SchemaTenantDataSourceSpec.groovy
 copy grails-doc/src/en/ref/Database Mapping/{updateable.adoc => updatable.adoc} (77%)
 create mode 100644 org/hibernate/engine/spi/ManagedEntity.class
 create mode 100644 org/hibernate/engine/spi/PersistentAttributeInterceptable.class
 create mode 100644 org/hibernate/engine/spi/PersistentAttributeInterceptor.class


(grails-core) 09/27: fix: tighten PersistentEntity.getJavaClass() return type to Class

Posted by bo...@apache.org.
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 11bdca20acb33725b46ede7e27a9a88d33120170
Author: Walter Duque de Estrada <wb...@mac.com>
AuthorDate: Wed Mar 4 13:08:55 2026 -0600

    fix: tighten PersistentEntity.getJavaClass() return type to Class<?>
---
 .../main/groovy/org/grails/orm/hibernate/query/HibernateQuery.java   | 4 ++--
 .../main/groovy/org/grails/orm/hibernate/query/JpaFromProvider.java  | 5 ++---
 .../org/grails/datastore/gorm/finders/DynamicFinderInvocation.java   | 2 +-
 .../org/grails/datastore/mapping/model/AbstractPersistentEntity.java | 2 +-
 .../groovy/org/grails/datastore/mapping/model/PersistentEntity.java  | 2 +-
 .../org/grails/datastore/mapping/reflect/ClassPropertyFetcher.java   | 2 +-
 6 files changed, 8 insertions(+), 9 deletions(-)

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 b8dd55d7bc..111390a1d8 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
@@ -62,7 +62,7 @@ public class HibernateQuery extends Query {
     return detachedCriteria;
   }
 
-  protected Map<String, CriteriaAndAlias> createdAssociationPaths = new HashMap<>();
+  private Map<String, CriteriaAndAlias> createdAssociationPaths = new HashMap<>();
   protected LinkedList<PersistentEntity> entityStack = new LinkedList<>();
   protected LinkedList<Association> associationStack = new LinkedList<>();
   protected DetachedCriteria<?> detachedCriteria;
@@ -75,7 +75,7 @@ public class HibernateQuery extends Query {
 
   public HibernateQuery(HibernateSession session, PersistentEntity entity) {
     super(session, entity);
-    this.detachedCriteria = new DetachedCriteria(entity.getJavaClass());
+    this.detachedCriteria = new DetachedCriteria<>(entity.getJavaClass());
   }
 
   public void setDetachedCriteria(DetachedCriteria<?> detachedCriteria) {
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/JpaFromProvider.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/JpaFromProvider.java
index 9602ec8bf1..fd482e4d22 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/JpaFromProvider.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/JpaFromProvider.java
@@ -79,10 +79,9 @@ public class JpaFromProvider implements Cloneable {
             .map(
                 joinColumn -> {
                   // Determine owner class for this join path from detached criteria
+                  var dac = aliasMap.get(joinColumn);
                   Class<?> ownerClass =
-                      Optional.ofNullable(aliasMap.get(joinColumn))
-                          .map(dac -> dac.getAssociation().getOwner().getJavaClass())
-                          .orElse(root.getJavaType());
+                      dac != null ? dac.getAssociation().getOwner().getJavaClass() : root.getJavaType();
                   // Choose base From: use outer root only if join belongs to the outer root type;
                   // otherwise create a detached root for the owner
                   From<?, ?> base =
diff --git a/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/finders/DynamicFinderInvocation.java b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/finders/DynamicFinderInvocation.java
index c8b8a68dc0..f086faf718 100644
--- a/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/finders/DynamicFinderInvocation.java
+++ b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/finders/DynamicFinderInvocation.java
@@ -51,7 +51,7 @@ public class DynamicFinderInvocation {
         this.operator = operator;
     }
 
-    public Class getJavaClass() {
+    public Class<?> getJavaClass() {
         return javaClass;
     }
 
diff --git a/grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/model/AbstractPersistentEntity.java b/grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/model/AbstractPersistentEntity.java
index 588a856aa1..64daf80c40 100644
--- a/grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/model/AbstractPersistentEntity.java
+++ b/grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/model/AbstractPersistentEntity.java
@@ -381,7 +381,7 @@ public abstract class AbstractPersistentEntity<T extends Entity> implements Pers
         return (this.versionCompatibleType || !propertiesInitialized) && versioned;
     }
 
-    public Class getJavaClass() {
+    public Class<?> getJavaClass() {
         return javaClass;
     }
 
diff --git a/grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/model/PersistentEntity.java b/grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/model/PersistentEntity.java
index 10012c5cc7..6b7acbbcbb 100644
--- a/grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/model/PersistentEntity.java
+++ b/grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/model/PersistentEntity.java
@@ -126,7 +126,7 @@ public interface PersistentEntity extends Initializable {
     /**
      * @return The underlying Java class for this entity
      */
-    Class getJavaClass();
+    Class<?> getJavaClass();
 
     /**
      * Tests whether the given instance is an instance of this persistent entity
diff --git a/grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/reflect/ClassPropertyFetcher.java b/grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/reflect/ClassPropertyFetcher.java
index f56f9c6019..a429285376 100644
--- a/grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/reflect/ClassPropertyFetcher.java
+++ b/grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/reflect/ClassPropertyFetcher.java
@@ -120,7 +120,7 @@ public class ClassPropertyFetcher {
     /**
      * @return The Java that this ClassPropertyFetcher was constructor for
      */
-    public Class getJavaClass() {
+    public Class<?> getJavaClass() {
         return clazz;
     }
 


(grails-core) 12/27: refactor(hibernate7): replace HibernateDatastore.FlushMode with org.hibernate.FlushMode

Posted by bo...@apache.org.
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 bab38a15c9bff53b28d3126460e6509394e5434b
Author: Walter Duque de Estrada <wb...@mac.com>
AuthorDate: Wed Mar 4 14:25:14 2026 -0600

    refactor(hibernate7): replace HibernateDatastore.FlushMode with org.hibernate.FlushMode
---
 .../orm/hibernate/GrailsHibernateTemplate.java     |  18 ++-
 .../grails/orm/hibernate/HibernateDatastore.java   | 126 ++++++---------------
 .../orm/hibernate/HibernateGormStaticApi.groovy    |   5 +-
 .../org/grails/orm/hibernate/HibernateSession.java |   6 +-
 .../orm/hibernate/SchemaTenantDataSource.groovy    |  57 ++++++++++
 .../HibernateDatastoreIntegrationSpec.groovy       |  30 ++---
 .../hibernate/SchemaTenantDataSourceSpec.groovy    |  78 +++++++++++++
 7 files changed, 200 insertions(+), 120 deletions(-)

diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/GrailsHibernateTemplate.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/GrailsHibernateTemplate.java
index 474982d0d8..41abd6a36b 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/GrailsHibernateTemplate.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/GrailsHibernateTemplate.java
@@ -112,7 +112,13 @@ public class GrailsHibernateTemplate implements IHibernateTemplate {
   }
 
   public GrailsHibernateTemplate(SessionFactory sessionFactory, HibernateDatastore datastore) {
-    this(sessionFactory, datastore, datastore.getDefaultFlushMode());
+    this(sessionFactory);
+    if (datastore != null) {
+      cacheQueries = datastore.isCacheQueries();
+      this.osivReadOnly = datastore.isOsivReadOnly();
+      this.passReadOnlyToHibernate = datastore.isPassReadOnlyToHibernate();
+      this.flushMode = hibernateFlushModeToConstant(datastore.getDefaultFlushMode());
+    }
   }
 
   public GrailsHibernateTemplate(
@@ -126,6 +132,16 @@ public class GrailsHibernateTemplate implements IHibernateTemplate {
     this.flushMode = defaultFlushMode;
   }
 
+  /** Maps a Hibernate {@link FlushMode} to one of the {@code FLUSH_*} constants of this class. */
+  static int hibernateFlushModeToConstant(FlushMode mode) {
+    switch (mode) {
+      case MANUAL: return FLUSH_NEVER;
+      case COMMIT: return FLUSH_COMMIT;
+      case ALWAYS: return FLUSH_ALWAYS;
+      default: return FLUSH_AUTO;
+    }
+  }
+
   @Override
   public <T> T execute(Closure<T> callable) {
     HibernateCallback<T> hibernateCallback =
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/HibernateDatastore.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/HibernateDatastore.java
index 8c76d7909d..f82c3bf47f 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/HibernateDatastore.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/HibernateDatastore.java
@@ -34,8 +34,6 @@ import org.grails.datastore.gorm.events.AutoTimestampEventListener;
 import org.grails.datastore.gorm.events.ConfigurableApplicationContextEventPublisher;
 import org.grails.datastore.gorm.events.ConfigurableApplicationEventPublisher;
 import org.grails.datastore.gorm.events.DefaultApplicationEventPublisher;
-import org.grails.datastore.gorm.jdbc.MultiTenantConnection;
-import org.grails.datastore.gorm.jdbc.MultiTenantDataSource;
 import org.grails.datastore.gorm.jdbc.connections.DataSourceConnectionSource;
 import org.grails.datastore.gorm.jdbc.connections.DataSourceConnectionSourceFactory;
 import org.grails.datastore.gorm.jdbc.connections.DataSourceSettings;
@@ -76,9 +74,9 @@ import org.grails.orm.hibernate.connections.HibernateConnectionSourceFactory;
 import org.grails.orm.hibernate.query.HibernateQueryArgument;
 import org.grails.orm.hibernate.connections.HibernateConnectionSourceSettings;
 import org.grails.orm.hibernate.event.listener.HibernateEventListener;
-import org.grails.orm.hibernate.event.listener.HibernateEventListener;
 import org.grails.orm.hibernate.multitenancy.MultiTenantEventListener;
 import org.grails.orm.hibernate.support.ClosureEventTriggeringInterceptor;
+import org.hibernate.FlushMode;
 import org.hibernate.SessionFactory;
 import org.hibernate.boot.Metadata;
 import org.hibernate.cfg.Environment;
@@ -139,8 +137,8 @@ public class HibernateDatastore extends AbstractDatastore
   protected final ConnectionSources<SessionFactory, HibernateConnectionSourceSettings>
       connectionSources;
 
-  /** The default flush mode name. */
-  protected final String defaultFlushModeName;
+  /** The default flush mode. */
+  protected final FlushMode defaultFlushMode;
 
   /** The multi tenant mode. */
   protected final MultiTenancySettings.MultiTenancyMode multiTenantMode;
@@ -163,9 +161,6 @@ public class HibernateDatastore extends AbstractDatastore
   /** The is cache queries. */
   protected final boolean isCacheQueries;
 
-  /** The default flush mode. */
-  protected final int defaultFlushMode;
-
   /** The fail on error. */
   protected final boolean failOnError;
 
@@ -211,10 +206,8 @@ public class HibernateDatastore extends AbstractDatastore
     this.isCacheQueries = hibernateSettings.getCache().isQueries();
     this.failOnError = settings.isFailOnError();
     Boolean markDirty = settings.getMarkDirty();
-    this.markDirty = markDirty == null ? false : markDirty;
-    FlushMode flushMode = FlushMode.valueOf(hibernateSettings.getFlush().getMode().name());
-    this.defaultFlushModeName = flushMode.name();
-    this.defaultFlushMode = flushMode.getLevel();
+    this.markDirty = markDirty != null && markDirty;
+    this.defaultFlushMode = FlushMode.valueOf(hibernateSettings.getFlush().getMode().name());
     MultiTenancySettings multiTenancySettings = settings.getMultiTenancy();
     final TenantResolver multiTenantResolver = multiTenancySettings.getTenantResolver();
     this.multiTenantMode = multiTenancySettings.getMode();
@@ -231,17 +224,17 @@ public class HibernateDatastore extends AbstractDatastore
         new GrailsHibernateTransactionManager(
             defaultConnectionSource.getSource(),
             defaultConnectionSource.getDataSource(),
-            org.hibernate.FlushMode.valueOf(defaultFlushModeName));
+            defaultFlushMode);
     this.eventPublisher = eventPublisher;
     this.eventTriggeringInterceptor = new HibernateEventListener(this);
     this.autoTimestampEventListener = new AutoTimestampEventListener(this);
 
     ClosureEventTriggeringInterceptor interceptor =
-        (ClosureEventTriggeringInterceptor) hibernateSettings.getEventTriggeringInterceptor();
+            hibernateSettings.getEventTriggeringInterceptor();
     interceptor.setDatastore(this);
     interceptor.setEventPublisher(eventPublisher);
     registerEventListeners(this.eventPublisher);
-    configureValidatorRegistry(settings, mappingContext);
+    configureValidatorRegistry(mappingContext);
     this.mappingContext.addMappingContextListener(
         new MappingContext.Listener() {
           @Override
@@ -547,12 +540,9 @@ public class HibernateDatastore extends AbstractDatastore
         config.getProperty(HibernateQueryArgument.CONFIG_CACHE_QUERIES.value(), Boolean.class, false);
 
     if (config.getProperty(SETTING_AUTO_FLUSH, Boolean.class, false)) {
-      this.defaultFlushModeName = FlushMode.AUTO.name();
-      this.defaultFlushMode = FlushMode.AUTO.level;
+      this.defaultFlushMode = FlushMode.AUTO;
     } else {
-      FlushMode fm = config.getProperty(SETTING_FLUSH_MODE, FlushMode.class, FlushMode.COMMIT);
-      this.defaultFlushModeName = fm.name();
-      this.defaultFlushMode = fm.level;
+      this.defaultFlushMode = config.getProperty(SETTING_FLUSH_MODE, FlushMode.class, FlushMode.COMMIT);
     }
     this.failOnError = config.getProperty(SETTING_FAIL_ON_ERROR, Boolean.class, false);
     this.markDirty = config.getProperty(SETTING_MARK_DIRTY, Boolean.class, false);
@@ -624,9 +614,7 @@ public class HibernateDatastore extends AbstractDatastore
   public void setMessageSource(MessageSource messageSource) {
     HibernateMappingContext mappingContext = getMappingContext();
     ValidatorRegistry validatorRegistry = createValidatorRegistry(messageSource);
-    HibernateConnectionSourceSettings settings =
-        getConnectionSources().getDefaultConnectionSource().getSettings();
-    configureValidatorRegistry(settings, mappingContext, validatorRegistry, messageSource);
+    configureValidatorRegistry(mappingContext, validatorRegistry, messageSource);
   }
 
   protected void registerEventListeners(ConfigurableApplicationEventPublisher eventPublisher) {
@@ -638,14 +626,13 @@ public class HibernateDatastore extends AbstractDatastore
   }
 
   protected void configureValidatorRegistry(
-      HibernateConnectionSourceSettings settings, HibernateMappingContext mappingContext) {
+      HibernateMappingContext mappingContext) {
     StaticMessageSource messageSource = new StaticMessageSource();
     ValidatorRegistry defaultValidatorRegistry = createValidatorRegistry(messageSource);
-    configureValidatorRegistry(settings, mappingContext, defaultValidatorRegistry, messageSource);
+    configureValidatorRegistry(mappingContext, defaultValidatorRegistry, messageSource);
   }
 
   protected void configureValidatorRegistry(
-      HibernateConnectionSourceSettings settings,
       HibernateMappingContext mappingContext,
       ValidatorRegistry validatorRegistry,
       MessageSource messageSource) {
@@ -726,15 +713,14 @@ public class HibernateDatastore extends AbstractDatastore
       HibernateConnectionSourceSettings.HibernateSettings hibernateSettings =
           settings.getHibernate();
       ClosureEventTriggeringInterceptor interceptor =
-          (ClosureEventTriggeringInterceptor) hibernateSettings.getEventTriggeringInterceptor();
+              hibernateSettings.getEventTriggeringInterceptor();
       interceptor.setDatastore(this);
       interceptor.setEventPublisher(eventPublisher);
-      MappingContext mappingContext = getMappingContext();
+      HibernateMappingContext mappingContext = getMappingContext();
       // make messages from the application context available to validation
       ValidatorRegistry validatorRegistry = createValidatorRegistry(applicationContext);
       configureValidatorRegistry(
-          settings,
-          (HibernateMappingContext) mappingContext,
+              mappingContext,
           validatorRegistry,
           applicationContext);
       mappingContext.setValidatorRegistry(validatorRegistry);
@@ -755,7 +741,7 @@ public class HibernateDatastore extends AbstractDatastore
     try {
       if (session != null) {
         previousMode = session.getHibernateFlushMode();
-        session.setHibernateFlushMode(org.hibernate.FlushMode.valueOf(flushMode.name()));
+        session.setHibernateFlushMode(flushMode);
       }
       try {
         reset = callable.call();
@@ -771,7 +757,7 @@ public class HibernateDatastore extends AbstractDatastore
 
   public org.hibernate.Session openSession() {
     org.hibernate.Session session = this.sessionFactory.openSession();
-    session.setHibernateFlushMode(org.hibernate.FlushMode.valueOf(defaultFlushModeName));
+    session.setHibernateFlushMode(defaultFlushMode);
     return session;
   }
 
@@ -779,7 +765,7 @@ public class HibernateDatastore extends AbstractDatastore
   public Session getCurrentSession() throws ConnectionNotFoundException {
     // HibernateSession, just a thin wrapper around default session handling so simply return a new
     // instance here
-    return new HibernateSession(this, sessionFactory, getDefaultFlushMode());
+    return new HibernateSession(this, sessionFactory);
   }
 
   @Override
@@ -818,9 +804,8 @@ public class HibernateDatastore extends AbstractDatastore
       dataSource = ((TransactionAwareDataSourceProxy) dataSource).getTargetDataSource();
     }
     Object existing = TransactionSynchronizationManager.getResource(dataSource);
-    if (existing instanceof ConnectionHolder) {
-      ConnectionHolder connectionHolder = (ConnectionHolder) existing;
-      Connection connection = connectionHolder.getConnection();
+    if (existing instanceof ConnectionHolder connectionHolder) {
+        Connection connection = connectionHolder.getConnection();
       try {
         if (!connection.isClosed() && !connection.isReadOnly()) {
           schemaHandler.useDefaultSchema(connection);
@@ -855,8 +840,8 @@ public class HibernateDatastore extends AbstractDatastore
     HibernateConnectionSourceSettings tenantSettings;
     try {
       tenantSettings =
-          (HibernateConnectionSourceSettings)
-              connectionSources.getDefaultConnectionSource().getSettings().clone();
+              (HibernateConnectionSourceSettings)
+                  connectionSources.getDefaultConnectionSource().getSettings().clone();
     } catch (CloneNotSupportedException e) {
       throw new ConfigurationException(
           "Couldn't clone default Hibernate settings! " + e.getMessage(), e);
@@ -894,22 +879,7 @@ public class HibernateDatastore extends AbstractDatastore
     }
 
     DataSource dataSource = defaultConnectionSource.getDataSource();
-    dataSource =
-        new MultiTenantDataSource(dataSource, schemaName) {
-          @Override
-          public Connection getConnection() throws SQLException {
-            Connection connection = super.getConnection();
-            schemaHandler.useSchema(connection, schemaName);
-            return new MultiTenantConnection(connection, schemaHandler);
-          }
-
-          @Override
-          public Connection getConnection(String username, String password) throws SQLException {
-            Connection connection = super.getConnection(username, password);
-            schemaHandler.useSchema(connection, schemaName);
-            return new MultiTenantConnection(connection, schemaHandler);
-          }
-        };
+    dataSource = new SchemaTenantDataSource(dataSource, schemaName, schemaHandler);
     DefaultConnectionSource<DataSource, DataSourceSettings> dataSourceConnectionSource =
         new DefaultConnectionSource<>(schemaName, dataSource, tenantSettings.getDataSource());
     ConnectionSource<SessionFactory, HibernateConnectionSourceSettings> connectionSource =
@@ -1023,13 +993,13 @@ public class HibernateDatastore extends AbstractDatastore
 
   /** Returns whether auto flush. */
   public boolean isAutoFlush() {
-    return defaultFlushMode == FlushMode.AUTO.level;
+    return defaultFlushMode == FlushMode.AUTO;
   }
 
   /**
-   * @return Obtains the default flush mode level
+   * @return The default flush mode
    */
-  public int getDefaultFlushMode() {
+  public FlushMode getDefaultFlushMode() {
     return defaultFlushMode;
   }
 
@@ -1037,7 +1007,7 @@ public class HibernateDatastore extends AbstractDatastore
    * @return The name of the default flush mode
    */
   public String getDefaultFlushModeName() {
-    return defaultFlushModeName;
+    return defaultFlushMode.name();
   }
 
   /** Returns whether fail on error. */
@@ -1096,7 +1066,7 @@ public class HibernateDatastore extends AbstractDatastore
 
   /** Gets the hibernate template using the default flush mode. */
   public IHibernateTemplate getHibernateTemplate() {
-    return getHibernateTemplate(defaultFlushMode);
+    return new GrailsHibernateTemplate(getSessionFactory(), this);
   }
 
   @Override
@@ -1151,17 +1121,17 @@ public class HibernateDatastore extends AbstractDatastore
     final boolean isMultiTenant =
         getMultiTenancyMode() == MultiTenancySettings.MultiTenancyMode.DISCRIMINATOR;
     return isMultiTenant
-        ? new Closure<T>(this) {
-          @Override
-          public T call(Object... args) {
+        ? new Closure<>(this) {
+        @Override
+        public T call(Object... args) {
             enableMultiTenancyFilter();
             try {
-              return callable.call(args);
+                return callable.call(args);
             } finally {
-              disableMultiTenancyFilter();
+                disableMultiTenancyFilter();
             }
-          }
         }
+    }
         : callable;
   }
 
@@ -1175,30 +1145,4 @@ public class HibernateDatastore extends AbstractDatastore
     }
   }
 
-  /**
-   * We use a separate enum here because the classes differ between Hibernate 3 and 4
-   *
-   * @see org.hibernate.FlushMode
-   */
-  public enum FlushMode {
-    /** The manual constant. */
-    MANUAL(0),
-    /** The commit constant. */
-    COMMIT(5),
-    /** The auto constant. */
-    AUTO(10),
-    /** The always constant. */
-    ALWAYS(20);
-
-    private final int level;
-
-    FlushMode(int level) {
-      this.level = level;
-    }
-
-    /** Gets the level. */
-    public int getLevel() {
-      return level;
-    }
-  }
 }
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/HibernateGormStaticApi.groovy b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/HibernateGormStaticApi.groovy
index 69e3fb41f0..2ac3406a78 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/HibernateGormStaticApi.groovy
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/HibernateGormStaticApi.groovy
@@ -69,7 +69,6 @@ class HibernateGormStaticApi<D> extends GormStaticApi<D> {
     protected Class identityType
     protected ClassLoader classLoader
     private HibernateGormInstanceApi<D> instanceApi
-    private int defaultFlushMode
 
     HibernateGormStaticApi(Class<D> persistentClass, HibernateDatastore datastore, List<FinderMethod> finders,
                            ClassLoader classLoader, PlatformTransactionManager transactionManager) {
@@ -79,13 +78,11 @@ class HibernateGormStaticApi<D> extends GormStaticApi<D> {
         this.proxyHandler = datastore.mappingContext.proxyHandler
         this.hibernateSession = new HibernateSession(
                 (HibernateDatastore)datastore,
-                hibernateTemplate.getSessionFactory(),
-                hibernateTemplate.getFlushMode()
+                hibernateTemplate.getSessionFactory()
         )
         this.classLoader = classLoader
         this.sessionFactory = datastore.getSessionFactory()
         this.identityType = persistentEntity.identity?.type
-        this.defaultFlushMode = datastore.getDefaultFlushMode()
         this.instanceApi = new HibernateGormInstanceApi<>(persistentClass, datastore, classLoader)
     }
 
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 32f36b2a71..2c17bb95d4 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
@@ -79,16 +79,12 @@ public class HibernateSession extends AbstractAttributeStoringSession
   DefaultTimestampProvider timestampProvider;
 
   public HibernateSession(
-      HibernateDatastore hibernateDatastore, SessionFactory sessionFactory, int defaultFlushMode) {
+      HibernateDatastore hibernateDatastore, SessionFactory sessionFactory) {
     datastore = hibernateDatastore;
     hibernateTemplate =
         new GrailsHibernateTemplate(sessionFactory, (HibernateDatastore) getDatastore());
   }
 
-  public HibernateSession(HibernateDatastore hibernateDatastore, SessionFactory sessionFactory) {
-    this(hibernateDatastore, sessionFactory, hibernateDatastore.getDefaultFlushMode());
-  }
-
   @Override
   public boolean isSchemaless() {
     return false;
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/SchemaTenantDataSource.groovy b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/SchemaTenantDataSource.groovy
new file mode 100644
index 0000000000..398c9289b7
--- /dev/null
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/SchemaTenantDataSource.groovy
@@ -0,0 +1,57 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.grails.orm.hibernate
+
+import java.sql.Connection
+
+import groovy.transform.CompileStatic
+import javax.sql.DataSource
+import org.grails.datastore.gorm.jdbc.MultiTenantConnection
+import org.grails.datastore.gorm.jdbc.MultiTenantDataSource
+import org.grails.datastore.gorm.jdbc.schema.SchemaHandler
+
+/**
+ * A {@link MultiTenantDataSource} that switches to a specific schema on every connection
+ * and wraps the returned connection in a {@link MultiTenantConnection} so that the schema
+ * is restored when the connection is closed.
+ */
+@CompileStatic
+class SchemaTenantDataSource extends MultiTenantDataSource {
+
+    private final SchemaHandler schemaHandler
+
+    SchemaTenantDataSource(DataSource target, String schemaName, SchemaHandler schemaHandler) {
+        super(target, schemaName)
+        this.schemaHandler = schemaHandler
+    }
+
+    @Override
+    Connection getConnection() {
+        Connection connection = super.getConnection()
+        schemaHandler.useSchema(connection, tenantId)
+        new MultiTenantConnection(connection, schemaHandler)
+    }
+
+    @Override
+    Connection getConnection(String username, String password) {
+        Connection connection = super.getConnection(username, password)
+        schemaHandler.useSchema(connection, tenantId)
+        new MultiTenantConnection(connection, schemaHandler)
+    }
+}
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/HibernateDatastoreIntegrationSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/HibernateDatastoreIntegrationSpec.groovy
index 16c57a3ecd..f46c53971a 100644
--- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/HibernateDatastoreIntegrationSpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/HibernateDatastoreIntegrationSpec.groovy
@@ -23,6 +23,7 @@ import grails.gorm.hibernate.HibernateEntity
 import grails.gorm.specs.HibernateGormDatastoreSpec
 import org.grails.orm.hibernate.cfg.HibernateMappingContext
 import org.grails.orm.hibernate.event.listener.HibernateEventListener
+import org.hibernate.FlushMode
 import org.springframework.transaction.support.TransactionSynchronizationManager
 import org.testcontainers.containers.PostgreSQLContainer
 import org.testcontainers.spock.Testcontainers
@@ -116,10 +117,9 @@ class HibernateDatastoreIntegrationSpec extends HibernateGormDatastoreSpec {
         !datastore.autoFlush
     }
 
-    void "defaultFlushMode is COMMIT level by default"() {
+    void "defaultFlushMode is COMMIT by default"() {
         expect:
-        // HibernateDatastore.FlushMode.COMMIT.level == 5
-        datastore.defaultFlushMode == HibernateDatastore.FlushMode.COMMIT.level
+        datastore.defaultFlushMode == FlushMode.COMMIT
     }
 
     void "defaultFlushModeName is COMMIT by default"() {
@@ -148,24 +148,16 @@ class HibernateDatastoreIntegrationSpec extends HibernateGormDatastoreSpec {
     }
 
     // -------------------------------------------------------------------------
-    // FlushMode enum (HibernateDatastore.FlushMode)
+    // FlushMode (org.hibernate.FlushMode)
     // -------------------------------------------------------------------------
 
-    void "FlushMode enum levels are correctly ordered"() {
-        expect:
-        HibernateDatastore.FlushMode.MANUAL.level  == 0
-        HibernateDatastore.FlushMode.COMMIT.level  == 5
-        HibernateDatastore.FlushMode.AUTO.level    == 10
-        HibernateDatastore.FlushMode.ALWAYS.level  == 20
-    }
-
     void "FlushMode enum values are all present"() {
         expect:
-        HibernateDatastore.FlushMode.values().size() == 4
-        HibernateDatastore.FlushMode.valueOf('MANUAL')  != null
-        HibernateDatastore.FlushMode.valueOf('COMMIT')  != null
-        HibernateDatastore.FlushMode.valueOf('AUTO')    != null
-        HibernateDatastore.FlushMode.valueOf('ALWAYS')  != null
+        FlushMode.values().size() == 4
+        FlushMode.valueOf('MANUAL')  != null
+        FlushMode.valueOf('COMMIT')  != null
+        FlushMode.valueOf('AUTO')    != null
+        FlushMode.valueOf('ALWAYS')  != null
     }
 
     // -------------------------------------------------------------------------
@@ -239,7 +231,7 @@ class HibernateDatastoreIntegrationSpec extends HibernateGormDatastoreSpec {
 
         when:
         DatastoreBook.withTransaction {
-            datastore.withFlushMode(HibernateDatastore.FlushMode.AUTO) {
+            datastore.withFlushMode(FlushMode.AUTO) {
                 executed = true
                 true
             }
@@ -258,7 +250,7 @@ class HibernateDatastoreIntegrationSpec extends HibernateGormDatastoreSpec {
             def sess = sessionFactory.currentSession
             org.hibernate.FlushMode modeBefore = sess.hibernateFlushMode
 
-            datastore.withFlushMode(HibernateDatastore.FlushMode.ALWAYS) { true }
+            datastore.withFlushMode(FlushMode.ALWAYS) { true }
 
             modeAfter = sess.hibernateFlushMode
         }
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/SchemaTenantDataSourceSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/SchemaTenantDataSourceSpec.groovy
new file mode 100644
index 0000000000..6a08eb95e9
--- /dev/null
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/SchemaTenantDataSourceSpec.groovy
@@ -0,0 +1,78 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.grails.orm.hibernate
+
+import java.sql.Connection
+import javax.sql.DataSource
+
+import spock.lang.Specification
+import spock.lang.Subject
+
+import org.grails.datastore.gorm.jdbc.MultiTenantConnection
+import org.grails.datastore.gorm.jdbc.schema.SchemaHandler
+
+class SchemaTenantDataSourceSpec extends Specification {
+
+    static final String SCHEMA = 'tenant_schema'
+
+    DataSource targetDataSource = Mock()
+    Connection rawConnection = Mock()
+    SchemaHandler schemaHandler = Mock()
+
+    @Subject
+    SchemaTenantDataSource dataSource = new SchemaTenantDataSource(targetDataSource, SCHEMA, schemaHandler)
+
+    def "getConnection() switches to the tenant schema and returns a MultiTenantConnection"() {
+        given:
+        targetDataSource.getConnection() >> rawConnection
+
+        when:
+        Connection result = dataSource.getConnection()
+
+        then:
+        1 * schemaHandler.useSchema(rawConnection, SCHEMA)
+        result instanceof MultiTenantConnection
+        (result as MultiTenantConnection).target == rawConnection
+        (result as MultiTenantConnection).schemaHandler == schemaHandler
+    }
+
+    def "getConnection(username, password) switches to the tenant schema and returns a MultiTenantConnection"() {
+        given:
+        targetDataSource.getConnection('user', 'pass') >> rawConnection
+
+        when:
+        Connection result = dataSource.getConnection('user', 'pass')
+
+        then:
+        1 * schemaHandler.useSchema(rawConnection, SCHEMA)
+        result instanceof MultiTenantConnection
+        (result as MultiTenantConnection).target == rawConnection
+        (result as MultiTenantConnection).schemaHandler == schemaHandler
+    }
+
+    def "tenantId is stored correctly"() {
+        expect:
+        dataSource.tenantId == SCHEMA
+    }
+
+    def "target DataSource is stored correctly"() {
+        expect:
+        dataSource.target == targetDataSource
+    }
+}


(grails-core) 01/27: refactor: fold AbstractHibernateGormValidationApi into HibernateGormValidationApi

Posted by bo...@apache.org.
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 7eda481ca6c79728c86810a9d978d4c2f6a998ee
Author: Walter Duque de Estrada <wb...@mac.com>
AuthorDate: Wed Mar 4 08:42:54 2026 -0600

    refactor: fold AbstractHibernateGormValidationApi into HibernateGormValidationApi
---
 grails-data-hibernate7/README.md                   |   1 -
 .../AbstractHibernateGormValidationApi.groovy      | 167 ---------------------
 .../hibernate/HibernateGormValidationApi.groovy    | 117 +++++++++++++--
 .../grails/orm/hibernate/cfg/InstanceProxy.groovy  |   6 +-
 .../hibernate/support/ClosureEventListener.java    |   4 +-
 5 files changed, 111 insertions(+), 184 deletions(-)

diff --git a/grails-data-hibernate7/README.md b/grails-data-hibernate7/README.md
index 88a96fc11c..a69562f596 100644
--- a/grails-data-hibernate7/README.md
+++ b/grails-data-hibernate7/README.md
@@ -31,7 +31,6 @@ These tests live in `grails-datamapping-tck` and are deliberately excluded for H
 | TCK Spec | # skipped | Skip condition | Reason / notes                                                                                 |
 |----------|-----------|----------------|------------------------------------------------------------------------------------------------|
 | `DirtyCheckingSpec` | 6 | `@IgnoreIf(hibernate7.gorm.suite == true)` | Hibernate 7 dirty-checking semantics differ; the entire spec is disabled                       |
-| `NamedQuerySpec` | 38 | `@IgnoreIf(hibernate7.gorm.suite == true)` | Named query support not yet ported to Hibernate 7                                              |
 | `GroovyProxySpec` | 5 | `@IgnoreIf(hibernate5/6/7.gorm.suite)` | Groovy proxy support requires `ByteBuddyGroovyProxyFactory`; excluded for all Hibernate suites |
 | `OptimisticLockingSpec` | 3 | `@IgnoreIf` (detects Hibernate datastore on classpath) | Hibernate has its own `Hibernate7OptimisticLockingSpec` replacement                            |
 | `UpdateWithProxyPresentSpec` | 2 | `@IgnoreIf(hibernate7.gorm.suite == true)` | Proxy update behaviour differs in Hibernate 7                                                  |
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormValidationApi.groovy b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormValidationApi.groovy
deleted file mode 100644
index 4b90b3f9c8..0000000000
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateGormValidationApi.groovy
+++ /dev/null
@@ -1,167 +0,0 @@
-/* 
- * Copyright 2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.grails.orm.hibernate
-
-import groovy.transform.CompileStatic
-import org.grails.datastore.gorm.validation.CascadingValidator
-import org.grails.datastore.mapping.reflect.ClassUtils
-import org.grails.datastore.mapping.validation.ValidationErrors
-import org.grails.orm.hibernate.support.HibernateRuntimeUtils
-import org.grails.datastore.gorm.GormValidationApi
-import org.grails.datastore.mapping.engine.event.ValidationEvent
-import org.hibernate.Session
-import org.springframework.validation.Errors
-import org.springframework.validation.FieldError
-import org.springframework.validation.ObjectError
-import org.springframework.validation.Validator
-
-@CompileStatic
-abstract class AbstractHibernateGormValidationApi<D> extends GormValidationApi<D> {
-
-    public static final String ARGUMENT_DEEP_VALIDATE = "deepValidate";
-    private static final String ARGUMENT_EVICT = "evict";
-
-
-    protected ClassLoader classLoader
-    protected HibernateDatastore datastore
-    protected IHibernateTemplate hibernateTemplate
-
-    protected AbstractHibernateGormValidationApi(Class<D> persistentClass, HibernateDatastore datastore, ClassLoader classLoader) {
-        super(persistentClass, datastore)
-        this.classLoader = classLoader
-        this.datastore = datastore
-    }
-
-
-    @Override
-    boolean validate(D instance, Map arguments = Collections.emptyMap()) {
-        validate(instance, null, arguments)
-    }
-
-    boolean validate(D instance, List validatedFieldsList, Map arguments = Collections.emptyMap()) {
-        Errors errors = setupErrorsProperty(instance);
-
-        Validator validator = getValidator()
-        if(validator == null) return true
-
-        Boolean valid = Boolean.TRUE
-        // should evict?
-        boolean evict = false
-        boolean deepValidate = true
-        Set validatedFields = null
-        if(validatedFieldsList != null) {
-            validatedFields = new HashSet(validatedFieldsList)
-        }
-
-        if (arguments?.containsKey(ARGUMENT_DEEP_VALIDATE)) {
-            deepValidate = ClassUtils.getBooleanFromMap(ARGUMENT_DEEP_VALIDATE, arguments)
-        }
-
-        evict = ClassUtils.getBooleanFromMap(ARGUMENT_EVICT, arguments);
-
-        fireEvent instance, validatedFieldsList
-
-
-        hibernateTemplate.execute { Session session ->
-
-            def previous = readPreviousFlushMode(session)
-            applyManualFlush(session)
-            try {
-                if (validator instanceof CascadingValidator) {
-                    ((CascadingValidator)validator).validate instance, errors, deepValidate
-                } else if (validator instanceof grails.gorm.validation.CascadingValidator) {
-                    ((grails.gorm.validation.CascadingValidator) validator).validate instance, errors, deepValidate
-                } else {
-                    validator.validate instance, errors
-                }
-            } finally {
-                if(!errors.hasErrors()) {
-                    restoreFlushMode(session, previous)
-                }
-            }
-
-        }
-
-
-        int oldErrorCount = errors.errorCount
-        errors = filterErrors(errors, validatedFields, instance)
-
-        if (errors.hasErrors()) {
-            valid = Boolean.FALSE
-            if (evict) {
-                // if an boolean argument 'true' is passed to the method
-                // and validation fails then the object will be evicted
-                // from the session, ensuring it is not saved later when
-                // flush is called
-                if (hibernateTemplate.contains(instance)) {
-                    hibernateTemplate.evict(instance)
-                }
-            }
-        }
-
-        // If the errors have been filtered, update the 'errors' object attached to the target.
-        if (errors.errorCount != oldErrorCount) {
-            setErrors(instance, errors)
-        }
-
-        return valid
-    }
-
-    abstract void restoreFlushMode(Session session, Object previousFlushMode)
-
-    abstract Object readPreviousFlushMode(Session session)
-
-    abstract applyManualFlush(Session session)
-
-    private void fireEvent(Object target, List<?> validatedFieldsList) {
-        ValidationEvent event = new ValidationEvent(datastore, target);
-        event.setValidatedFields(validatedFieldsList);
-        datastore.getApplicationEventPublisher().publishEvent(event);
-    }
-
-    @SuppressWarnings("rawtypes")
-    private Errors filterErrors(Errors errors, Set validatedFields, Object target) {
-        if (validatedFields == null) return errors;
-
-        ValidationErrors result = new ValidationErrors(target);
-
-        final List allErrors = errors.getAllErrors();
-        for (Object allError : allErrors) {
-            ObjectError error = (ObjectError) allError;
-
-            if (error instanceof FieldError) {
-                FieldError fieldError = (FieldError) error;
-                if (!validatedFields.contains(fieldError.getField())) continue;
-            }
-
-            result.addError(error);
-        }
-
-        return result;
-    }
-
-    /**
-     * Initializes the Errors property on target.  The target will be assigned a new
-     * Errors property.  If the target contains any binding errors, those binding
-     * errors will be copied in to the new Errors property.
-     *
-     * @param target object to initialize
-     * @return the new Errors object
-     */
-    protected Errors setupErrorsProperty(Object target) {
-        HibernateRuntimeUtils.setupErrorsProperty target
-    }
-}
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/HibernateGormValidationApi.groovy b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/HibernateGormValidationApi.groovy
index d7576cdf44..05e652bf1c 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/HibernateGormValidationApi.groovy
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/HibernateGormValidationApi.groovy
@@ -16,31 +16,126 @@
 package org.grails.orm.hibernate
 
 import groovy.transform.CompileStatic
+import org.grails.datastore.gorm.GormValidationApi
+import org.grails.datastore.gorm.validation.CascadingValidator
+import org.grails.datastore.mapping.reflect.ClassUtils
+import org.grails.datastore.mapping.validation.ValidationErrors
+import org.grails.datastore.mapping.engine.event.ValidationEvent
+import org.grails.orm.hibernate.support.HibernateRuntimeUtils
 import org.hibernate.FlushMode
 import org.hibernate.Session
+import org.springframework.validation.Errors
+import org.springframework.validation.FieldError
+import org.springframework.validation.ObjectError
+import org.springframework.validation.Validator
 
 @CompileStatic
-class HibernateGormValidationApi<D> extends AbstractHibernateGormValidationApi<D> {
+class HibernateGormValidationApi<D> extends GormValidationApi<D> {
+
+    public static final String ARGUMENT_DEEP_VALIDATE = "deepValidate"
+    private static final String ARGUMENT_EVICT = "evict"
+
+    protected ClassLoader classLoader
+    protected HibernateDatastore datastore
+    protected IHibernateTemplate hibernateTemplate
 
     HibernateGormValidationApi(Class<D> persistentClass, HibernateDatastore datastore, ClassLoader classLoader) {
-        super(persistentClass, datastore, classLoader)
+        super(persistentClass, datastore)
+        this.classLoader = classLoader
+        this.datastore = datastore
         hibernateTemplate = new GrailsHibernateTemplate(datastore.getSessionFactory(), datastore)
     }
 
     @Override
-    void restoreFlushMode(Session session, Object previousFlushMode) {
-        if(previousFlushMode != null) {
-            session.setHibernateFlushMode((FlushMode)previousFlushMode)
+    boolean validate(D instance, Map arguments = Collections.emptyMap()) {
+        validate(instance, null, arguments)
+    }
+
+    boolean validate(D instance, List validatedFieldsList, Map arguments = Collections.emptyMap()) {
+        Errors errors = setupErrorsProperty(instance)
+
+        Validator validator = getValidator()
+        if (validator == null) return true
+
+        Boolean valid = Boolean.TRUE
+        boolean evict = false
+        boolean deepValidate = true
+        Set validatedFields = null
+        if (validatedFieldsList != null) {
+            validatedFields = new HashSet(validatedFieldsList)
+        }
+
+        if (arguments?.containsKey(ARGUMENT_DEEP_VALIDATE)) {
+            deepValidate = ClassUtils.getBooleanFromMap(ARGUMENT_DEEP_VALIDATE, arguments)
+        }
+
+        evict = ClassUtils.getBooleanFromMap(ARGUMENT_EVICT, arguments)
+
+        fireEvent(instance, validatedFieldsList)
+
+        hibernateTemplate.execute { Session session ->
+            FlushMode previous = session.getHibernateFlushMode()
+            session.setHibernateFlushMode(FlushMode.MANUAL)
+            try {
+                if (validator instanceof CascadingValidator) {
+                    ((CascadingValidator) validator).validate instance, errors, deepValidate
+                } else if (validator instanceof grails.gorm.validation.CascadingValidator) {
+                    ((grails.gorm.validation.CascadingValidator) validator).validate instance, errors, deepValidate
+                } else {
+                    validator.validate instance, errors
+                }
+            } finally {
+                if (!errors.hasErrors()) {
+                    session.setHibernateFlushMode(previous)
+                }
+            }
+        }
+
+        int oldErrorCount = errors.errorCount
+        errors = filterErrors(errors, validatedFields, instance)
+
+        if (errors.hasErrors()) {
+            valid = Boolean.FALSE
+            if (evict) {
+                if (hibernateTemplate.contains(instance)) {
+                    hibernateTemplate.evict(instance)
+                }
+            }
+        }
+
+        if (errors.errorCount != oldErrorCount) {
+            setErrors(instance, errors)
         }
+
+        return valid
     }
 
-    @Override
-    Object readPreviousFlushMode(Session session) {
-        return session.getHibernateFlushMode()
+    private void fireEvent(Object target, List<?> validatedFieldsList) {
+        ValidationEvent event = new ValidationEvent(datastore, target)
+        event.setValidatedFields(validatedFieldsList)
+        datastore.getApplicationEventPublisher().publishEvent(event)
     }
 
-    @Override
-    def applyManualFlush(Session session) {
-        session.setHibernateFlushMode(FlushMode.MANUAL)
+    @SuppressWarnings("rawtypes")
+    private Errors filterErrors(Errors errors, Set validatedFields, Object target) {
+        if (validatedFields == null) return errors
+
+        ValidationErrors result = new ValidationErrors(target)
+
+        final List allErrors = errors.getAllErrors()
+        for (Object allError : allErrors) {
+            ObjectError error = (ObjectError) allError
+            if (error instanceof FieldError) {
+                FieldError fieldError = (FieldError) error
+                if (!validatedFields.contains(fieldError.getField())) continue
+            }
+            result.addError(error)
+        }
+
+        return result
+    }
+
+    protected Errors setupErrorsProperty(Object target) {
+        HibernateRuntimeUtils.setupErrorsProperty target
     }
 }
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/InstanceProxy.groovy b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/InstanceProxy.groovy
index 3a74b36d12..5a544c0795 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/InstanceProxy.groovy
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/InstanceProxy.groovy
@@ -18,17 +18,17 @@ package org.grails.orm.hibernate.cfg
 import groovy.transform.CompileStatic
 
 import org.grails.orm.hibernate.HibernateGormInstanceApi
-import org.grails.orm.hibernate.AbstractHibernateGormValidationApi
+import org.grails.orm.hibernate.HibernateGormValidationApi
 
 @CompileStatic
 class InstanceProxy {
     protected instance
-    protected AbstractHibernateGormValidationApi validateApi
+    protected HibernateGormValidationApi validateApi
     protected HibernateGormInstanceApi instanceApi
 
     protected final Set<String> validateMethods
 
-    InstanceProxy(instance, HibernateGormInstanceApi instanceApi, AbstractHibernateGormValidationApi validateApi) {
+    InstanceProxy(instance, HibernateGormInstanceApi instanceApi, HibernateGormValidationApi validateApi) {
         this.instance = instance
         this.instanceApi = instanceApi
         this.validateApi = validateApi
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 b84e36be63..a5f426f050 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
@@ -35,7 +35,7 @@ import org.grails.datastore.mapping.model.config.GormProperties;
 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.AbstractHibernateGormValidationApi;
+import org.grails.orm.hibernate.HibernateGormValidationApi;
 import org.hibernate.FlushMode;
 import org.hibernate.HibernateException;
 import org.hibernate.Session;
@@ -109,7 +109,7 @@ public class ClosureEventListener
             : failOnError;
 
     validateParams = new HashMap();
-    validateParams.put(AbstractHibernateGormValidationApi.ARGUMENT_DEEP_VALIDATE, Boolean.FALSE);
+    validateParams.put(HibernateGormValidationApi.ARGUMENT_DEEP_VALIDATE, Boolean.FALSE);
   }
 
   @Override


(grails-core) 15/27: refactor(hibernate7): cleanup HibernateSession

Posted by bo...@apache.org.
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 755ba4f98355d298ac67eaaa9ec9783a8d2f1ded
Author: Walter Duque de Estrada <wb...@mac.com>
AuthorDate: Wed Mar 4 16:12:02 2026 -0600

    refactor(hibernate7): cleanup HibernateSession
---
 .../org/grails/orm/hibernate/HibernateSession.java | 86 ++++++++++------------
 1 file changed, 38 insertions(+), 48 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 2c17bb95d4..03e44da550 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
@@ -19,6 +19,7 @@
 package org.grails.orm.hibernate;
 
 import jakarta.persistence.FlushModeType;
+import jakarta.persistence.LockModeType;
 import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.CriteriaQuery;
 import jakarta.persistence.criteria.Root;
@@ -52,6 +53,8 @@ import org.grails.orm.hibernate.query.HibernateHqlQuery;
 import org.grails.orm.hibernate.query.HibernateQuery;
 import org.hibernate.*;
 import org.hibernate.proxy.HibernateProxy;
+import org.hibernate.query.MutationQuery;
+
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
@@ -124,8 +127,7 @@ public class HibernateSession extends AbstractAttributeStoringSession
       org.grails.datastore.mapping.model.PersistentEntity pe =
           ctx.getPersistentEntity(o.getClass().getName());
       if (pe != null) {
-        Object id = ctx.getEntityReflector(pe).getIdentifier(o);
-        return id == null ? null : (Serializable) id;
+          return ctx.getEntityReflector(pe).getIdentifier(o);
       }
     } catch (Exception ignored) {
       // ignore and return null when identifier cannot be obtained
@@ -185,7 +187,7 @@ public class HibernateSession extends AbstractAttributeStoringSession
   }
 
   public <T> T retrieve(Class<T> type, Serializable key) {
-    return hibernateTemplate.get(type, key);
+    return getHibernateTemplate().execute(session -> session.find(type, key));
   }
 
   public <T> T proxy(Class<T> type, Serializable key) {
@@ -193,7 +195,7 @@ public class HibernateSession extends AbstractAttributeStoringSession
   }
 
   public <T> T lock(Class<T> type, Serializable key) {
-    return hibernateTemplate.get(type, key, LockMode.PESSIMISTIC_WRITE);
+    return getHibernateTemplate().execute(session -> session.find(type, key, LockModeType.PESSIMISTIC_WRITE));
   }
 
   public void delete(Iterable objects) {
@@ -201,16 +203,13 @@ public class HibernateSession extends AbstractAttributeStoringSession
     hibernateTemplate.deleteAll(list);
   }
 
-  @SuppressWarnings("unchecked")
-  protected Collection getIterableAsCollection(Iterable objects) {
-    Collection list;
-    if (objects instanceof Collection) {
-      list = (Collection) objects;
-    } else {
-      list = new ArrayList();
-      for (Object object : objects) {
-        list.add(object);
-      }
+  protected Collection<?> getIterableAsCollection(Iterable<?> objects) {
+    if (objects instanceof Collection<?> coll) {
+      return coll;
+    }
+    List<Object> list = new ArrayList<>();
+    for (Object object : objects) {
+      list.add(object);
     }
     return list;
   }
@@ -292,16 +291,7 @@ public class HibernateSession extends AbstractAttributeStoringSession
                   builder.setHibernateCompatible(true);
                   JpaQueryInfo jpaQueryInfo = builder.buildDelete();
 
-                  org.hibernate.query.Query query = session.createQuery(jpaQueryInfo.getQuery());
-                  getHibernateTemplate().applySettings(query);
-
-                  List parameters = jpaQueryInfo.getParameters();
-                  if (parameters != null) {
-                    for (int i = 0, count = parameters.size(); i < count; i++) {
-                      query.setParameter(
-                          JpaQueryBuilder.PARAMETER_NAME_PREFIX + (i + 1), parameters.get(i));
-                    }
-                  }
+                  var query = createMutationQuery(session, jpaQueryInfo);
 
                   HibernateHqlQuery hqlQuery =
                       new HibernateHqlQuery(
@@ -316,6 +306,19 @@ public class HibernateSession extends AbstractAttributeStoringSession
                 });
   }
 
+  private MutationQuery createMutationQuery(Session session, JpaQueryInfo jpaQueryInfo) {
+    org.hibernate.query.MutationQuery query = session.createMutationQuery(jpaQueryInfo.getQuery());
+
+    List<?> parameters = jpaQueryInfo.getParameters();
+    if (parameters != null) {
+      for (int i = 0, count = parameters.size(); i < count; i++) {
+        query.setParameter(
+            JpaQueryBuilder.PARAMETER_NAME_PREFIX + (i + 1), parameters.get(i));
+      }
+    }
+    return query;
+  }
+
   /**
    * Updates all objects matching the given criteria and property values.
    *
@@ -340,22 +343,15 @@ public class HibernateSession extends AbstractAttributeStoringSession
                     if (timestampProvider == null) {
                       timestampProvider = new DefaultTimestampProvider();
                     }
+                    Class<?> type = lastUpdated.getType();
                     properties.put(
                         GormProperties.LAST_UPDATED,
-                        timestampProvider.createTimestamp(lastUpdated.getType()));
+                        timestampProvider.createTimestamp(type));
                   }
 
                   JpaQueryInfo jpaQueryInfo = builder.buildUpdate(properties);
 
-                  org.hibernate.query.Query query = session.createQuery(jpaQueryInfo.getQuery());
-                  getHibernateTemplate().applySettings(query);
-                  List parameters = jpaQueryInfo.getParameters();
-                  if (parameters != null) {
-                    for (int i = 0, count = parameters.size(); i < count; i++) {
-                      query.setParameter(
-                          JpaQueryBuilder.PARAMETER_NAME_PREFIX + (i + 1), parameters.get(i));
-                    }
-                  }
+                  var query = createMutationQuery(session, jpaQueryInfo);
 
                   HibernateHqlQuery hqlQuery =
                       new HibernateHqlQuery(HibernateSession.this, targetEntity, query);
@@ -369,7 +365,7 @@ public class HibernateSession extends AbstractAttributeStoringSession
                 });
   }
 
-  @SuppressWarnings("PMD.DataflowAnomalyAnalysis")
+  @SuppressWarnings({"PMD.DataflowAnomalyAnalysis", "unchecked"})
   public List retrieveAll(final Class type, final Iterable keys) {
     final PersistentEntity persistentEntity =
         getMappingContext().getPersistentEntity(type.getName());
@@ -377,13 +373,13 @@ public class HibernateSession extends AbstractAttributeStoringSession
         .execute(
             session -> {
               final CriteriaBuilder criteriaBuilder = session.getCriteriaBuilder();
-              CriteriaQuery criteriaQuery = criteriaBuilder.createQuery(type);
-              final Root root = criteriaQuery.from(type);
+              CriteriaQuery<?> criteriaQuery = criteriaBuilder.createQuery(type);
+              final Root<?> root = criteriaQuery.from(type);
               final String id = persistentEntity.getIdentity().getName();
               criteriaQuery =
                   criteriaQuery.where(
                       criteriaBuilder.in(root.get(id).in(getIterableAsCollection(keys))));
-              final org.hibernate.query.Query jpaQuery = session.createQuery(criteriaQuery);
+              final org.hibernate.query.Query<?> jpaQuery = session.createQuery(criteriaQuery);
               getHibernateTemplate().applySettings(jpaQuery);
 
               return new HibernateHqlQuery(this, persistentEntity, jpaQuery).list();
@@ -416,16 +412,10 @@ public class HibernateSession extends AbstractAttributeStoringSession
   }
 
   public FlushModeType getFlushMode() {
-    switch (hibernateTemplate.getFlushMode()) {
-      case GrailsHibernateTemplate.FLUSH_AUTO:
-        return FlushModeType.AUTO;
-      case GrailsHibernateTemplate.FLUSH_COMMIT:
-        return FlushModeType.COMMIT;
-      case GrailsHibernateTemplate.FLUSH_ALWAYS:
-        return FlushModeType.AUTO;
-      default:
-        return FlushModeType.AUTO;
-    }
+      if (hibernateTemplate.getFlushMode() == GrailsHibernateTemplate.FLUSH_COMMIT) {
+          return FlushModeType.COMMIT;
+      }
+      return FlushModeType.AUTO;
   }
 }
 


(grails-core) 14/27: refactor(hibernate7): more cleanup HibernateGormStaticApi

Posted by bo...@apache.org.
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 fd162edc7d28eb4d6d2ce0b76949b649b4cbd814
Author: Walter Duque de Estrada <wb...@mac.com>
AuthorDate: Wed Mar 4 15:36:01 2026 -0600

    refactor(hibernate7): more cleanup HibernateGormStaticApi
---
 .../orm/hibernate/HibernateGormStaticApi.groovy    | 26 +++++------
 .../hibernate/HibernateGormStaticApiSpec.groovy    | 51 ++++++++++++++++++++++
 2 files changed, 61 insertions(+), 16 deletions(-)

diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/HibernateGormStaticApi.groovy b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/HibernateGormStaticApi.groovy
index 2ac3406a78..e4b923d5e0 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/HibernateGormStaticApi.groovy
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/HibernateGormStaticApi.groovy
@@ -15,11 +15,11 @@
  */
 package org.grails.orm.hibernate
 
+import org.hibernate.jpa.AvailableHints
+
 import org.grails.datastore.mapping.model.PersistentProperty
-import org.hibernate.query.criteria.JpaRoot
 
 import grails.orm.HibernateCriteriaBuilder
-import groovy.transform.CompileDynamic
 import groovy.transform.CompileStatic
 import groovy.util.logging.Slf4j
 import jakarta.persistence.criteria.Expression
@@ -43,7 +43,6 @@ import org.grails.orm.hibernate.support.HibernateRuntimeUtils
 import org.hibernate.LockMode
 import org.hibernate.Session
 import org.hibernate.SessionFactory
-import org.hibernate.jpa.QueryHints
 import org.hibernate.query.Query
 
 import org.springframework.core.convert.ConversionService
@@ -91,13 +90,13 @@ class HibernateGormStaticApi<D> extends GormStaticApi<D> {
     }
 
     @Override
-    public <T> T withNewSession(Closure<T> callable) {
+     <T> T withNewSession(Closure<T> callable) {
         HibernateDatastore hibernateDatastore = (HibernateDatastore) datastore
         hibernateDatastore.withNewSession(callable)
     }
 
     @Override
-    def <T> T withSession(Closure<T> callable) {
+     <T> T withSession(Closure<T> callable) {
         HibernateDatastore hibernateDatastore = (HibernateDatastore) datastore
         hibernateDatastore.withSession(callable)
     }
@@ -121,7 +120,7 @@ class HibernateGormStaticApi<D> extends GormStaticApi<D> {
         }
         else {
             // for non multi-tenant entities we process get(..) via the second level cache
-            hibernateTemplate.get(persistentEntity.javaClass, id)
+            (D) hibernateTemplate.execute { Session session -> session.find(persistentEntity.javaClass, id) }
         }
     }
 
@@ -145,7 +144,7 @@ class HibernateGormStaticApi<D> extends GormStaticApi<D> {
                     criteriaBuilder.equal((Expression<?>)  queryRoot.get(persistentEntity.identity.name), id)
             )
             Query criteria = session.createQuery(criteriaQuery)
-                    .setHint(QueryHints.HINT_READONLY, true)
+                    .setHint(AvailableHints.HINT_READ_ONLY, true)
             HibernateHqlQuery hibernateHqlQuery = new HibernateHqlQuery(
                     hibernateSession, persistentEntity, criteria)
             return proxyHandler.unwrap( hibernateHqlQuery.singleResult() )
@@ -178,7 +177,7 @@ class HibernateGormStaticApi<D> extends GormStaticApi<D> {
 
     @Override
     List<D> getAll() {
-        new HibernateQuery(hibernateSession, persistentEntity).list()
+        createHibernateQuery().list()
     }
 
     protected HibernateQuery createHibernateQuery() {
@@ -187,12 +186,12 @@ class HibernateGormStaticApi<D> extends GormStaticApi<D> {
 
     @Override
     Integer count() {
-        new HibernateQuery(hibernateSession,persistentEntity ).count().singleResult() as Integer
+        createHibernateQuery().count().singleResult() as Integer
     }
 
     @Override
     boolean exists(Serializable id) {
-        !new HibernateQuery(hibernateSession,persistentEntity ).idEq(convertIdentifier(id)).list().isEmpty()
+        !createHibernateQuery().idEq(convertIdentifier(id)).list().isEmpty()
     }
 
     @Override
@@ -453,7 +452,7 @@ class HibernateGormStaticApi<D> extends GormStaticApi<D> {
                 else if(conversionService.canConvert(idInstanceType, identityType)) {
                     try {
                         return (Serializable)conversionService.convert(id, identityType)
-                    } catch (Throwable e) {
+                    } catch (Throwable ignored) {
                         return null
                     }
                 }
@@ -471,11 +470,6 @@ class HibernateGormStaticApi<D> extends GormStaticApi<D> {
 
 
 
-    private String normalizeMultiLineQueryString(String query) {
-        if (query?.indexOf('\n') != -1)
-           return query?.trim().replace('\n', ' ')
-        return query
-    }
 
     @Override
     List<D> list(Map params = Collections.emptyMap()) {
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/HibernateGormStaticApiSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/HibernateGormStaticApiSpec.groovy
index 5b9eb319d7..d1e5c73653 100644
--- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/HibernateGormStaticApiSpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/HibernateGormStaticApiSpec.groovy
@@ -451,6 +451,57 @@ class HibernateGormStaticApiSpec extends HibernateGormDatastoreSpec {
         instances.find { it.id == e3.id }
     }
 
+    void "Test getAll with empty list returns empty list"() {
+        when:
+        def instances = HibernateGormStaticApiEntity.getAll([])
+
+        then:
+        instances == []
+    }
+
+    void "Test getAll preserves input id order"() {
+        given:
+        def e1 = new HibernateGormStaticApiEntity(name: "first").save(failOnError: true)
+        def e2 = new HibernateGormStaticApiEntity(name: "second").save(failOnError: true)
+        def e3 = new HibernateGormStaticApiEntity(name: "third").save(flush: true, failOnError: true)
+
+        when: "ids are requested in reverse order"
+        def instances = HibernateGormStaticApiEntity.getAll([e3.id, e1.id, e2.id])
+
+        then: "results are in the same order as the requested ids"
+        instances.size() == 3
+        instances[0].id == e3.id
+        instances[1].id == e1.id
+        instances[2].id == e2.id
+    }
+
+    void "Test getAll returns null in position for non-existent ids"() {
+        given:
+        def e1 = new HibernateGormStaticApiEntity(name: "exists").save(flush: true, failOnError: true)
+        def missingId = e1.id + 9999L
+
+        when:
+        def instances = HibernateGormStaticApiEntity.getAll([e1.id, missingId])
+
+        then:
+        instances.size() == 2
+        instances[0].id == e1.id
+        instances[1] == null
+    }
+
+    void "Test getAll with duplicate ids returns entry at each position"() {
+        given:
+        def e1 = new HibernateGormStaticApiEntity(name: "dup").save(flush: true, failOnError: true)
+
+        when:
+        def instances = HibernateGormStaticApiEntity.getAll([e1.id, e1.id])
+
+        then:
+        instances.size() == 2
+        instances[0].id == e1.id
+        instances[1].id == e1.id
+    }
+
     void "Test list method"() {
         given:
         new HibernateGormStaticApiEntity(name: "test1").save(failOnError: true)


(grails-core) 23/27: cleanup(hibernate7): Make sure updateable is not used internally.

Posted by bo...@apache.org.
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 6e6a79c1848ed909e459d9be76c345aea351e063
Author: Walter Duque de Estrada <wb...@mac.com>
AuthorDate: Wed Mar 4 20:25:36 2026 -0600

    cleanup(hibernate7):  Make sure updateable is not used internally.
---
 .../grails/orm/hibernate/cfg/PropertyConfig.groovy | 13 ++++---
 .../hibernate/HibernateMappingBuilder.groovy       |  7 +++-
 .../secondpass/CollectionKeyColumnUpdater.java     |  2 +-
 .../mapping/HibernateMappingBuilderSpec.groovy     |  4 +-
 .../mapping/HibernateMappingBuilderTests.groovy    |  8 ++--
 .../orm/hibernate/cfg/PropertyConfigSpec.groovy    | 14 ++++++-
 grails-doc/src/en/guide/index.adoc                 |  5 +++
 grails-doc/src/en/guide/reference.adoc             |  5 +++
 .../src/en/ref/Database Mapping/insertable.adoc    |  4 +-
 .../{updateable.adoc => updatable.adoc}            | 12 +++---
 .../src/en/ref/Database Mapping/updateable.adoc    | 43 +---------------------
 11 files changed, 52 insertions(+), 65 deletions(-)

diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/PropertyConfig.groovy b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/PropertyConfig.groovy
index 52e3d3dc92..fcd5adc14e 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/PropertyConfig.groovy
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/PropertyConfig.groovy
@@ -94,19 +94,20 @@ class PropertyConfig extends Property {
     /**
      * Whether or not this column is updatable by hibernate
      *
-     * @deprecated Use updatable instead
+     * @deprecated Use {@link #getUpdatable()} instead
      */
-    @Deprecated
+    @Deprecated(since = "7.0", forRemoval = true)
     boolean getUpdateable() {
         return updatable
     }
 
     /**
      * Whether or not this column is updatable by hibernate
-     * @deprecated Use updatable instead
+     *
+     * @deprecated Use {@code updatable} instead
      */
-    @Deprecated
-    void setUpdatable(boolean updateable) {
+    @Deprecated(since = "7.0", forRemoval = true)
+    void setUpdateable(boolean updateable) {
         this.updatable = updateable
     }
 
@@ -453,7 +454,7 @@ class PropertyConfig extends Property {
     }
 
     String toString() {
-        "property[type:$type, lazy:$lazy, columns:$columns, insertable:${insertable}, updateable:${updatable}]"
+        "property[type:$type, lazy:$lazy, columns:$columns, insertable:${insertable}, updatable:${updatable}]"
     }
 
     protected void checkHasSingleColumn() {
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateMappingBuilder.groovy b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateMappingBuilder.groovy
index f037f480a8..f97273b707 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateMappingBuilder.groovy
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateMappingBuilder.groovy
@@ -309,8 +309,11 @@ class HibernateMappingBuilder implements MappingConfigurationBuilder<Mapping, Pr
         if (typeVal != null) property.type = typeVal
         if (namedArgs.lazy instanceof Boolean) property.setLazy((Boolean) namedArgs.lazy)
         if (namedArgs.insertable instanceof Boolean) property.insertable = (Boolean) namedArgs.insertable
-        Object updateableVal = namedArgs.updateable != null ? namedArgs.updateable : namedArgs.updatable
-        if (updateableVal instanceof Boolean) property.updatable = (Boolean) updateableVal
+        if (namedArgs.updatable instanceof Boolean) property.updatable = (Boolean) namedArgs.updatable
+        if (namedArgs.updateable instanceof Boolean) {
+            LOG.warn("'updateable' is deprecated in domain class mapping; use 'updatable' instead")
+            property.updatable = (Boolean) namedArgs.updateable
+        }
         Object cascadeVal = namedArgs.cascade
         if (cascadeVal != null) property.cascade = cascadeVal.toString()
         if (namedArgs.cascadeValidate instanceof Boolean) property.cascadeValidate = (Boolean) namedArgs.cascadeValidate
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionKeyColumnUpdater.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionKeyColumnUpdater.java
index 64fe89ac08..48a1fdd5cb 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionKeyColumnUpdater.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionKeyColumnUpdater.java
@@ -25,7 +25,7 @@ import org.hibernate.mapping.Collection;
 import org.hibernate.mapping.DependantValue;
 import org.hibernate.mapping.PersistentClass;
 
-/** Forces columns to be nullable and checks if the key is updateable. */
+/** Forces columns to be nullable and checks if the key is updatable. */
 public class CollectionKeyColumnUpdater {
 
   private final CollectionKeyBinder collectionKeyBinder;
diff --git a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/hibernate/mapping/HibernateMappingBuilderSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/hibernate/mapping/HibernateMappingBuilderSpec.groovy
index e72f31557a..ffded24547 100644
--- a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/hibernate/mapping/HibernateMappingBuilderSpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/hibernate/mapping/HibernateMappingBuilderSpec.groovy
@@ -197,9 +197,9 @@ class HibernateMappingBuilderSpec extends Specification {
         m.getPropertyConfig('myProp').accessType == AccessType.FIELD
     }
 
-    def "property updateable alias is honoured"() {
+    def "property updatable is honoured"() {
         when:
-        Mapping m = evaluate { myProp updateable: false }
+        Mapping m = evaluate { myProp updatable: false }
 
         then:
         !m.getPropertyConfig('myProp').updatable
diff --git a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/hibernate/mapping/HibernateMappingBuilderTests.groovy b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/hibernate/mapping/HibernateMappingBuilderTests.groovy
index 7ecb0209af..3e6b9129d9 100644
--- a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/hibernate/mapping/HibernateMappingBuilderTests.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/hibernate/mapping/HibernateMappingBuilderTests.groovy
@@ -841,11 +841,11 @@ class HibernateMappingBuilderTests {
     void testUpdatablePropertyConfig() {
         def builder = new HibernateMappingBuilder("Foo")
         def mapping = builder.evaluate {
-            firstName updateable:true
-            lastName updateable:false
+            firstName updatable:true
+            lastName updatable:false
         }
-        assertTrue mapping.getPropertyConfig('firstName').updateable
-        assertFalse mapping.getPropertyConfig('lastName').updateable
+        assertTrue mapping.getPropertyConfig('firstName').updatable
+        assertFalse mapping.getPropertyConfig('lastName').updatable
     }
 
     @Test
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/PropertyConfigSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/PropertyConfigSpec.groovy
index 38687e271f..ea61d362fa 100644
--- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/PropertyConfigSpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/PropertyConfigSpec.groovy
@@ -444,7 +444,7 @@ class PropertyConfigSpec extends Specification {
 
     // ─── deprecated updateable ───────────────────────────────────────────────
 
-    void "setUpdatable and getUpdateable are symmetric"() {
+    void "getUpdateable delegates to updatable"() {
         given:
         PropertyConfig pc = new PropertyConfig()
 
@@ -454,4 +454,16 @@ class PropertyConfigSpec extends Specification {
         then:
         !pc.updateable
     }
+
+    void "setUpdateable delegates to updatable"() {
+        given:
+        PropertyConfig pc = new PropertyConfig()
+
+        when:
+        pc.updateable = false
+
+        then:
+        !pc.updatable
+    }
+
 }
diff --git a/grails-doc/src/en/guide/index.adoc b/grails-doc/src/en/guide/index.adoc
index 0f32264d6b..83e1c00c24 100644
--- a/grails-doc/src/en/guide/index.adoc
+++ b/grails-doc/src/en/guide/index.adoc
@@ -1765,6 +1765,11 @@ include::ref/Database Mapping/type.adoc[]
 
 include::ref/Database Mapping/updateable.adoc[]
 
+[[ref-database-mapping-updatable]]
+==== updatable
+
+include::ref/Database Mapping/updatable.adoc[]
+
 [[ref-database-mapping-version]]
 ==== version
 
diff --git a/grails-doc/src/en/guide/reference.adoc b/grails-doc/src/en/guide/reference.adoc
index 21bf0e1617..42254fc5fa 100644
--- a/grails-doc/src/en/guide/reference.adoc
+++ b/grails-doc/src/en/guide/reference.adoc
@@ -570,6 +570,11 @@ include::ref/Database Mapping/type.adoc[]
 
 include::ref/Database Mapping/updateable.adoc[]
 
+[[ref-database-mapping-updatable]]
+==== updatable
+
+include::ref/Database Mapping/updatable.adoc[]
+
 [[ref-database-mapping-version]]
 ==== version
 
diff --git a/grails-doc/src/en/ref/Database Mapping/insertable.adoc b/grails-doc/src/en/ref/Database Mapping/insertable.adoc
index e06831eb54..d4029d43d2 100644
--- a/grails-doc/src/en/ref/Database Mapping/insertable.adoc	
+++ b/grails-doc/src/en/ref/Database Mapping/insertable.adoc	
@@ -41,7 +41,7 @@ class Book {
 
     static mapping = {
         author insertable: false
-        author updateable: false
+        author updatable: false
     }
 }
 ----
@@ -54,7 +54,7 @@ Usage: `association_name(insertable: boolean)`
 
 Useful in general where you don't want to set an initial value (or include the column in the generated SQL) during an initial `save()`.
 
-In particular this is useful for one-to-many relationships. For example when you store the foreign key in the 'child' table, it's often efficient to save the child using only the foreign key of the parent. You do this by setting the parent object (and the parent foreign key) in the 'child' entity. Setting the attributes insertable:false and updateable:false for the 'belongsTo' parent object lets you insert and update using only the foreign key.
+In particular this is useful for one-to-many relationships. For example when you store the foreign key in the 'child' table, it's often efficient to save the child using only the foreign key of the parent. You do this by setting the parent object (and the parent foreign key) in the 'child' entity. Setting the attributes `insertable: false` and `updatable: false` for the `belongsTo` parent object lets you insert and update using only the foreign key.
 
 [source,groovy]
 ----
diff --git a/grails-doc/src/en/ref/Database Mapping/updateable.adoc b/grails-doc/src/en/ref/Database Mapping/updatable.adoc
similarity index 77%
copy from grails-doc/src/en/ref/Database Mapping/updateable.adoc
copy to grails-doc/src/en/ref/Database Mapping/updatable.adoc
index 5e2a8aefed..e50ad9d731 100644
--- a/grails-doc/src/en/ref/Database Mapping/updateable.adoc	
+++ b/grails-doc/src/en/ref/Database Mapping/updatable.adoc	
@@ -18,7 +18,7 @@ under the License.
 ////
 
 
-== updateable
+== updatable
 
 
 
@@ -41,7 +41,7 @@ class Book {
 
     static mapping = {
         author insertable: false
-        author updateable: false
+        author updatable: false
     }
 }
 ----
@@ -50,15 +50,17 @@ class Book {
 === Description
 
 
-Usage: `association_name(updateable: boolean)`
+Usage: `association_name(updatable: boolean)`
 
 Useful in general where you don't want to update a value (or include the column in the generated SQL) during a `save()`.
 
-In particular this is useful for one-to-many relationships. For example when you store the foreign key in the 'child' table, it's often efficient to save the child using only the foreign key of the parent. You do this by setting the parent object (and the parent foreign key) in the 'child' entity. Setting the attributes insertable:false and updateable:false for the 'belongsTo' parent object lets you insert and update using only the foreign key.
+In particular this is useful for one-to-many relationships. For example when you store the foreign key in the 'child' table, it's often efficient to save the child using only the foreign key of the parent. You do this by setting the parent object (and the parent foreign key) in the 'child' entity. Setting the attributes `insertable: false` and `updatable: false` for the `belongsTo` parent object lets you insert and update using only the foreign key.
 
 [source,groovy]
 ----
 static mapping = {
-    author updateable: false
+    author updatable: false
 }
 ----
+
+NOTE: The key `updateable` (with an extra 'e') is a deprecated alias for `updatable` and will be removed in a future release. A deprecation warning is logged at startup when the old key is used.
diff --git a/grails-doc/src/en/ref/Database Mapping/updateable.adoc b/grails-doc/src/en/ref/Database Mapping/updateable.adoc
index 5e2a8aefed..1764a66ebd 100644
--- a/grails-doc/src/en/ref/Database Mapping/updateable.adoc	
+++ b/grails-doc/src/en/ref/Database Mapping/updateable.adoc	
@@ -20,45 +20,4 @@ under the License.
 
 == updateable
 
-
-
-=== Purpose
-
-
-Determines whether a property's database column is updated when persistent instances are updated.
-
-
-=== Examples
-
-
-[source,groovy]
-----
-class Book {
-
-    String title
-
-    static belongsTo = [author: Author]
-
-    static mapping = {
-        author insertable: false
-        author updateable: false
-    }
-}
-----
-
-
-=== Description
-
-
-Usage: `association_name(updateable: boolean)`
-
-Useful in general where you don't want to update a value (or include the column in the generated SQL) during a `save()`.
-
-In particular this is useful for one-to-many relationships. For example when you store the foreign key in the 'child' table, it's often efficient to save the child using only the foreign key of the parent. You do this by setting the parent object (and the parent foreign key) in the 'child' entity. Setting the attributes insertable:false and updateable:false for the 'belongsTo' parent object lets you insert and update using only the foreign key.
-
-[source,groovy]
-----
-static mapping = {
-    author updateable: false
-}
-----
+DEPRECATED: Use <<ref-database-mapping-updatable,updatable>> instead. The `updateable:` mapping key is a deprecated alias for `updatable:` and will be removed in a future release.


(grails-core) 21/27: cleanup(hibernate7): General cleanup

Posted by bo...@apache.org.
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 836afaa79975c32a65fd0d3c7768e0c60ac4861c
Author: Walter Duque de Estrada <wb...@mac.com>
AuthorDate: Wed Mar 4 19:21:11 2026 -0600

    cleanup(hibernate7):  General cleanup
---
 .../hibernate/cfg/domainbinding/binder/SubClassBinder.java    |  2 +-
 .../cfg/domainbinding/binder/SubclassMappingBinder.java       |  5 ++---
 .../cfg/domainbinding/generator/GrailsIdentityGenerator.java  |  2 ++
 .../cfg/domainbinding/generator/GrailsIncrementGenerator.java |  5 +++--
 .../cfg/domainbinding/generator/GrailsNativeGenerator.java    |  5 ++++-
 .../domainbinding/generator/GrailsSequenceStyleGenerator.java |  2 ++
 .../cfg/domainbinding/generator/GrailsTableGenerator.java     |  2 ++
 .../hibernate/GrailsHibernatePersistentEntity.java            |  2 +-
 .../hibernate/HibernateEmbeddedClassMapping.java              |  2 +-
 .../hibernate/HibernateEmbeddedPersistentEntity.java          |  2 +-
 .../cfg/domainbinding/binder/SubClassBinderSpec.groovy        | 11 ++++-------
 .../cfg/domainbinding/binder/SubclassMappingBinderSpec.groovy |  6 +++---
 12 files changed, 26 insertions(+), 20 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 bddd67c6f2..45100d436c 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
@@ -61,7 +61,7 @@ public class SubClassBinder {
       @Nonnull GrailsHibernatePersistentEntity sub,
       PersistentClass parent) {
     mappingCacheHolder.cacheMapping(sub);
-    Subclass subClass = subclassMappingBinder.createSubclassMapping(sub, parent, mappings);
+    Subclass subClass = subclassMappingBinder.createSubclassMapping(sub, parent);
     parent.addSubclass(subClass);
     mappings.addEntityBinding(subClass);
     bindMultiTenantFilter(sub, subClass);
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 0a2198460a..dd9bc1bbcf 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
@@ -23,7 +23,7 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 import org.grails.orm.hibernate.cfg.GrailsHibernateUtil;
 import org.grails.orm.hibernate.cfg.Mapping;
 import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentEntity;
-import org.hibernate.boot.spi.InFlightMetadataCollector;
+
 import org.hibernate.boot.spi.MetadataBuildingContext;
 import org.hibernate.mapping.JoinedSubclass;
 import org.hibernate.mapping.PersistentClass;
@@ -54,8 +54,7 @@ public class SubclassMappingBinder {
 
   public @NonNull Subclass createSubclassMapping(
       @NonNull GrailsHibernatePersistentEntity subEntity,
-      PersistentClass parent,
-      @NonNull InFlightMetadataCollector mappings) {
+      PersistentClass parent) {
     Subclass subClass;
     subEntity.configureDerivedProperties();
     Mapping m = subEntity.getMappedForm();
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/generator/GrailsIdentityGenerator.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/generator/GrailsIdentityGenerator.java
index c1ffead0a4..6010be2001 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/generator/GrailsIdentityGenerator.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/generator/GrailsIdentityGenerator.java
@@ -18,6 +18,7 @@
  */
 package org.grails.orm.hibernate.cfg.domainbinding.generator;
 
+import java.io.Serial;
 import java.util.Optional;
 import java.util.Properties;
 import org.grails.orm.hibernate.cfg.Identity;
@@ -26,6 +27,7 @@ import org.hibernate.id.IdentityGenerator;
 
 public class GrailsIdentityGenerator extends IdentityGenerator {
 
+  @Serial
   private static final long serialVersionUID = 1L;
 
   public GrailsIdentityGenerator(GeneratorCreationContext context, Identity mappedId) {
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/generator/GrailsIncrementGenerator.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/generator/GrailsIncrementGenerator.java
index 8cdd3521da..ba23d17280 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/generator/GrailsIncrementGenerator.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/generator/GrailsIncrementGenerator.java
@@ -18,11 +18,11 @@
  */
 package org.grails.orm.hibernate.cfg.domainbinding.generator;
 
-import static org.hibernate.id.IncrementGenerator.COLUMN;
-import static org.hibernate.id.IncrementGenerator.TABLES;
+
 import static org.hibernate.id.PersistentIdentifierGenerator.CATALOG;
 import static org.hibernate.id.PersistentIdentifierGenerator.SCHEMA;
 
+import java.io.Serial;
 import java.util.Properties;
 import org.grails.orm.hibernate.cfg.Identity;
 import org.grails.orm.hibernate.cfg.PersistentEntityNamingStrategy;
@@ -39,6 +39,7 @@ import org.hibernate.id.IncrementGenerator;
  */
 public class GrailsIncrementGenerator extends IncrementGenerator {
 
+  @Serial
   private static final long serialVersionUID = 1L;
 
   public GrailsIncrementGenerator(
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/generator/GrailsNativeGenerator.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/generator/GrailsNativeGenerator.java
index 4535b4fe50..6f348cb2ca 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/generator/GrailsNativeGenerator.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/generator/GrailsNativeGenerator.java
@@ -18,6 +18,8 @@
  */
 package org.grails.orm.hibernate.cfg.domainbinding.generator;
 
+import java.io.Serial;
+
 import jakarta.persistence.GenerationType;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.generator.EventType;
@@ -26,6 +28,7 @@ import org.hibernate.id.NativeGenerator;
 
 public class GrailsNativeGenerator extends NativeGenerator {
 
+  @Serial
   private static final long serialVersionUID = 1L;
 
   public GrailsNativeGenerator(GeneratorCreationContext context) {
@@ -57,6 +60,6 @@ public class GrailsNativeGenerator extends NativeGenerator {
     }
 
     // 3. For Sequences/UUIDs, delegate to the standard logic
-    return super.generate(session, entity, currentValue, eventType);
+    return super.generate(session, entity, null, eventType);
   }
 }
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/generator/GrailsSequenceStyleGenerator.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/generator/GrailsSequenceStyleGenerator.java
index 88c3456787..ab11ed193a 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/generator/GrailsSequenceStyleGenerator.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/generator/GrailsSequenceStyleGenerator.java
@@ -18,6 +18,7 @@
  */
 package org.grails.orm.hibernate.cfg.domainbinding.generator;
 
+import java.io.Serial;
 import java.util.Optional;
 import java.util.Properties;
 import org.grails.orm.hibernate.cfg.Identity;
@@ -30,6 +31,7 @@ import org.hibernate.id.enhanced.SequenceStyleGenerator;
 @SuppressWarnings("PMD.ConstructorCallsOverridableMethod")
 public class GrailsSequenceStyleGenerator extends SequenceStyleGenerator {
 
+  @Serial
   private static final long serialVersionUID = 1L;
 
   public GrailsSequenceStyleGenerator(
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/generator/GrailsTableGenerator.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/generator/GrailsTableGenerator.java
index 53590da030..9bd7e08f1a 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/generator/GrailsTableGenerator.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/generator/GrailsTableGenerator.java
@@ -18,6 +18,7 @@
  */
 package org.grails.orm.hibernate.cfg.domainbinding.generator;
 
+import java.io.Serial;
 import java.util.Optional;
 import java.util.Properties;
 import org.grails.orm.hibernate.cfg.Identity;
@@ -29,6 +30,7 @@ import org.hibernate.id.enhanced.TableGenerator;
 
 public class GrailsTableGenerator extends TableGenerator {
 
+  @Serial
   private static final long serialVersionUID = 1L;
 
   public GrailsTableGenerator(
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 c6369eb3b0..dce9ea001b 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
@@ -211,7 +211,7 @@ public interface GrailsHibernatePersistentEntity extends PersistentEntity {
         .toList();
   }
 
-  default boolean isComponentPropertyNullable(PersistentProperty embeddedProperty) {
+  default boolean isComponentPropertyNullable(PersistentProperty<?> embeddedProperty) {
     if (embeddedProperty == null) return false;
     final Mapping mapping = getMappedForm();
     return !isRoot() && (mapping == null || mapping.isTablePerHierarchy())
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateEmbeddedClassMapping.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateEmbeddedClassMapping.java
index de62307bdd..4333189dae 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateEmbeddedClassMapping.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateEmbeddedClassMapping.java
@@ -35,7 +35,7 @@ public class HibernateEmbeddedClassMapping extends HibernateClassMapping {
   }
 
   @Override
-  public IdentityMapping getIdentifier() {
+  public IdentityMapping<?> getIdentifier() {
     return null;
   }
 }
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateEmbeddedPersistentEntity.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateEmbeddedPersistentEntity.java
index 889315359f..9d4f262a06 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateEmbeddedPersistentEntity.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateEmbeddedPersistentEntity.java
@@ -71,7 +71,7 @@ public class HibernateEmbeddedPersistentEntity extends EmbeddedPersistentEntity<
     return false;
   }
 
-  public HibernateEmbeddedPersistentEntity(Class type, MappingContext ctx) {
+  public HibernateEmbeddedPersistentEntity(Class<?> type, MappingContext ctx) {
     super(type, ctx);
     this.classMapping = new HibernateEmbeddedClassMapping(this, ctx);
   }
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/SubClassBinderSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/SubClassBinderSpec.groovy
index 0583b54d19..becc03ce0b 100644
--- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/SubClassBinderSpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/SubClassBinderSpec.groovy
@@ -1,16 +1,13 @@
 package org.grails.orm.hibernate.cfg.domainbinding.binder
 
-import grails.gorm.annotation.Entity
+
 import grails.gorm.specs.HibernateGormDatastoreSpec
 import org.grails.orm.hibernate.cfg.Mapping
 import org.grails.orm.hibernate.cfg.MappingCacheHolder
 import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentEntity
 import org.grails.orm.hibernate.cfg.domainbinding.util.MultiTenantFilterBinder
 import org.hibernate.boot.spi.MetadataBuildingContext
-import org.hibernate.mapping.PersistentClass
 import org.hibernate.mapping.RootClass
-import org.hibernate.mapping.Subclass
-import spock.lang.Shared
 
 class SubClassBinderSpec extends HibernateGormDatastoreSpec {
 
@@ -57,7 +54,7 @@ class SubClassBinderSpec extends HibernateGormDatastoreSpec {
         binder.bindSubClass(subEntity, rootClass)
 
         then:
-        1 * subclassMappingBinder.createSubclassMapping(subEntity, rootClass, _) >> subClass
+        1 * subclassMappingBinder.createSubclassMapping(subEntity, rootClass) >> subClass
         1 * multiTenantFilterBinder.bind(subEntity, subClass)
         rootClass.getSubclasses().contains(subClass)
         mappings.getEntityBinding(subClass.getEntityName()) == subClass
@@ -89,8 +86,8 @@ class SubClassBinderSpec extends HibernateGormDatastoreSpec {
         binder.bindSubClass(subEntity, rootClass)
 
         then:
-        1 * subclassMappingBinder.createSubclassMapping(subEntity, rootClass, _) >> subClass
-        1 * subclassMappingBinder.createSubclassMapping(grandChildEntity, subClass, _) >> grandChildSubClass
+        1 * subclassMappingBinder.createSubclassMapping(subEntity, rootClass) >> subClass
+        1 * subclassMappingBinder.createSubclassMapping(grandChildEntity, subClass) >> grandChildSubClass
         2 * multiTenantFilterBinder.bind(_, _)
         rootClass.getSubclasses().contains(subClass)
         subClass.getSubclasses().contains(grandChildSubClass)
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 fa93644daf..cd13ca27e6 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
@@ -46,7 +46,7 @@ class SubclassMappingBinderSpec extends HibernateGormDatastoreSpec {
         def mappings = getCollector()
 
         when:
-        Subclass subClass = binder.createSubclassMapping(subEntity, rootClass, mappings)
+        Subclass subClass = binder.createSubclassMapping(subEntity, rootClass)
 
         then:
         subEntity != null
@@ -66,7 +66,7 @@ class SubclassMappingBinderSpec extends HibernateGormDatastoreSpec {
         def mappings = getCollector()
 
         when:
-        Subclass subClass = binder.createSubclassMapping(subEntity, rootClass, mappings)
+        Subclass subClass = binder.createSubclassMapping(subEntity, rootClass)
 
         then:
         subEntity != null
@@ -86,7 +86,7 @@ class SubclassMappingBinderSpec extends HibernateGormDatastoreSpec {
         def mappings = getCollector()
 
         when:
-        Subclass subClass = binder.createSubclassMapping(subEntity, rootClass, mappings)
+        Subclass subClass = binder.createSubclassMapping(subEntity, rootClass)
 
         then:
         subEntity != null


(grails-core) 16/27: refactor(hibernate7): cleanup HibernateProxyHandler

Posted by bo...@apache.org.
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 5daf86f074e69a67196785e6c58aab01e5d1ca63
Author: Walter Duque de Estrada <wb...@mac.com>
AuthorDate: Wed Mar 4 16:34:47 2026 -0600

    refactor(hibernate7): cleanup HibernateProxyHandler
---
 .../dirty/GrailsEntityDirtinessStrategy.groovy     | 69 +++++++---------------
 .../multitenancy/MultiTenantEventListener.java     | 16 +++--
 .../orm/hibernate/proxy/HibernateProxyHandler.java |  8 +--
 3 files changed, 31 insertions(+), 62 deletions(-)

diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/dirty/GrailsEntityDirtinessStrategy.groovy b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/dirty/GrailsEntityDirtinessStrategy.groovy
index 6d13d2289b..d6684f9a6a 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/dirty/GrailsEntityDirtinessStrategy.groovy
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/dirty/GrailsEntityDirtinessStrategy.groovy
@@ -88,56 +88,27 @@ class GrailsEntityDirtinessStrategy implements CustomEntityDirtinessStrategy {
     }
 
     @Override
-    void findDirty(Object entity, EntityPersister persister, Session session, CustomEntityDirtinessStrategy.DirtyCheckContext dirtyCheckContext) {
+    void findDirty(Object entity, EntityPersister persister, Session session, DirtyCheckContext dirtyCheckContext) {
+        if (!(entity instanceof DirtyCheckable)) return
         Status status = getStatus(session, entity)
-        if(entity instanceof DirtyCheckable) {
-            dirtyCheckContext.doDirtyChecking(
-                    new CustomEntityDirtinessStrategy.AttributeChecker() {
-                        @Override
-                        boolean isDirty(CustomEntityDirtinessStrategy.AttributeInformation attributeInformation) {
-                            String propertyName = attributeInformation.name
-                            if(status != null) {
-                                if(status == Status.MANAGED) {
-                                    // perform dirty check
-                                    DirtyCheckable dirtyCheckable = cast(entity)
-                                    if(GormProperties.LAST_UPDATED == propertyName) {
-                                        return dirtyCheckable.hasChanged()
-                                    }
-                                    else {
-                                        if(dirtyCheckable.hasChanged(propertyName)) {
-                                            return true
-                                        }
-                                        else {
-                                            PersistentEntity gormEntity = GormEnhancer.findEntity(Hibernate.getClass(entity))
-                                            PersistentProperty prop = gormEntity.getPropertyByName(attributeInformation.name)
-                                            if(prop instanceof Embedded) {
-                                                def val = prop.reader.read(entity)
-                                                if( val instanceof DirtyCheckable ) {
-                                                    return ((DirtyCheckable)val).hasChanged()
-                                                }
-                                                else {
-                                                    return false
-                                                }
-                                            }
-                                            else {
-                                                return false
-                                            }
-                                        }
-                                    }
-                                }
-                                else {
-                                    // either deleted or in a state that cannot be regarded as dirty
-                                    return false
-                                }
-                            }
-                            else {
-                                // a new object not within the session
-                                return true
-                            }
-                        }
-                    }
-            )
-        }
+        DirtyCheckable dirtyCheckable = cast(entity)
+        dirtyCheckContext.doDirtyChecking({ AttributeInformation info ->
+            // new object not yet in session — always dirty
+            if (status == null) return true
+            // deleted/gone/loading — not dirty
+            if (status != Status.MANAGED) return false
+            // lastUpdated is refreshed whenever anything changes
+            if (GormProperties.LAST_UPDATED == info.name) return dirtyCheckable.hasChanged()
+            // property-level check
+            if (dirtyCheckable.hasChanged(info.name)) return true
+            // embedded component — delegate to the embedded object's dirty tracking
+            PersistentProperty prop = GormEnhancer.findEntity(Hibernate.getClass(entity))?.getPropertyByName(info.name)
+            if (prop instanceof Embedded) {
+                def val = prop.reader.read(entity)
+                return val instanceof DirtyCheckable && val.hasChanged()
+            }
+            return false
+        } as AttributeChecker)
     }
 
     Status getStatus(Session session, Object entity) {
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/multitenancy/MultiTenantEventListener.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/multitenancy/MultiTenantEventListener.java
index 145fd11797..110eff7988 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/multitenancy/MultiTenantEventListener.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/multitenancy/MultiTenantEventListener.java
@@ -20,13 +20,15 @@ package org.grails.orm.hibernate.multitenancy;
 
 import grails.gorm.multitenancy.Tenants;
 import java.io.Serializable;
+
+import jakarta.annotation.Nullable;
+
 import org.grails.datastore.gorm.GormEnhancer;
 import org.grails.datastore.mapping.core.Datastore;
 import org.grails.datastore.mapping.core.connections.ConnectionSource;
 import org.grails.datastore.mapping.engine.event.*;
 import org.grails.datastore.mapping.model.PersistentEntity;
 import org.grails.datastore.mapping.model.types.TenantId;
-import org.grails.datastore.mapping.multitenancy.MultiTenantCapableDatastore;
 import org.grails.datastore.mapping.multitenancy.exceptions.TenantException;
 import org.grails.datastore.mapping.query.Query;
 import org.grails.datastore.mapping.query.event.PreQueryEvent;
@@ -43,7 +45,7 @@ import org.springframework.context.ApplicationEvent;
  */
 public class MultiTenantEventListener implements PersistenceEventListener {
   @Override
-  public boolean supportsEventType(Class<? extends ApplicationEvent> eventType) {
+  public boolean supportsEventType(@Nullable  Class<? extends ApplicationEvent> eventType) {
     return org.grails.datastore.gorm.multitenancy.MultiTenantEventListener.SUPPORTED_EVENTS
         .contains(eventType);
   }
@@ -75,18 +77,14 @@ public class MultiTenantEventListener implements PersistenceEventListener {
               || persistenceEvent instanceof PreUpdateEvent)) {
         PersistentEntity entity = persistenceEvent.getEntity();
         if (entity.isMultiTenant()) {
-          TenantId tenantId = entity.getTenantId();
+          TenantId<?> tenantId = entity.getTenantId();
           Datastore ds =
               (datastore != null) ? datastore : GormEnhancer.findDatastore(entity.getJavaClass());
           if (ds instanceof HibernateDatastore hibernateDatastore) {
             Serializable currentId;
 
-            if (hibernateDatastore instanceof MultiTenantCapableDatastore) {
-              currentId = Tenants.currentId((MultiTenantCapableDatastore) hibernateDatastore);
-            } else {
-              currentId = Tenants.currentId(hibernateDatastore.getClass());
-            }
-            if (currentId != null) {
+              currentId = Tenants.currentId(hibernateDatastore);
+              if (currentId != null) {
               try {
                 if (ConnectionSource.DEFAULT.equals(currentId)) {
                   currentId =
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/proxy/HibernateProxyHandler.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/proxy/HibernateProxyHandler.java
index bf2ec37050..10cf05ccb6 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/proxy/HibernateProxyHandler.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/proxy/HibernateProxyHandler.java
@@ -52,7 +52,7 @@ public class HibernateProxyHandler implements ProxyHandler, ProxyFactory {
     if (o instanceof HibernateProxy hp) {
       return !hp.getHibernateLazyInitializer().isUninitialized();
     }
-    if (o instanceof EntityProxy ep) {
+    if (o instanceof EntityProxy<?> ep) {
       return ep.isInitialized();
     }
     if (o instanceof LazyInitializable li) {
@@ -74,7 +74,7 @@ public class HibernateProxyHandler implements ProxyHandler, ProxyFactory {
 
   @Override
   public Object unwrap(Object object) {
-    if (object instanceof EntityProxy ep) {
+    if (object instanceof EntityProxy<?> ep) {
       return ep.getTarget();
     }
 
@@ -93,7 +93,7 @@ public class HibernateProxyHandler implements ProxyHandler, ProxyFactory {
 
   @Override
   public Serializable getIdentifier(Object o) {
-    if (o instanceof EntityProxy ep) {
+    if (o instanceof EntityProxy<?> ep) {
       return ep.getProxyKey();
     }
 
@@ -124,7 +124,7 @@ public class HibernateProxyHandler implements ProxyHandler, ProxyFactory {
 
   @Override
   public void initialize(Object o) {
-    if (o instanceof EntityProxy ep) {
+    if (o instanceof EntityProxy<?> ep) {
       ep.initialize();
       return;
     }


(grails-core) 22/27: cleanup(hibernate7): Fix Generics

Posted by bo...@apache.org.
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 ef73dd20f9a623c0612f34ea5ebae6857eab03a2
Author: Walter Duque de Estrada <wb...@mac.com>
AuthorDate: Wed Mar 4 20:12:05 2026 -0600

    cleanup(hibernate7):  Fix Generics
---
 .../domainbinding/hibernate/HibernateEmbeddedPersistentEntity.java  | 2 +-
 .../cfg/domainbinding/hibernate/HibernateIdentityMapping.java       | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateEmbeddedPersistentEntity.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateEmbeddedPersistentEntity.java
index 9d4f262a06..24f472f33f 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateEmbeddedPersistentEntity.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateEmbeddedPersistentEntity.java
@@ -77,7 +77,7 @@ public class HibernateEmbeddedPersistentEntity extends EmbeddedPersistentEntity<
   }
 
   @Override
-  public ClassMapping getMapping() {
+  public ClassMapping<Mapping> getMapping() {
     return classMapping;
   }
 }
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateIdentityMapping.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateIdentityMapping.java
index c755e5c6f2..19f1f9eb64 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateIdentityMapping.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateIdentityMapping.java
@@ -35,7 +35,7 @@ public class HibernateIdentityMapping implements IdentityMapping<Property> {
 
   private final Object identity;
   private final ValueGenerator generator;
-  private final ClassMapping classMapping;
+  private final ClassMapping<?> classMapping;
 
   /**
    * Constructs a HibernateIdentityMapping.
@@ -45,7 +45,7 @@ public class HibernateIdentityMapping implements IdentityMapping<Property> {
    * @param classMapping the owning {@link ClassMapping}
    */
   public HibernateIdentityMapping(
-      Object identity, ValueGenerator generator, ClassMapping classMapping) {
+      Object identity, ValueGenerator generator, ClassMapping<?> classMapping) {
     this.identity = identity;
     this.generator = generator;
     this.classMapping = classMapping;
@@ -72,7 +72,7 @@ public class HibernateIdentityMapping implements IdentityMapping<Property> {
   }
 
   @Override
-  public ClassMapping getClassMapping() {
+  public ClassMapping<?> getClassMapping() {
     return classMapping;
   }
 


(grails-core) 19/27: cleanup(hibernate7): Remove unused InFlightMetadataCollector from ComponentBinder, simplify ComponentUpdater.updateComponen

Posted by bo...@apache.org.
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 6588810b5ee427e4281a696685c4165f7f9ff653
Author: Walter Duque de Estrada <wb...@mac.com>
AuthorDate: Wed Mar 4 18:48:54 2026 -0600

    cleanup(hibernate7):  Remove unused InFlightMetadataCollector from ComponentBinder, simplify ComponentUpdater.updateComponen
---
 .../binder/ClassPropertiesBinder.java              | 16 ++++-
 .../cfg/domainbinding/binder/ComponentBinder.java  | 10 ++--
 .../cfg/domainbinding/binder/ComponentUpdater.java | 12 ++--
 .../cfg/domainbinding/binder/EnumTypeBinder.java   |  6 +-
 .../domainbinding/binder/GrailsDomainBinder.java   |  2 +-
 .../domainbinding/binder/GrailsPropertyBinder.java |  4 +-
 .../hibernate/GrailsHibernatePersistentEntity.java |  7 ++-
 .../cfg/domainbinding/CollectionBinderSpec.groovy  |  3 +-
 .../cfg/domainbinding/ComponentBinderSpec.groovy   |  3 +-
 .../domainbinding/GrailsPropertyBinderSpec.groovy  |  3 +-
 .../binder/ComponentUpdaterSpec.groovy             | 70 +++++++++++++---------
 .../secondpass/ListSecondPassBinderSpec.groovy     |  3 +-
 .../secondpass/MapSecondPassBinderSpec.groovy      |  3 +-
 13 files changed, 85 insertions(+), 57 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 68dc35b9f0..a25a6eb841 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,6 +22,8 @@ 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.MappingException;
 import org.hibernate.mapping.PersistentClass;
 import org.hibernate.mapping.Table;
 import org.hibernate.mapping.Value;
@@ -59,9 +61,9 @@ public class ClassPropertiesBinder {
   public void bindClassProperties(
       @Nonnull GrailsHibernatePersistentEntity domainClass,
       PersistentClass persistentClass) {
+    @Nonnull Table table = getTable(persistentClass);
+    table.setComment(domainClass.getComment());
 
-    persistentClass.getTable().setComment(domainClass.getMappedForm().getComment());
-    Table table = persistentClass.getTable();
 
     for (HibernatePersistentProperty currentGrailsProp :
         domainClass.getPersistentPropertiesToBind()) {
@@ -78,4 +80,14 @@ public class ClassPropertiesBinder {
 
     naturalIdentifierBinder.bindNaturalIdentifier(domainClass.getMappedForm(), persistentClass);
   }
+
+  @Nonnull private Table getTable(PersistentClass persistentClass) {
+    if(persistentClass.getTable() == null) {
+      throw new MappingException(
+          "Persistent class ["
+              + persistentClass.getEntityName()
+              + "] does not have a table associated with it");
+    }
+    return persistentClass.getTable();
+  }
 }
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 8765653017..a10705ab91 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,12 +18,13 @@
  */
 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;
 import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateEmbeddedProperty;
 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.PersistentClass;
@@ -35,18 +36,15 @@ 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,
-      InFlightMetadataCollector metadataCollector) {
+      ComponentUpdater componentUpdater) {
     this.metadataBuildingContext = metadataBuildingContext;
     this.mappingCacheHolder = mappingCacheHolder;
     this.componentUpdater = componentUpdater;
-    this.metadataCollector = metadataCollector;
   }
 
   public void setGrailsPropertyBinder(GrailsPropertyBinder grailsPropertyBinder) {
@@ -55,7 +53,7 @@ public class ComponentBinder {
 
   public Component bindComponent(
       PersistentClass owner,
-      HibernateEmbeddedProperty embeddedProperty,
+      @Nonnull HibernateEmbeddedProperty embeddedProperty,
       String path) {
     Component component = new Component(metadataBuildingContext, owner);
     Class<?> type = embeddedProperty.getType();
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ComponentUpdater.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ComponentUpdater.java
index 66bbb44fc9..996f8640a3 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ComponentUpdater.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ComponentUpdater.java
@@ -42,14 +42,10 @@ public class ComponentUpdater {
       Value value) {
     Property persistentProperty = propertyFromValueCreator.createProperty(value, currentGrailsProp);
     component.addProperty(persistentProperty);
-    if (componentProperty != null
-        && componentProperty.getOwner() instanceof GrailsHibernatePersistentEntity ghpe
-        && ghpe.isComponentPropertyNullable(componentProperty)) {
-      final Iterator<?> columnIterator = value.getColumns().iterator();
-      while (columnIterator.hasNext()) {
-        Column c = (Column) columnIterator.next();
-        c.setNullable(true);
-      }
+    if (componentProperty != null && componentProperty.getHibernateOwner().isComponentPropertyNullable(componentProperty)) {
+        for (Column c : value.getColumns()) {
+            c.setNullable(true);
+        }
     }
   }
 }
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/EnumTypeBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/EnumTypeBinder.java
index 8c9eb0efb3..6604be594e 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/EnumTypeBinder.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/EnumTypeBinder.java
@@ -20,6 +20,7 @@ package org.grails.orm.hibernate.cfg.domainbinding.binder;
 
 import static org.grails.orm.hibernate.cfg.domainbinding.binder.GrailsDomainBinder.ENUM_CLASS_PROP;
 
+import jakarta.annotation.Nonnull;
 import jakarta.persistence.EnumType;
 import java.util.Properties;
 import org.grails.orm.hibernate.cfg.ColumnConfig;
@@ -66,7 +67,10 @@ public class EnumTypeBinder {
   private static final Logger LOG = LoggerFactory.getLogger(EnumTypeBinder.class);
 
   public BasicValue bindEnumType(
-      HibernatePersistentProperty property, Class<?> propertyType, Table table, String path) {
+          @Nonnull HibernatePersistentProperty property
+          , Class<?> propertyType
+          , Table table
+          , String path) {
     BasicValue simpleValue = new BasicValue(metadataBuildingContext, table);
     String columnName =
         columnNameForPropertyAndPathFetcher.getColumnNameForPropertyAndPath(property, path, null);
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 048022b202..2e00e23af4 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
@@ -159,7 +159,7 @@ public class GrailsDomainBinder implements AdditionalMappingContributor, TypeCon
             metadataCollector);
     ComponentUpdater componentUpdater = new ComponentUpdater(propertyFromValueCreator);
     ComponentBinder componentBinder =
-        new ComponentBinder(metadataBuildingContext, getMappingCacheHolder(), componentUpdater, metadataCollector);
+        new ComponentBinder(metadataBuildingContext, getMappingCacheHolder(), componentUpdater);
 
     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 75ed9937ce..19f1ea72af 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
@@ -19,6 +19,8 @@
 package org.grails.orm.hibernate.cfg.domainbinding.binder;
 
 import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
+
 import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateEmbeddedProperty;
 import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateEnumProperty;
 import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateManyToOneProperty;
@@ -62,7 +64,7 @@ public class GrailsPropertyBinder {
   }
 
   public Value bindProperty(
-      PersistentClass persistentClass,
+      @Nullable PersistentClass persistentClass,
       Table table,
       String path,
       HibernatePersistentProperty parentProperty,
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 0337ab1acb..c6369eb3b0 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
@@ -306,5 +306,10 @@ public interface GrailsHibernatePersistentEntity extends PersistentEntity {
         });
     return properties;
   }
-  ;
+
+  default String getComment() {
+    return Optional.ofNullable(getMappedForm())
+        .map(Mapping::getComment)
+        .orElse(null);
+  }
 }
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 945bf05dd5..65d5e1bab6 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
@@ -93,8 +93,7 @@ class CollectionBinderSpec extends HibernateGormDatastoreSpec {
         ComponentBinder componentBinder = new ComponentBinder(
                 metadataBuildingContext,
                 binder.getMappingCacheHolder(),
-                componentUpdater,
-                collector
+                componentUpdater
         )
 
         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 352c4bb694..13f24d125f 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,8 +79,7 @@ class ComponentBinderSpec extends HibernateGormDatastoreSpec {
         binder = new ComponentBinder(
                 metadataBuildingContext,
                 mappingCacheHolder,
-                componentUpdater,
-                metadataBuildingContext.getMetadataCollector()
+                componentUpdater
         )
         binder.setGrailsPropertyBinder(grailsPropertyBinder)
     }
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 563d7d768b..6d8f7dc9b5 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
@@ -158,8 +158,7 @@ class GrailsPropertyBinderSpec extends HibernateGormDatastoreSpec {
         ComponentBinder componentBinder = new ComponentBinder(
                 metadataBuildingContext,
                 binder.getMappingCacheHolder(),
-                componentUpdater,
-                collector
+                componentUpdater
         )
         GrailsPropertyBinder propertyBinder = new GrailsPropertyBinder(
 
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ComponentUpdaterSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ComponentUpdaterSpec.groovy
index 227cc42f4a..7bdcb9646f 100644
--- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ComponentUpdaterSpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ComponentUpdaterSpec.groovy
@@ -1,7 +1,9 @@
 package org.grails.orm.hibernate.cfg.domainbinding.binder
 
+import grails.gorm.annotation.Entity
+import grails.gorm.hibernate.HibernateEntity
 import grails.gorm.specs.HibernateGormDatastoreSpec
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentEntity
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateEmbeddedProperty
 import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty
 import org.grails.orm.hibernate.cfg.domainbinding.util.PropertyFromValueCreator
 import org.hibernate.mapping.BasicValue
@@ -18,6 +20,10 @@ class ComponentUpdaterSpec extends HibernateGormDatastoreSpec {
     @Subject
     ComponentUpdater updater
 
+    def setupSpec() {
+        manager.addAllDomainClasses([CUPerson, CUAddress])
+    }
+
     def setup() {
         updater = new ComponentUpdater(propertyFromValueCreator)
     }
@@ -27,27 +33,24 @@ class ComponentUpdaterSpec extends HibernateGormDatastoreSpec {
         def metadataBuildingContext = getGrailsDomainBinder().getMetadataBuildingContext()
         def root = new RootClass(metadataBuildingContext)
         def component = new Component(metadataBuildingContext, root)
-        
-        def componentProperty = Mock(HibernatePersistentProperty)
-        def currentGrailsProp = Mock(HibernatePersistentProperty)
+
+        def personEntity = mappingContext.getPersistentEntity(CUPerson.name)
+        HibernateEmbeddedProperty componentProperty = personEntity.persistentProperties.find { it.name == 'address' } as HibernateEmbeddedProperty
+        HibernatePersistentProperty streetProp = componentProperty.associatedEntity.persistentProperties.find { it.name == 'street' } as HibernatePersistentProperty
+
         def value = new BasicValue(metadataBuildingContext, root.getTable())
-        def column = new Column("test_col")
+        def column = new Column("street")
         value.addColumn(column)
-        
         def hibernateProperty = new Property()
-        hibernateProperty.setName("testProp")
-        
-        def ownerEntity = Mock(GrailsHibernatePersistentEntity)
-        componentProperty.getOwner() >> ownerEntity
-        ownerEntity.isComponentPropertyNullable(componentProperty) >> true
+        hibernateProperty.setName("street")
 
         when:
-        updater.updateComponent(component, componentProperty, currentGrailsProp, value)
+        updater.updateComponent(component, componentProperty, streetProp, value)
 
         then:
-        1 * propertyFromValueCreator.createProperty(value, currentGrailsProp) >> hibernateProperty
-        component.getProperty("testProp") == hibernateProperty
-        column.isNullable()
+        1 * propertyFromValueCreator.createProperty(value, streetProp) >> hibernateProperty
+        component.getProperty("street") == hibernateProperty
+        column.isNullable() // address is nullable on CUPerson
     }
 
     def "should not set columns nullable if component property is not nullable"() {
@@ -55,26 +58,39 @@ class ComponentUpdaterSpec extends HibernateGormDatastoreSpec {
         def metadataBuildingContext = getGrailsDomainBinder().getMetadataBuildingContext()
         def root = new RootClass(metadataBuildingContext)
         def component = new Component(metadataBuildingContext, root)
-        
-        def componentProperty = Mock(HibernatePersistentProperty)
-        def currentGrailsProp = Mock(HibernatePersistentProperty)
+
+        def personEntity = mappingContext.getPersistentEntity(CUPerson.name)
+        HibernateEmbeddedProperty componentProperty = personEntity.persistentProperties.find { it.name == 'requiredAddress' } as HibernateEmbeddedProperty
+        HibernatePersistentProperty streetProp = componentProperty.associatedEntity.persistentProperties.find { it.name == 'street' } as HibernatePersistentProperty
+
         def value = new BasicValue(metadataBuildingContext, root.getTable())
-        def column = new Column("test_col")
+        def column = new Column("street")
         column.setNullable(false)
         value.addColumn(column)
-        
         def hibernateProperty = new Property()
-        hibernateProperty.setName("testProp")
-        
-        def ownerEntity = Mock(GrailsHibernatePersistentEntity)
-        componentProperty.getOwner() >> ownerEntity
-        ownerEntity.isComponentPropertyNullable(componentProperty) >> false
+        hibernateProperty.setName("street")
 
         when:
-        updater.updateComponent(component, componentProperty, currentGrailsProp, value)
+        updater.updateComponent(component, componentProperty, streetProp, value)
 
         then:
-        1 * propertyFromValueCreator.createProperty(value, currentGrailsProp) >> hibernateProperty
+        1 * propertyFromValueCreator.createProperty(value, streetProp) >> hibernateProperty
         !column.isNullable()
     }
 }
+
+class CUAddress {
+    String street
+    String city
+}
+
+@Entity
+class CUPerson implements HibernateEntity<CUPerson> {
+    CUAddress address
+    CUAddress requiredAddress
+    static embedded = ['address', 'requiredAddress']
+    static constraints = {
+        address nullable: true
+        requiredAddress nullable: false
+    }
+}
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 19a63afb81..5b6fd92cc8 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
@@ -92,8 +92,7 @@ class ListSecondPassBinderSpec extends HibernateGormDatastoreSpec {
         ComponentBinder componentBinder = new ComponentBinder(
                 metadataBuildingContext,
                 binder.getMappingCacheHolder(),
-                componentUpdater,
-                getCollector()
+                componentUpdater
         )
 
         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 cdff3a07c2..8e9c9e65f6 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
@@ -92,8 +92,7 @@ class MapSecondPassBinderSpec extends HibernateGormDatastoreSpec {
         ComponentBinder componentBinder = new ComponentBinder(
                 metadataBuildingContext,
                 binder.getMappingCacheHolder(),
-                componentUpdater,
-                getCollector()
+                componentUpdater
         )
 
         GrailsPropertyBinder propertyBinder = new GrailsPropertyBinder(


(grails-core) 18/27: cleanup(hibernate7): ColumnBinder using more GrailsHibernate types

Posted by bo...@apache.org.
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 cc37cc3467b57fe41bdae5b1ca9394decc877941
Author: Walter Duque de Estrada <wb...@mac.com>
AuthorDate: Wed Mar 4 18:29:34 2026 -0600

    cleanup(hibernate7): ColumnBinder using more GrailsHibernate types
---
 .../cfg/domainbinding/binder/ColumnBinder.java     | 23 +++---------
 .../hibernate/HibernateAssociation.java            |  8 +++++
 .../hibernate/HibernateManyToManyProperty.java     |  5 +++
 .../hibernate/HibernateOneToOneProperty.java       |  9 +++++
 .../HibernateOneToOnePropertySpec.groovy           | 42 +++++++++++++++++++++-
 .../hibernate/HibernateToManyPropertySpec.groovy   | 27 +++++++++++++-
 6 files changed, 94 insertions(+), 20 deletions(-)

diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ColumnBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ColumnBinder.java
index d08d1b92a4..f6c5c053de 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ColumnBinder.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ColumnBinder.java
@@ -18,14 +18,11 @@
  */
 package org.grails.orm.hibernate.cfg.domainbinding.binder;
 
-import org.grails.datastore.mapping.model.types.Association;
-import org.grails.datastore.mapping.model.types.ToOne;
 import org.grails.orm.hibernate.cfg.ColumnConfig;
 import org.grails.orm.hibernate.cfg.Mapping;
 import org.grails.orm.hibernate.cfg.PersistentEntityNamingStrategy;
 import org.grails.orm.hibernate.cfg.PropertyConfig;
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateManyToManyProperty;
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateOneToOneProperty;
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateAssociation;
 import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty;
 import org.grails.orm.hibernate.cfg.domainbinding.util.BackticksRemover;
 import org.grails.orm.hibernate.cfg.domainbinding.util.ColumnNameForPropertyAndPathFetcher;
@@ -81,9 +78,9 @@ public class ColumnBinder {
    * Binds a Column instance to the Hibernate meta model
    *
    * @param property The Grails domain class property
-   * @param parentProperty
+   * @param parentProperty parent property
    * @param column The column to bind
-   * @param path
+   * @param path the path
    * @param table The table name
    */
   public void bindColumn(
@@ -104,22 +101,12 @@ public class ColumnBinder {
     Class<?> userType = property.getUserType();
     String columnName =
         columnNameForPropertyAndPathFetcher.getColumnNameForPropertyAndPath(property, path, cc);
-    if ((property instanceof Association association) && userType == null) {
+    if ((property instanceof HibernateAssociation assoc) && userType == null) {
       // Only use conventional naming when the column has not been explicitly mapped.
       if (column.getName() == null) {
         column.setName(columnName);
       }
-      if (property instanceof HibernateManyToManyProperty) {
-        column.setNullable(false);
-      } else if (property instanceof HibernateOneToOneProperty
-          && association.isBidirectional()
-          && !association.isOwningSide()) {
-          column.setNullable(!association.getInverseSide().isHasOne());
-      } else if ((property instanceof ToOne) && association.isCircular()) {
-        column.setNullable(true);
-      } else {
-        column.setNullable(true);
-      }
+      column.setNullable(assoc.isAssociationColumnNullable());
     } else {
       column.setName(columnName);
       column.setNullable(
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateAssociation.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateAssociation.java
index 5d71d7aa6f..d5cb2885fc 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateAssociation.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateAssociation.java
@@ -51,6 +51,14 @@ public interface HibernateAssociation extends HibernatePersistentProperty {
 
   boolean isBidirectionalOneToManyMap();
 
+  /**
+   * Returns the nullable value for the FK column when this property is an association without a
+   * user type. The default is {@code true}; subtypes override for their specific semantics.
+   */
+  default boolean isAssociationColumnNullable() {
+    return true;
+  }
+
   // --- Hibernate-typed overrides, removing instanceof guards ---
 
   /** Returns the inverse side as a {@link HibernateAssociation}, eliminating cast at call sites. */
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateManyToManyProperty.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateManyToManyProperty.java
index d5d57d6e54..86ef2e79c4 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateManyToManyProperty.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateManyToManyProperty.java
@@ -41,4 +41,9 @@ public class HibernateManyToManyProperty extends ManyToManyWithMapping<PropertyC
   public HibernateManyToManyProperty getHibernateInverseSide() {
     return (HibernateManyToManyProperty) getInverseSide();
   }
+
+  @Override
+  public boolean isAssociationColumnNullable() {
+    return false;
+  }
 }
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateOneToOneProperty.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateOneToOneProperty.java
index ac85c3407f..166f8795c9 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateOneToOneProperty.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateOneToOneProperty.java
@@ -110,4 +110,13 @@ public class HibernateOneToOneProperty extends OneToOneWithMapping<PropertyConfi
     validateAssociation();
     return !isValidHibernateOneToOne();
   }
+
+  @Override
+  public boolean isAssociationColumnNullable() {
+    if (isBidirectional() && !isOwningSide()) {
+      HibernateOneToOneProperty inverseSide = getHibernateInverseSide();
+      return inverseSide == null || !inverseSide.isHasOne();
+    }
+    return true;
+  }
 }
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/HibernateOneToOnePropertySpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/HibernateOneToOnePropertySpec.groovy
index d178cfa3d8..a9e1855566 100644
--- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/HibernateOneToOnePropertySpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/HibernateOneToOnePropertySpec.groovy
@@ -28,7 +28,7 @@ import org.hibernate.type.ForeignKeyDirection
 class HibernateOneToOnePropertySpec extends HibernateGormDatastoreSpec {
 
     def setupSpec() {
-        manager.addAllDomainClasses([OneToOneFace, OneToOneNose])
+        manager.addAllDomainClasses([OneToOneFace, OneToOneNose, OneToOneLeft, OneToOneRight])
     }
 
     void "getHibernateInverseSide returns HibernateOneToOneProperty"() {
@@ -132,6 +132,33 @@ class HibernateOneToOnePropertySpec extends HibernateGormDatastoreSpec {
         then:
         faceProp.needsSimpleValueBinding()
     }
+
+    void "isAssociationColumnNullable is false when bidirectional non-owning and inverse has hasOne"() {
+        when:
+        def noseEntity = mappingContext.getPersistentEntity(OneToOneNose.name)
+        def faceProp = noseEntity.persistentProperties.find { it.name == 'face' } as HibernateOneToOneProperty
+
+        then:
+        !faceProp.isAssociationColumnNullable()
+    }
+
+    void "isAssociationColumnNullable is true when owning side declares hasOne"() {
+        when:
+        def faceEntity = mappingContext.getPersistentEntity(OneToOneFace.name)
+        def noseProp = faceEntity.persistentProperties.find { it.name == 'nose' } as HibernateOneToOneProperty
+
+        then:
+        noseProp.isAssociationColumnNullable()
+    }
+
+    void "isAssociationColumnNullable is true when bidirectional non-owning but inverse does not have hasOne"() {
+        when:
+        def leftEntity = mappingContext.getPersistentEntity(OneToOneLeft.name)
+        def rightProp = leftEntity.persistentProperties.find { it.name == 'right' } as HibernateOneToOneProperty
+
+        then:
+        rightProp.isAssociationColumnNullable()
+    }
 }
 
 @Entity
@@ -147,3 +174,16 @@ class OneToOneNose implements HibernateEntity<OneToOneNose> {
     OneToOneFace face
     static belongsTo = [face: OneToOneFace]
 }
+
+@Entity
+class OneToOneRight implements HibernateEntity<OneToOneRight> {
+    String code
+    OneToOneLeft left
+}
+
+@Entity
+class OneToOneLeft implements HibernateEntity<OneToOneLeft> {
+    String label
+    OneToOneRight right
+    static belongsTo = [right: OneToOneRight]
+}
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateToManyPropertySpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateToManyPropertySpec.groovy
index d597720af5..aaca72d0d3 100644
--- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateToManyPropertySpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateToManyPropertySpec.groovy
@@ -25,7 +25,7 @@ import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateToManyPrope
 class HibernateToManyPropertySpec extends HibernateGormDatastoreSpec {
 
     def setupSpec() {
-        manager.addAllDomainClasses([HTMPBook, HTMPAuthor, HTMPAuthorCustom])
+        manager.addAllDomainClasses([HTMPBook, HTMPAuthor, HTMPAuthorCustom, HTMPStudent, HTMPCourse])
     }
 
     void "resolveJoinTableForeignKeyColumnName derives name from associated entity when no explicit config"() {
@@ -53,6 +53,15 @@ class HibernateToManyPropertySpec extends HibernateGormDatastoreSpec {
         then:
         columnName == "custom_book_fk"
     }
+
+    void "isAssociationColumnNullable returns false for ManyToMany"() {
+        when:
+        def studentEntity = mappingContext.getPersistentEntity(HTMPStudent.name)
+        def coursesProp = studentEntity.getPropertyByName("courses")
+
+        then:
+        !coursesProp.isAssociationColumnNullable()
+    }
 }
 
 @Entity
@@ -79,3 +88,19 @@ class HTMPAuthorCustom {
         books joinTable: [column: 'custom_book_fk']
     }
 }
+
+@Entity
+class HTMPStudent {
+    Long id
+    String name
+    Set<HTMPCourse> courses
+    static hasMany = [courses: HTMPCourse]
+}
+
+@Entity
+class HTMPCourse {
+    Long id
+    String title
+    Set<HTMPStudent> students
+    static hasMany = [students: HTMPStudent]
+}


(grails-core) 05/27: clean up PredicateGenerator

Posted by bo...@apache.org.
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 67b42acfbafc1e6e737ce8773a6320fe75c2ca06
Author: Walter Duque de Estrada <wb...@mac.com>
AuthorDate: Wed Mar 4 10:28:57 2026 -0600

    clean up PredicateGenerator
---
 .../orm/hibernate/query/PredicateGenerator.java    | 24 ++++++++++------------
 .../JpaCriteriaQueryCreatorSpec.groovy             |  1 -
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/PredicateGenerator.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/PredicateGenerator.java
index 2b19c9fd45..8488ef23d1 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/PredicateGenerator.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/PredicateGenerator.java
@@ -39,7 +39,6 @@ import org.grails.datastore.gorm.GormEntity;
 import org.grails.datastore.gorm.query.criteria.DetachedAssociationCriteria;
 import org.grails.datastore.mapping.core.exceptions.ConfigurationException;
 import org.grails.datastore.mapping.model.PersistentEntity;
-import org.grails.datastore.mapping.model.types.Association;
 import org.grails.datastore.mapping.query.Query;
 import org.grails.datastore.mapping.query.api.QueryableCriteria;
 import org.hibernate.query.criteria.HibernateCriteriaBuilder;
@@ -53,7 +52,13 @@ import org.slf4j.LoggerFactory;
 @SuppressWarnings({
   "PMD.DataflowAnomalyAnalysis",
   "PMD.AvoidLiteralsInIfCondition",
-  "PMD.AvoidDuplicateLiterals"
+  "PMD.AvoidDuplicateLiterals",
+  // GORM stores criterion values as Object; JPA expects types resolved at compile time.
+  // The unchecked casts here are deliberate — type safety is enforced at runtime by
+  // MappingContext, not at compile time. This is the inherent cost of bridging a
+  // runtime-typed DSL (GORM) to a compile-time-typed API (JPA Criteria).
+  "unchecked",
+  "rawtypes"
 })
 public class PredicateGenerator {
   private static final Logger log = LoggerFactory.getLogger(PredicateGenerator.class);
@@ -94,11 +99,11 @@ public class PredicateGenerator {
     } else if (criterion instanceof DetachedAssociationCriteria<?> c) {
       return handleAssociationCriteria(cb, criteriaQuery, root, fromsByProvider, entity, c);
     } else if (criterion instanceof HibernateAssociationQuery haq) {
-      return handleHibernateAssociationQuery(cb, criteriaQuery, root, fromsByProvider, entity, haq);
+      return handleHibernateAssociationQuery(cb, criteriaQuery, root, fromsByProvider, haq);
     } else if (criterion instanceof Query.PropertyCriterion pc) {
       return handlePropertyCriterion(cb, criteriaQuery, root, fromsByProvider, entity, pc);
     } else if (criterion instanceof Query.PropertyComparisonCriterion c) {
-      return handlePropertyComparisonCriterion(cb, fromsByProvider, root, c);
+      return handlePropertyComparisonCriterion(cb, fromsByProvider, c);
     } else if (criterion instanceof Query.PropertyNameCriterion c) {
       return handlePropertyNameCriterion(cb, fromsByProvider, c);
     } else if (criterion instanceof Query.Exists c) {
@@ -153,7 +158,6 @@ public class PredicateGenerator {
       CriteriaQuery<?> criteriaQuery,
       From<?, ?> root,
       JpaFromProvider fromsByProvider,
-      PersistentEntity entity,
       HibernateAssociationQuery haq) {
     var child = root.join(haq.associationPath, JoinType.LEFT);
     JpaFromProvider childFroms = (JpaFromProvider) fromsByProvider.clone();
@@ -265,10 +269,9 @@ public class PredicateGenerator {
       return getQueryableCriteriaValue(
           cb, criteriaQuery, fromsByProvider, entity, c, queryableCriteria);
     } else if (!c.getValues().isEmpty()) {
-      boolean areGormEntities = c.getValues().stream().allMatch(GormEntity.class::isInstance);
-      if (areGormEntities) {
+      if (c.getValues().iterator().next() instanceof GormEntity firstEntity) {
         List<GormEntity> gormEntities = new ArrayList<>(c.getValues());
-        Path id = criteriaQuery.from(gormEntities.get(0).getClass()).get("id");
+        Path id = criteriaQuery.from(firstEntity.getClass()).get("id");
         Collection newValues = gormEntities.stream().map(GormEntity::ident).toList();
         return cb.in(id, newValues);
       }
@@ -337,7 +340,6 @@ public class PredicateGenerator {
   private Predicate handlePropertyComparisonCriterion(
       HibernateCriteriaBuilder cb,
       JpaFromProvider fromsByProvider,
-      From<?, ?> root_,
       Query.PropertyComparisonCriterion c) {
     Path path = fromsByProvider.getFullyQualifiedPath(c.getProperty());
     Path otherPath = fromsByProvider.getFullyQualifiedPath(c.getOtherProperty());
@@ -434,7 +436,6 @@ public class PredicateGenerator {
         .orElse(null);
   }
 
-  @SuppressWarnings("rawtypes")
   private JpaInPredicate findInPredicate(
       HibernateCriteriaBuilder cb, Object projection, Path path, String subProperty) {
     return projection instanceof Query.PropertyProjection
@@ -448,7 +449,6 @@ public class PredicateGenerator {
         : "id";
   }
 
-  @SuppressWarnings("unchecked")
   private Query.Projection findPropertyOrIdProjection(QueryableCriteria queryableCriteria) {
     return (Query.Projection)
         queryableCriteria.getProjections().stream()
@@ -457,14 +457,12 @@ public class PredicateGenerator {
             .orElse(new Query.IdProjection());
   }
 
-  @SuppressWarnings("rawtypes")
   private QueryableCriteria getQueryableCriteriaFromInCriteria(Query.Criterion criterion) {
     return criterion instanceof Query.In
         ? ((Query.In) criterion).getSubquery()
         : ((Query.NotIn) criterion).getSubquery();
   }
 
-  @SuppressWarnings("rawtypes")
   private Class getJavaTypeOfInClause(SqmInListPredicate predicate) {
     return Optional.ofNullable(predicate.getTestExpression().getExpressible())
         .map(expressible -> expressible.getExpressibleJavaType().getJavaTypeClass())
diff --git a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/specs/hibernatequery/JpaCriteriaQueryCreatorSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/specs/hibernatequery/JpaCriteriaQueryCreatorSpec.groovy
index 8ad54c2c23..968e78f914 100644
--- a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/specs/hibernatequery/JpaCriteriaQueryCreatorSpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/specs/hibernatequery/JpaCriteriaQueryCreatorSpec.groovy
@@ -5,7 +5,6 @@ import grails.gorm.specs.HibernateGormDatastoreSpec
 import org.apache.grails.data.testing.tck.domains.Person
 import org.grails.datastore.mapping.query.Query
 import org.grails.orm.hibernate.query.JpaCriteriaQueryCreator
-import org.grails.orm.hibernate.query.PredicateGenerator
 import org.hibernate.query.criteria.HibernateCriteriaBuilder
 import org.hibernate.query.criteria.JpaCriteriaQuery
 


(grails-core) 07/27: clean up HibernateHqlQuery

Posted by bo...@apache.org.
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 ecd0263d1bd8624ee20c183d3f59dfa9e6c9aeb9
Author: Walter Duque de Estrada <wb...@mac.com>
AuthorDate: Wed Mar 4 12:23:31 2026 -0600

    clean up HibernateHqlQuery
---
 .../hibernate/query/GrailsHibernateQueryUtils.java | 13 ++++-
 .../orm/hibernate/query/HibernateHqlQuery.java     | 66 +++++++++++++++-------
 .../grails/orm/hibernate/query/HibernateQuery.java |  5 +-
 .../hibernate/query/HibernateQueryExecutor.java    |  8 +--
 4 files changed, 63 insertions(+), 29 deletions(-)

diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/GrailsHibernateQueryUtils.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/GrailsHibernateQueryUtils.java
index d0a342aba4..cc73b32ca9 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/GrailsHibernateQueryUtils.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/GrailsHibernateQueryUtils.java
@@ -37,6 +37,7 @@ import org.grails.orm.hibernate.cfg.MappingCacheHolder;
 import org.hibernate.FetchMode;
 import org.hibernate.FlushMode;
 import org.hibernate.query.Query;
+import org.hibernate.query.QueryFlushMode;
 import org.hibernate.query.sqm.tree.domain.SqmBasicValuedSimplePath;
 import org.hibernate.query.sqm.tree.expression.SqmFunction;
 import org.springframework.core.convert.ConversionService;
@@ -150,7 +151,7 @@ public class GrailsHibernateQueryUtils {
           conversionService.convert(argMap.get(DynamicFinder.ARGUMENT_TIMEOUT), Integer.class));
     }
     if (argMap.containsKey(DynamicFinder.ARGUMENT_FLUSH_MODE)) {
-      query.setHibernateFlushMode(convertFlushMode(argMap.get(DynamicFinder.ARGUMENT_FLUSH_MODE)));
+      query.setQueryFlushMode(convertQueryFlushMode(argMap.get(DynamicFinder.ARGUMENT_FLUSH_MODE)));
     }
     if (argMap.containsKey(DynamicFinder.ARGUMENT_READ_ONLY)) {
       query.setReadOnly(ClassUtils.getBooleanFromMap(DynamicFinder.ARGUMENT_READ_ONLY, argMap));
@@ -340,6 +341,16 @@ public class GrailsHibernateQueryUtils {
     }
   }
 
+  public static QueryFlushMode convertQueryFlushMode(Object object) {
+    FlushMode fm = convertFlushMode(object);
+    if (fm == null) return QueryFlushMode.DEFAULT;
+    return switch (fm) {
+      case ALWAYS -> QueryFlushMode.FLUSH;
+      case MANUAL, COMMIT -> QueryFlushMode.NO_FLUSH;
+      default -> QueryFlushMode.DEFAULT;
+    };
+  }
+
   /**
    * Retrieves the fetch mode for the specified instance; otherwise returns the default FetchMode.
    *
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/HibernateHqlQuery.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/HibernateHqlQuery.java
index bdf3321ed7..f896a0adf2 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/HibernateHqlQuery.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/HibernateHqlQuery.java
@@ -40,6 +40,7 @@ import org.grails.orm.hibernate.HibernateSession;
 import org.grails.orm.hibernate.exceptions.GrailsQueryException;
 import org.hibernate.FlushMode;
 import org.hibernate.SessionFactory;
+import org.hibernate.query.MutationQuery;
 import org.springframework.context.ApplicationEventPublisher;
 
 /**
@@ -51,12 +52,21 @@ import org.springframework.context.ApplicationEventPublisher;
 @SuppressWarnings("PMD.AvoidDuplicateLiterals")
 public class HibernateHqlQuery extends Query {
 
-  private org.hibernate.query.Query<?> query;
+  private final org.hibernate.query.Query<?> query;
+  private final org.hibernate.query.MutationQuery mutationQuery;
 
   public HibernateHqlQuery(
       Session session, PersistentEntity entity, org.hibernate.query.Query<?> query) {
     super(session, entity);
     this.query = query;
+    this.mutationQuery = null;
+  }
+
+  public HibernateHqlQuery(
+      Session session, PersistentEntity entity, org.hibernate.query.MutationQuery mutationQuery) {
+    super(session, entity);
+    this.query = null;
+    this.mutationQuery = mutationQuery;
   }
 
   @Override
@@ -82,8 +92,7 @@ public class HibernateHqlQuery extends Query {
    * Session-bound step — creates the {@link org.hibernate.query.Query} from an open {@link
    * org.hibernate.Session} and wraps it in a {@link HibernateHqlQuery}.
    */
-  @SuppressWarnings("unchecked")
-  public static HibernateHqlQuery buildQuery(
+  protected static HibernateHqlQuery buildQuery(
       org.hibernate.Session session,
       HibernateDatastore dataStore,
       SessionFactory sessionFactory,
@@ -92,8 +101,13 @@ public class HibernateHqlQuery extends Query {
     org.hibernate.query.Query<?> q;
     if (StringUtils.isEmpty(ctx.hql())) {
       q = session.createQuery("from " + ctx.targetClass().getName(), ctx.targetClass());
+      return new HibernateHqlQuery(new HibernateSession(dataStore, sessionFactory), entity, q);
     } else if (ctx.isUpdate()) {
-      q = session.createQuery(ctx.hql());
+      org.hibernate.query.MutationQuery mq = session.createMutationQuery(ctx.hql());
+      HibernateHqlQuery result =
+          new HibernateHqlQuery(new HibernateSession(dataStore, sessionFactory), entity, mq);
+      result.setFlushMode(session.getHibernateFlushMode());
+      return result;
     } else {
       q =
           ctx.isNative()
@@ -121,7 +135,9 @@ public class HibernateHqlQuery extends Query {
       GrailsHibernateTemplate template) {
     HibernateHqlQuery hqlQuery =
         template.execute(session -> buildQuery(session, dataStore, sessionFactory, entity, ctx));
-    template.applySettings(hqlQuery.getQuery());
+    if (hqlQuery.getQuery() != null) {
+      template.applySettings(hqlQuery.getQuery());
+    }
     hqlQuery.populateQuerySettings(
         MapUtils.isNotEmpty(args) ? new HashMap<>(args) : Collections.emptyMap());
     if (MapUtils.isNotEmpty(ctx.namedParams())) {
@@ -141,23 +157,31 @@ public class HibernateHqlQuery extends Query {
             : FlushModeType.COMMIT);
   }
 
-  @SuppressWarnings({"unchecked", "rawtypes"})
   public void populateQuerySettings(Map<?, ?> args) {
+    if (mutationQuery != null) {
+      ifPresent(args, DynamicFinder.ARGUMENT_TIMEOUT, v -> mutationQuery.setTimeout(toInt(v)));
+      ifPresent(
+          args,
+          DynamicFinder.ARGUMENT_FLUSH_MODE,
+          v -> mutationQuery.setQueryFlushMode(GrailsHibernateQueryUtils.convertQueryFlushMode(v)));
+      return;
+    }
+    if (query == null) return;
     ifPresent(args, DynamicFinder.ARGUMENT_MAX, v -> query.setMaxResults(toInt(v)));
     ifPresent(args, DynamicFinder.ARGUMENT_OFFSET, v -> query.setFirstResult(toInt(v)));
     ifPresent(args, DynamicFinder.ARGUMENT_CACHE, v -> query.setCacheable(toBool(v)));
     ifPresent(args, DynamicFinder.ARGUMENT_FETCH_SIZE, v -> query.setFetchSize(toInt(v)));
     ifPresent(args, DynamicFinder.ARGUMENT_TIMEOUT, v -> query.setTimeout(toInt(v)));
     ifPresent(args, DynamicFinder.ARGUMENT_READ_ONLY, v -> query.setReadOnly(toBool(v)));
-    if (args.containsKey(DynamicFinder.ARGUMENT_FLUSH_MODE)) {
-      Object v = args.get(DynamicFinder.ARGUMENT_FLUSH_MODE);
-      if (v instanceof FlushMode fm) query.setHibernateFlushMode(fm);
-    }
+    ifPresent(
+        args,
+        DynamicFinder.ARGUMENT_FLUSH_MODE,
+        v -> query.setQueryFlushMode(GrailsHibernateQueryUtils.convertQueryFlushMode(v)));
   }
 
-  @SuppressWarnings({"unchecked", "rawtypes"})
   public void populateQueryWithNamedArguments(Map<?, ?> namedArgs) {
     if (namedArgs == null) return;
+    org.hibernate.query.CommonQueryContract target = mutationQuery != null ? mutationQuery : query;
     namedArgs.forEach(
         (key, value) -> {
           if (!(key instanceof CharSequence)) {
@@ -165,27 +189,27 @@ public class HibernateHqlQuery extends Query {
           }
           String name = key.toString();
           if (value == null) {
-            query.setParameter(name, null);
-          } else if (value instanceof Collection<?> col) {
+            target.setParameter(name, null);
+          } else if (mutationQuery == null && value instanceof Collection<?> col) {
             query.setParameterList(name, col);
-          } else if (value.getClass().isArray()) {
+          } else if (mutationQuery == null && value.getClass().isArray()) {
             query.setParameterList(name, (Object[]) value);
           } else if (value instanceof CharSequence cs) {
-            query.setParameter(name, cs.toString(), String.class);
+            target.setParameter(name, cs.toString(), String.class);
           } else {
-            query.setParameter(name, value);
+            target.setParameter(name, value);
           }
         });
   }
 
-  @SuppressWarnings({"unchecked", "rawtypes"})
   public void populateQueryWithIndexedArguments(List<?> params) {
     if (params == null) return;
+    org.hibernate.query.CommonQueryContract target = mutationQuery != null ? mutationQuery : query;
     for (int i = 0; i < params.size(); i++) {
       Object val = params.get(i);
-      if (val instanceof CharSequence cs) query.setParameter(i + 1, cs.toString(), String.class);
-      else if (val != null) query.setParameter(i + 1, val);
-      else query.setParameter(i + 1, null);
+      if (val instanceof CharSequence cs) target.setParameter(i + 1, cs.toString(), String.class);
+      else if (val != null) target.setParameter(i + 1, val);
+      else target.setParameter(i + 1, null);
     }
   }
 
@@ -194,7 +218,7 @@ public class HibernateHqlQuery extends Query {
   }
 
   public int executeUpdate() {
-    return query.executeUpdate();
+    return mutationQuery != null ? mutationQuery.executeUpdate() : query.executeUpdate();
   }
 
   // ─── Private utilities ────────────────────────────────────────────────────
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 bef86d7118..b8dd55d7bc 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
@@ -39,6 +39,7 @@ import org.grails.orm.hibernate.GrailsHibernateTemplate;
 import org.grails.orm.hibernate.IHibernateTemplate;
 import org.grails.orm.hibernate.proxy.HibernateProxyHandler;
 import org.hibernate.FlushMode;
+import org.hibernate.query.QueryFlushMode;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.query.criteria.HibernateCriteriaBuilder;
@@ -69,7 +70,7 @@ public class HibernateQuery extends Query {
 
   private Integer fetchSize;
   private Integer timeout;
-  private FlushMode flushMode;
+  private QueryFlushMode flushMode;
   private Boolean readOnly;
 
   public HibernateQuery(HibernateSession session, PersistentEntity entity) {
@@ -475,7 +476,7 @@ public class HibernateQuery extends Query {
   }
 
   public void setHibernateFlushMode(FlushMode flushMode) {
-    this.flushMode = flushMode;
+    this.flushMode = GrailsHibernateQueryUtils.convertQueryFlushMode(flushMode);
   }
 
   public void setReadOnly(Boolean readOnly) {
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/HibernateQueryExecutor.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/HibernateQueryExecutor.java
index 90bd13ae51..eeff4643f8 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/HibernateQueryExecutor.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/HibernateQueryExecutor.java
@@ -22,7 +22,7 @@ import jakarta.persistence.LockModeType;
 import java.util.List;
 import java.util.Optional;
 import org.grails.datastore.mapping.proxy.ProxyHandler;
-import org.hibernate.FlushMode;
+import org.hibernate.query.QueryFlushMode;
 import org.hibernate.NonUniqueResultException;
 import org.hibernate.Session;
 import org.hibernate.query.Query;
@@ -35,7 +35,7 @@ public record HibernateQueryExecutor(
     Boolean queryCache,
     Integer fetchSize,
     Integer timeout,
-    FlushMode flushMode,
+    QueryFlushMode flushMode,
     Boolean readOnly,
     ProxyHandler proxyHandler) {
 
@@ -71,9 +71,7 @@ public record HibernateQueryExecutor(
     Optional.ofNullable(lockResult).ifPresent(query::setLockMode);
     Optional.ofNullable(fetchSize).filter(v -> v > 0).ifPresent(query::setFetchSize);
     Optional.ofNullable(timeout).filter(v -> v > 0).ifPresent(query::setTimeout);
-    Optional.ofNullable(flushMode)
-        .map(mode -> mode.toJpaFlushMode())
-        .ifPresent(query::setFlushMode);
+    Optional.ofNullable(flushMode).ifPresent(query::setQueryFlushMode);
     Optional.ofNullable(readOnly).ifPresent(query::setReadOnly);
     return query;
   }


(grails-core) 10/27: clean up HibernateQuery

Posted by bo...@apache.org.
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 f08ee3a364848712d8ca1f7c90cdae448084b3c8
Author: Walter Duque de Estrada <wb...@mac.com>
AuthorDate: Wed Mar 4 13:15:46 2026 -0600

    clean up HibernateQuery
---
 .../groovy/org/grails/orm/hibernate/query/HibernateQuery.java |  9 +++++++--
 .../gorm/specs/hibernatequery/HibernateQuerySpec.groovy       | 11 +++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

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 111390a1d8..e0aaf8c1d2 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
@@ -62,7 +62,7 @@ public class HibernateQuery extends Query {
     return detachedCriteria;
   }
 
-  private Map<String, CriteriaAndAlias> createdAssociationPaths = new HashMap<>();
+  private final Map<String, CriteriaAndAlias> createdAssociationPaths = new HashMap<>();
   protected LinkedList<PersistentEntity> entityStack = new LinkedList<>();
   protected LinkedList<Association> associationStack = new LinkedList<>();
   protected DetachedCriteria<?> detachedCriteria;
@@ -219,6 +219,7 @@ public class HibernateQuery extends Query {
   public Query not(Criterion a) {
     not(
         new Closure(HibernateQuery.this) {
+          @SuppressWarnings("unused") // called reflectively by the Groovy runtime as the closure body
           public void doCall() {
             ((DetachedCriteria) getDelegate()).add(a);
           }
@@ -623,7 +624,11 @@ public class HibernateQuery extends Query {
   }
 
   @Override
-  @SuppressWarnings("PMD.CloneThrowsCloneNotSupportedException")
+  @SuppressWarnings({
+    "PMD.CloneThrowsCloneNotSupportedException",
+    "CloneDoesntCallSuperClone" // intentional: constructs a fresh instance via the session template
+                                // to avoid shallow-copying the live Session and DetachedCriteria state
+  })
   public HibernateQuery clone() {
     final HibernateSession hibernateSession = (HibernateSession) getSession();
     final GrailsHibernateTemplate hibernateTemplate =
diff --git a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/specs/hibernatequery/HibernateQuerySpec.groovy b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/specs/hibernatequery/HibernateQuerySpec.groovy
index 09de989d4d..49e3694019 100644
--- a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/specs/hibernatequery/HibernateQuerySpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/specs/hibernatequery/HibernateQuerySpec.groovy
@@ -1043,6 +1043,17 @@ class HibernateQuerySpec extends HibernateGormDatastoreSpec {
         scroll != null
     }
 
+    def scrollWithSession() {
+        given:
+        hibernateQuery.eq("firstName", "Bob")
+        when:
+        def session = sessionFactory.openSession()
+        def scroll = hibernateQuery.scroll(session)
+        session.close()
+        then:
+        scroll != null
+    }
+
     def equalsAllQueryable() {
         given:
         new Pet(name: "Lucky", age: 50, owner: oldBob).save(flush:true)


(grails-core) 27/27: cleanup(hibernate7): use Hibernate-specific types in ForeignKeyColumnCountCalculator and related specs

Posted by bo...@apache.org.
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 <wb...@mac.com>
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)


(grails-core) 13/27: refactor(hibernate7): more cleanup HibernateDatastore

Posted by bo...@apache.org.
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 b47d7c88e128365aefee9464f1ca034a55feeb31
Author: Walter Duque de Estrada <wb...@mac.com>
AuthorDate: Wed Mar 4 15:10:12 2026 -0600

    refactor(hibernate7): more cleanup HibernateDatastore
---
 .../grails/orm/hibernate/HibernateDatastore.java   | 53 +++++++++++++---------
 .../HibernateConnectionSourceFactory.java          |  6 +--
 .../ConnectionSourcesInitializer.groovy            |  6 +--
 3 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/HibernateDatastore.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/HibernateDatastore.java
index f82c3bf47f..a15eeeefc9 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/HibernateDatastore.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/HibernateDatastore.java
@@ -22,6 +22,7 @@ import grails.gorm.MultiTenant;
 import grails.gorm.multitenancy.Tenants;
 import groovy.lang.Closure;
 import jakarta.annotation.PreDestroy;
+import org.springframework.lang.Nullable;
 import java.io.Closeable;
 import java.io.IOException;
 import java.io.Serializable;
@@ -76,6 +77,8 @@ import org.grails.orm.hibernate.connections.HibernateConnectionSourceSettings;
 import org.grails.orm.hibernate.event.listener.HibernateEventListener;
 import org.grails.orm.hibernate.multitenancy.MultiTenantEventListener;
 import org.grails.orm.hibernate.support.ClosureEventTriggeringInterceptor;
+
+import org.checkerframework.checker.nullness.qual.NonNull;
 import org.hibernate.FlushMode;
 import org.hibernate.SessionFactory;
 import org.hibernate.boot.Metadata;
@@ -382,7 +385,7 @@ public class HibernateDatastore extends AbstractDatastore
   public HibernateDatastore(
       PropertyResolver configuration,
       ConfigurableApplicationEventPublisher eventPublisher,
-      Class... classes) {
+      Class<?>... classes) {
     this(configuration, new HibernateConnectionSourceFactory(classes), eventPublisher);
   }
 
@@ -397,7 +400,7 @@ public class HibernateDatastore extends AbstractDatastore
       DataSource dataSource,
       PropertyResolver configuration,
       ConfigurableApplicationEventPublisher eventPublisher,
-      Class... classes) {
+      Class<?>... classes) {
     this(configuration, createConnectionFactoryForDataSource(dataSource, classes), eventPublisher);
   }
 
@@ -440,7 +443,7 @@ public class HibernateDatastore extends AbstractDatastore
    * @param configuration The configuration
    * @param classes The persistent classes
    */
-  public HibernateDatastore(PropertyResolver configuration, Class... classes) {
+  public HibernateDatastore(PropertyResolver configuration, Class<?>... classes) {
     this(configuration, new HibernateConnectionSourceFactory(classes));
   }
 
@@ -460,7 +463,7 @@ public class HibernateDatastore extends AbstractDatastore
    *
    * @param classes The classes
    */
-  public HibernateDatastore(Map<String, Object> configuration, Class... classes) {
+  public HibernateDatastore(Map<String, Object> configuration, Class<?>... classes) {
     this(
         DatastoreUtils.createPropertyResolver(configuration),
         new HibernateConnectionSourceFactory(classes));
@@ -482,7 +485,7 @@ public class HibernateDatastore extends AbstractDatastore
    *
    * @param classes The classes
    */
-  public HibernateDatastore(Class... classes) {
+  public HibernateDatastore(Class<?>... classes) {
     this(
         DatastoreUtils.createPropertyResolver(
             Collections.singletonMap(Settings.SETTING_DB_CREATE, "create-drop")),
@@ -611,7 +614,7 @@ public class HibernateDatastore extends AbstractDatastore
   }
 
   @Override
-  public void setMessageSource(MessageSource messageSource) {
+  public void setMessageSource(@Nullable MessageSource messageSource) {
     HibernateMappingContext mappingContext = getMappingContext();
     ValidatorRegistry validatorRegistry = createValidatorRegistry(messageSource);
     configureValidatorRegistry(mappingContext, validatorRegistry, messageSource);
@@ -696,7 +699,7 @@ public class HibernateDatastore extends AbstractDatastore
     return new HibernateSession(this, sessionFactory);
   }
 
-  public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+  public void setApplicationContext(@Nullable ApplicationContext applicationContext) throws BeansException {
     if (applicationContext instanceof ConfigurableApplicationContext) {
       super.setApplicationContext(applicationContext);
 
@@ -803,6 +806,7 @@ public class HibernateDatastore extends AbstractDatastore
     if (dataSource instanceof TransactionAwareDataSourceProxy) {
       dataSource = ((TransactionAwareDataSourceProxy) dataSource).getTargetDataSource();
     }
+    if (dataSource == null) return;
     Object existing = TransactionSynchronizationManager.getResource(dataSource);
     if (existing instanceof ConnectionHolder connectionHolder) {
         Connection connection = connectionHolder.getConnection();
@@ -884,19 +888,22 @@ public class HibernateDatastore extends AbstractDatastore
         new DefaultConnectionSource<>(schemaName, dataSource, tenantSettings.getDataSource());
     ConnectionSource<SessionFactory, HibernateConnectionSourceSettings> connectionSource =
         factory.create(schemaName, dataSourceConnectionSource, tenantSettings);
+    HibernateDatastore childDatastore = getChildDatastore(connectionSource);
+    datastoresByConnectionSource.put(connectionSource.getName(), childDatastore);
+  }
+
+  private @NonNull HibernateDatastore getChildDatastore(ConnectionSource<SessionFactory, HibernateConnectionSourceSettings> connectionSource) {
     SingletonConnectionSources<SessionFactory, HibernateConnectionSourceSettings>
         singletonConnectionSources =
             new SingletonConnectionSources<>(
-                connectionSource, connectionSources.getBaseConfiguration());
-    HibernateDatastore childDatastore =
-        new HibernateDatastore(
-            singletonConnectionSources, (HibernateMappingContext) mappingContext, eventPublisher) {
-          @Override
-          protected HibernateGormEnhancer initialize() {
-            return null;
-          }
-        };
-    datastoresByConnectionSource.put(connectionSource.getName(), childDatastore);
+                    connectionSource, connectionSources.getBaseConfiguration());
+      return new HibernateDatastore(
+          singletonConnectionSources, (HibernateMappingContext) HibernateDatastore.this.mappingContext, HibernateDatastore.this.eventPublisher) {
+        @Override
+        protected HibernateGormEnhancer initialize() {
+          return null;
+        }
+      };
   }
 
   private Metadata getMetadataInternal() {
@@ -905,8 +912,12 @@ public class HibernateDatastore extends AbstractDatastore
         ((SessionFactoryImplementor) sessionFactory)
             .getServiceRegistry()
             .getParentServiceRegistry();
-    Iterable<Integrator> integrators =
-        bootstrapServiceRegistry.getService(IntegratorService.class).getIntegrators();
+    if (bootstrapServiceRegistry == null) return null;
+    Iterable<Integrator> integrators;
+    IntegratorService integratorService =
+        bootstrapServiceRegistry.getService(IntegratorService.class);
+    if (integratorService == null) return null;
+    integrators = integratorService.getIntegrators();
     for (Integrator integrator : integrators) {
       if (integrator instanceof MetadataIntegrator) {
         metadata = ((MetadataIntegrator) integrator).getMetadata();
@@ -916,7 +927,7 @@ public class HibernateDatastore extends AbstractDatastore
   }
 
   private static HibernateConnectionSourceFactory createConnectionFactoryForDataSource(
-      final DataSource dataSource, Class... classes) {
+      final DataSource dataSource, Class<?>... classes) {
     HibernateConnectionSourceFactory hibernateConnectionSourceFactory =
         new HibernateConnectionSourceFactory(classes);
     hibernateConnectionSourceFactory.setDataSourceConnectionSourceFactory(
@@ -975,7 +986,7 @@ public class HibernateDatastore extends AbstractDatastore
       return ((AllTenantsResolver) tenantResolver).resolveTenantIds();
     } else if (this.multiTenantMode == MultiTenancySettings.MultiTenancyMode.DATABASE) {
       List<Serializable> tenantIds = new ArrayList<>();
-      for (ConnectionSource connectionSource : this.connectionSources.getAllConnectionSources()) {
+      for (ConnectionSource<?,?> connectionSource : this.connectionSources.getAllConnectionSources()) {
         if (!ConnectionSource.DEFAULT.equals(connectionSource.getName())) {
           tenantIds.add(connectionSource.getName());
         }
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceFactory.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceFactory.java
index bf69e27f29..854acb3943 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceFactory.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceFactory.java
@@ -79,17 +79,17 @@ public class HibernateConnectionSourceFactory
       new CachedDataSourceConnectionSourceFactory();
 
   protected HibernateMappingContext mappingContext;
-  protected Class[] persistentClasses = new Class[0];
+  protected Class<?>[] persistentClasses = new Class<?>[0];
   private ApplicationContext applicationContext;
   protected HibernateEventListeners hibernateEventListeners;
   protected Interceptor interceptor;
   protected MessageSource messageSource = new StaticMessageSource();
 
-  public HibernateConnectionSourceFactory(Class... classes) {
+  public HibernateConnectionSourceFactory(Class<?>... classes) {
     this.persistentClasses = classes;
   }
 
-  public Class[] getPersistentClasses() {
+  public Class<?>[] getPersistentClasses() {
     return persistentClasses;
   }
 
diff --git a/grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/core/connections/ConnectionSourcesInitializer.groovy b/grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/core/connections/ConnectionSourcesInitializer.groovy
index 64df65c83f..510069283b 100644
--- a/grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/core/connections/ConnectionSourcesInitializer.groovy
+++ b/grails-datastore-core/src/main/groovy/org/grails/datastore/mapping/core/connections/ConnectionSourcesInitializer.groovy
@@ -41,16 +41,16 @@ class ConnectionSourcesInitializer {
      * @param configuration The configuration
      * @return The {@link ConnectionSources}
      */
-    static <T,S extends ConnectionSourceSettings> ConnectionSources create(ConnectionSourceFactory<T, S> connectionSourceFactory, PropertyResolver configuration) {
+    static <T,S extends ConnectionSourceSettings> ConnectionSources<T, S> create(ConnectionSourceFactory<T, S> connectionSourceFactory, PropertyResolver configuration) {
         ConnectionSource defaultConnectionSource = connectionSourceFactory.create(ConnectionSource.DEFAULT, configuration)
         Class<ConnectionSources> connectionSourcesClass = defaultConnectionSource.getSettings().getConnectionSourcesClass()
 
         if (connectionSourcesClass == null) {
-            return new InMemoryConnectionSources(defaultConnectionSource, connectionSourceFactory, configuration)
+            return (ConnectionSources<T, S>) new InMemoryConnectionSources(defaultConnectionSource, connectionSourceFactory, configuration)
         }
         else {
             try {
-                return connectionSourcesClass.newInstance(defaultConnectionSource, connectionSourceFactory, configuration)
+                return (ConnectionSources<T, S>) connectionSourcesClass.newInstance(defaultConnectionSource, connectionSourceFactory, configuration)
             } catch (Throwable e) {
                 throw new ConfigurationException("Cannot instantiate custom ConnectionSources implementation: $e.message", e)
             }


(grails-core) 25/27: cleanup(hibernate7): DefaultColumnNameFetcher

Posted by bo...@apache.org.
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 d412c74b72fbb7b5253c6eb287efd00a30fe2822
Author: Walter Duque de Estrada <wb...@mac.com>
AuthorDate: Wed Mar 4 21:51:34 2026 -0600

    cleanup(hibernate7): DefaultColumnNameFetcher
---
 .../cfg/domainbinding/util/CreateKeyForProps.java  | 28 ++++++++++------------
 .../util/DefaultColumnNameFetcher.java             |  9 ++++---
 .../cfg/domainbinding/CreateKeyForPropsSpec.groovy | 20 ++++++++--------
 3 files changed, 27 insertions(+), 30 deletions(-)

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 8d582ef726..bbbfb33a26 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
@@ -19,10 +19,9 @@
 package org.grails.orm.hibernate.cfg.domainbinding.util;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
-import org.grails.datastore.mapping.model.PersistentEntity;
 import org.grails.orm.hibernate.cfg.PropertyConfig;
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentEntity;
 import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty;
 import org.hibernate.MappingException;
 import org.hibernate.mapping.Column;
@@ -56,20 +55,19 @@ public class CreateKeyForProps {
       List<Column> keyList = new ArrayList<>();
       keyList.add(new Column(columnName));
       List<String> propertyNames = mappedForm.getUniquenessGroup();
-      PersistentEntity owner = grailsProp.getOwner();
-      for (Iterator<?> i = propertyNames.iterator(); i.hasNext(); ) {
-        String propertyName = (String) i.next();
-        HibernatePersistentProperty otherProp =
-            (HibernatePersistentProperty) owner.getPropertyByName(propertyName);
-        if (otherProp == null) {
-          throw new MappingException(
-              owner.getJavaClass().getName() + " references an unknown property " + propertyName);
+      GrailsHibernatePersistentEntity owner = grailsProp.getHibernateOwner();
+        for (String propertyName : propertyNames) {
+            HibernatePersistentProperty otherProp =
+                    (HibernatePersistentProperty) owner.getPropertyByName(propertyName);
+            if (otherProp == null) {
+                throw new MappingException(
+                        owner.getJavaClass().getName() + " references an unknown property " + propertyName);
+            }
+            String otherColumnName =
+                    columnNameForPropertyAndPathFetcher.getColumnNameForPropertyAndPath(
+                            otherProp, path, null);
+            keyList.add(new Column(otherColumnName));
         }
-        String otherColumnName =
-            columnNameForPropertyAndPathFetcher.getColumnNameForPropertyAndPath(
-                otherProp, path, null);
-        keyList.add(new Column(otherColumnName));
-      }
 
       uniqueKeyForColumnsCreator.createUniqueKeyForColumns(table, keyList);
     }
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/DefaultColumnNameFetcher.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/DefaultColumnNameFetcher.java
index 7bea16b7cd..bc79022598 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/DefaultColumnNameFetcher.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/DefaultColumnNameFetcher.java
@@ -18,12 +18,12 @@
  */
 package org.grails.orm.hibernate.cfg.domainbinding.util;
 
-import org.grails.datastore.mapping.model.types.Association;
-import org.grails.datastore.mapping.model.types.Basic;
 import org.grails.orm.hibernate.cfg.PersistentEntityNamingStrategy;
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateAssociation;
 import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateManyToManyProperty;
 import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateOneToManyProperty;
 import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty;
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateToManyProperty;
 
 @SuppressWarnings("PMD.DataflowAnomalyAnalysis")
 public class DefaultColumnNameFetcher {
@@ -48,9 +48,8 @@ public class DefaultColumnNameFetcher {
   public String getDefaultColumnName(HibernatePersistentProperty property) {
 
     String columnName = namingStrategyWrapper.resolveColumnName(property.getName());
-    if (property instanceof Association) {
-      Association association = (Association) property;
-      boolean isBasic = property instanceof Basic;
+    if (property instanceof HibernateAssociation association) {
+      boolean isBasic = property instanceof HibernateToManyProperty toMany && toMany.isBasic();
       if (isBasic && (property.getMappedForm()).getType() != null) {
         return columnName;
       }
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 9b5277bcae..79ca66422d 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
@@ -1,6 +1,6 @@
 package org.grails.orm.hibernate.cfg.domainbinding
 
-import org.grails.datastore.mapping.model.PersistentEntity
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentEntity
 import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty
 import org.hibernate.MappingException
 import org.hibernate.mapping.Table
@@ -18,9 +18,9 @@ class CreateKeyForPropsSpec extends Specification {
         def uniqueKeyCreator = Mock(UniqueKeyForColumnsCreator)
         def subject = new CreateKeyForProps(columnNameFetcher, uniqueKeyCreator)
 
-        def owner = Mock(PersistentEntity)
+        def owner = Mock(GrailsHibernatePersistentEntity)
         def grailsProp = Mock(HibernatePersistentProperty) {
-            getOwner() >> owner
+            getHibernateOwner() >> owner
         }
 
         def mappedForm = Mock(org.grails.orm.hibernate.cfg.PropertyConfig) {
@@ -47,7 +47,7 @@ class CreateKeyForPropsSpec extends Specification {
 
         then:
         1 * grailsProp.getMappedForm() >> mappedForm
-        1 * grailsProp.getOwner() >> owner
+        1 * grailsProp.getHibernateOwner() >> owner
         1 * mappedForm.isUnique() >> true
         1 * mappedForm.isUniqueWithinGroup() >> true
         1 * mappedForm.getUniquenessGroup() >> ["p1", "p2"]
@@ -64,8 +64,8 @@ class CreateKeyForPropsSpec extends Specification {
         def uniqueKeyCreator = Mock(UniqueKeyForColumnsCreator)
         def subject = new CreateKeyForProps(columnNameFetcher, uniqueKeyCreator)
 
-        def owner = Mock(PersistentEntity)
-        def grailsProp = Mock(HibernatePersistentProperty) { getOwner() >> owner }
+        def owner = Mock(GrailsHibernatePersistentEntity)
+        def grailsProp = Mock(HibernatePersistentProperty) { getHibernateOwner() >> owner }
 
         def mappedForm = Mock(org.grails.orm.hibernate.cfg.PropertyConfig) {
             isUnique() >> false
@@ -79,7 +79,7 @@ class CreateKeyForPropsSpec extends Specification {
 
         then:
         1 * grailsProp.getMappedForm() >> mappedForm
-        0 * grailsProp.getOwner() >> owner
+        0 * grailsProp.getHibernateOwner() >> owner
         1 * mappedForm.isUnique() >> false
         0 * uniqueKeyCreator._
         0 * columnNameFetcher._
@@ -91,8 +91,8 @@ class CreateKeyForPropsSpec extends Specification {
         def uniqueKeyCreator = Mock(UniqueKeyForColumnsCreator)
         def subject = new CreateKeyForProps(columnNameFetcher, uniqueKeyCreator)
 
-        def owner = Mock(PersistentEntity)
-        def grailsProp = Mock(HibernatePersistentProperty) { getOwner() >> owner }
+        def owner = Mock(GrailsHibernatePersistentEntity)
+        def grailsProp = Mock(HibernatePersistentProperty) { getHibernateOwner() >> owner }
         owner.getJavaClass() >> CreateKeyForPropsSpec
 
         def mappedForm = Mock(org.grails.orm.hibernate.cfg.PropertyConfig) {
@@ -110,7 +110,7 @@ class CreateKeyForPropsSpec extends Specification {
         then:
         thrown(MappingException)
         1 * grailsProp.getMappedForm() >> mappedForm
-        1 * grailsProp.getOwner() >> owner
+        1 * grailsProp.getHibernateOwner() >> owner
         1 * mappedForm.isUnique() >> true
         1 * mappedForm.isUniqueWithinGroup() >> true
         1 * mappedForm.getUniquenessGroup() >> ["missingProp"]


(grails-core) 06/27: clean up HibernateQuery

Posted by bo...@apache.org.
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 56fc42990f94cc490d702e2216a6a6fed7aa80c0
Author: Walter Duque de Estrada <wb...@mac.com>
AuthorDate: Wed Mar 4 11:11:03 2026 -0600

    clean up HibernateQuery
---
 .../groovy/org/grails/orm/hibernate/query/HibernateQuery.java  | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

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 3ffdc015b1..bef86d7118 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
@@ -36,7 +36,6 @@ import org.grails.datastore.mapping.query.Query;
 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.HibernateSession;
 import org.grails.orm.hibernate.IHibernateTemplate;
 import org.grails.orm.hibernate.proxy.HibernateProxyHandler;
 import org.hibernate.FlushMode;
@@ -63,9 +62,8 @@ public class HibernateQuery extends Query {
   }
 
   protected Map<String, CriteriaAndAlias> createdAssociationPaths = new HashMap<>();
-  protected LinkedList<String> aliasStack = new LinkedList<>();
-  protected LinkedList<PersistentEntity> entityStack = new LinkedList<PersistentEntity>();
-  protected LinkedList<Association> associationStack = new LinkedList<Association>();
+  protected LinkedList<PersistentEntity> entityStack = new LinkedList<>();
+  protected LinkedList<Association> associationStack = new LinkedList<>();
   protected DetachedCriteria<?> detachedCriteria;
   protected ProxyHandler proxyHandler = new HibernateProxyHandler();
 
@@ -244,9 +242,7 @@ public class HibernateQuery extends Query {
   @Override
   public Query allEq(Map<String, Object> values) {
     values.forEach(
-        (key, value) -> {
-          detachedCriteria.eq(key, value);
-        });
+        (key, value) -> detachedCriteria.eq(key, value));
     return this;
   }
 


(grails-core) 24/27: cleanup(hibernate7): general clean up

Posted by bo...@apache.org.
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 e75113a7b7cbe611a5659a53d86c0a4b45452d03
Author: Walter Duque de Estrada <wb...@mac.com>
AuthorDate: Wed Mar 4 20:50:53 2026 -0600

    cleanup(hibernate7): general clean up
---
 .../cfg/domainbinding/hibernate/HibernateToManyProperty.java      | 8 ++++++++
 .../domainbinding/secondpass/BasicCollectionElementBinder.java    | 3 +--
 .../cfg/domainbinding/secondpass/CollectionKeyColumnUpdater.java  | 1 -
 .../cfg/domainbinding/secondpass/CollectionSecondPassBinder.java  | 2 +-
 .../domainbinding/secondpass/CollectionWithJoinTableBinder.java   | 3 +--
 .../hibernate/cfg/domainbinding/secondpass/ListSecondPass.java    | 1 -
 .../cfg/domainbinding/secondpass/ListSecondPassBinder.java        | 5 ++---
 .../orm/hibernate/cfg/domainbinding/secondpass/MapSecondPass.java | 1 -
 .../cfg/domainbinding/secondpass/MapSecondPassBinder.java         | 6 +++---
 .../orm/hibernate/cfg/domainbinding/secondpass/SetSecondPass.java | 1 -
 .../domainbinding/secondpass/UnidirectionalOneToManyBinder.java   | 2 +-
 .../hibernate/cfg/domainbinding/util/CascadeBehaviorFetcher.java  | 8 --------
 .../secondpass/CollectionWithJoinTableBinderSpec.groovy           | 4 ++--
 13 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateToManyProperty.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateToManyProperty.java
index 542b426b3c..3a3c1e9538 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateToManyProperty.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateToManyProperty.java
@@ -72,6 +72,14 @@ public interface HibernateToManyProperty
     return this instanceof Basic;
   }
 
+  /**
+   * Returns the component type for basic (scalar/enum) collections, or {@code null} if this is not
+   * a basic collection.
+   */
+  default Class<?> getComponentType() {
+    return this instanceof Basic<?> basic ? basic.getComponentType() : null;
+  }
+
   /**
    * @return Whether the collection should be bound with a foreign key
    */
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/BasicCollectionElementBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/BasicCollectionElementBinder.java
index c9eafa624e..64582d4043 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/BasicCollectionElementBinder.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/BasicCollectionElementBinder.java
@@ -21,7 +21,6 @@ package org.grails.orm.hibernate.cfg.domainbinding.secondpass;
 import static org.grails.orm.hibernate.cfg.domainbinding.binder.GrailsDomainBinder.UNDERSCORE;
 
 import java.util.Optional;
-import org.grails.datastore.mapping.model.types.Basic;
 import org.grails.orm.hibernate.cfg.ColumnConfig;
 import org.grails.orm.hibernate.cfg.PersistentEntityNamingStrategy;
 import org.grails.orm.hibernate.cfg.PropertyConfig;
@@ -64,7 +63,7 @@ public class BasicCollectionElementBinder {
 
   /** Creates and binds a {@link BasicValue} element for the given basic collection property. */
   public BasicValue bind(HibernateToManyProperty property, Collection collection) {
-    final Class<?> referencedType = ((Basic) property).getComponentType();
+    final Class<?> referencedType = property.getComponentType();
     final boolean isEnum = referencedType.isEnum();
     var joinColumnMappingOptional =
         Optional.ofNullable(property.getMappedForm()).map(PropertyConfig::getJoinTableColumnConfig);
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionKeyColumnUpdater.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionKeyColumnUpdater.java
index 48a1fdd5cb..393b39a6a9 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionKeyColumnUpdater.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionKeyColumnUpdater.java
@@ -19,7 +19,6 @@
 package org.grails.orm.hibernate.cfg.domainbinding.secondpass;
 
 import java.util.Objects;
-import java.util.stream.StreamSupport;
 import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateToManyProperty;
 import org.hibernate.mapping.Collection;
 import org.hibernate.mapping.DependantValue;
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionSecondPassBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionSecondPassBinder.java
index 26b2f34cd0..b04ac51bfa 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionSecondPassBinder.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionSecondPassBinder.java
@@ -110,7 +110,7 @@ public class CollectionSecondPassBinder {
     } else if (property instanceof HibernateOneToManyProperty oneToManyProperty && oneToManyProperty.isUnidirectionalOneToMany()) {
       unidirectionalOneToManyBinder.bind(oneToManyProperty, collection);
     } else if (property.supportsJoinColumnMapping()) {
-      collectionWithJoinTableBinder.bindCollectionWithJoinTable(property, mappings, collection);
+      collectionWithJoinTableBinder.bindCollectionWithJoinTable(property, collection);
     }
   }
 
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionWithJoinTableBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionWithJoinTableBinder.java
index be671fdf8f..0aa05d7e44 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionWithJoinTableBinder.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionWithJoinTableBinder.java
@@ -26,7 +26,7 @@ import org.grails.orm.hibernate.cfg.domainbinding.binder.CollectionForPropertyCo
 import org.grails.orm.hibernate.cfg.domainbinding.binder.CompositeIdentifierToManyToOneBinder;
 import org.grails.orm.hibernate.cfg.domainbinding.binder.SimpleValueColumnBinder;
 import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateToManyProperty;
-import org.hibernate.boot.spi.InFlightMetadataCollector;
+
 import org.hibernate.mapping.*;
 
 /** Binds a collection with a join table. */
@@ -60,7 +60,6 @@ public class CollectionWithJoinTableBinder {
   /** Bind collection with join table. */
   public void bindCollectionWithJoinTable(
       @Nonnull HibernateToManyProperty property,
-      @Nonnull InFlightMetadataCollector mappings,
       @Nonnull Collection collection) {
 
     collection.setInverse(false);
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/ListSecondPass.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/ListSecondPass.java
index edeb426bb7..949ff4ffdd 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/ListSecondPass.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/ListSecondPass.java
@@ -47,7 +47,6 @@ public class ListSecondPass
     this.collection = coll;
   }
 
-  @SuppressWarnings("rawtypes")
   @Override
   public void doSecondPass(Map persistentClasses) throws MappingException {
     listSecondPassBinder.bindListSecondPass(
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/ListSecondPassBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/ListSecondPassBinder.java
index 955cb90a57..4fd1d67c30 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/ListSecondPassBinder.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/ListSecondPassBinder.java
@@ -96,9 +96,8 @@ public class ListSecondPassBinder {
 
       String entityName;
       Value element = list.getElement();
-      if (element instanceof ManyToOne) {
-        ManyToOne manyToOne = (ManyToOne) element;
-        entityName = manyToOne.getReferencedEntityName();
+      if (element instanceof ManyToOne manyToOne) {
+          entityName = manyToOne.getReferencedEntityName();
       } else {
         entityName = ((OneToMany) element).getReferencedEntityName();
       }
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/MapSecondPass.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/MapSecondPass.java
index 47eb3593f3..07374fd533 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/MapSecondPass.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/MapSecondPass.java
@@ -47,7 +47,6 @@ public class MapSecondPass
     this.collection = coll;
   }
 
-  @SuppressWarnings("rawtypes")
   @Override
   public void doSecondPass(Map persistentClasses) throws MappingException {
     mapSecondPassBinder.bindMapSecondPass(
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/MapSecondPassBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/MapSecondPassBinder.java
index 2d3b24df62..456d9c7c12 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/MapSecondPassBinder.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/MapSecondPassBinder.java
@@ -21,7 +21,6 @@ package org.grails.orm.hibernate.cfg.domainbinding.secondpass;
 import jakarta.annotation.Nonnull;
 import java.util.List;
 import java.util.Map;
-import org.grails.datastore.mapping.model.types.Basic;
 import org.grails.orm.hibernate.cfg.ColumnConfig;
 import org.grails.orm.hibernate.cfg.PersistentEntityNamingStrategy;
 import org.grails.orm.hibernate.cfg.PropertyConfig;
@@ -89,8 +88,9 @@ public class MapSecondPassBinder {
         && !(property instanceof HibernateManyToManyProperty)) {
 
       String typeName = null;
-      if (property instanceof Basic basic) {
-        typeName = property.getTypeName(basic.getComponentType());
+      Class<?> componentType = property.getComponentType();
+      if (componentType != null) {
+        typeName = property.getTypeName(componentType);
       }
 
       if (typeName == null) {
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/SetSecondPass.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/SetSecondPass.java
index cf2035451d..e19539af2f 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/SetSecondPass.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/SetSecondPass.java
@@ -54,7 +54,6 @@ public class SetSecondPass
     this.collection = coll;
   }
 
-  @SuppressWarnings("rawtypes")
   public void doSecondPass(Map persistentClasses) throws MappingException {
     collectionSecondPassBinder.bindCollectionSecondPass(
         property, mappings, persistentClasses, collection);
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/UnidirectionalOneToManyBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/UnidirectionalOneToManyBinder.java
index 1e2451e616..ea335df918 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/UnidirectionalOneToManyBinder.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/UnidirectionalOneToManyBinder.java
@@ -52,7 +52,7 @@ public class UnidirectionalOneToManyBinder {
       @Nonnull HibernateOneToManyProperty property,
       @Nonnull Collection collection) {
     if (!property.shouldBindWithForeignKey()) {
-      collectionWithJoinTableBinder.bindCollectionWithJoinTable(property, mappings, collection);
+      collectionWithJoinTableBinder.bindCollectionWithJoinTable(property, collection);
     } else {
       bindUnidirectionalOneToMany(property, collection);
     }
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/CascadeBehaviorFetcher.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/CascadeBehaviorFetcher.java
index 3b65475ee3..ba801613fe 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/CascadeBehaviorFetcher.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/CascadeBehaviorFetcher.java
@@ -25,9 +25,7 @@ import java.util.Optional;
 import org.grails.datastore.mapping.model.types.Association;
 import org.grails.datastore.mapping.model.types.Basic;
 import org.grails.datastore.mapping.model.types.Embedded;
-import org.grails.orm.hibernate.cfg.Mapping;
 import org.grails.orm.hibernate.cfg.PropertyConfig;
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentEntity;
 import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateManyToManyProperty;
 import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateManyToOneProperty;
 import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateOneToManyProperty;
@@ -102,10 +100,4 @@ public class CascadeBehaviorFetcher {
     }
   }
 
-  private Mapping getOwnersWrappedForm(Association<?> association) {
-    if (association.getOwner() instanceof GrailsHibernatePersistentEntity persistentEntity) {
-      return persistentEntity.getMappedForm();
-    }
-    return null;
-  }
 }
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionWithJoinTableBinderSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionWithJoinTableBinderSpec.groovy
index 1aa0ab2809..8bfb4954fc 100644
--- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionWithJoinTableBinderSpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionWithJoinTableBinderSpec.groovy
@@ -54,7 +54,7 @@ class CollectionWithJoinTableBinderSpec extends HibernateGormDatastoreSpec {
         basicCollectionElementBinder.bind(property, collection) >> basicValue
 
         when:
-        binder.bindCollectionWithJoinTable(property, mappings, collection)
+        binder.bindCollectionWithJoinTable(property, collection)
 
         then:
         1 * basicCollectionElementBinder.bind(property, collection) >> basicValue
@@ -79,7 +79,7 @@ class CollectionWithJoinTableBinderSpec extends HibernateGormDatastoreSpec {
         unidirectionalOneToManyInverseValuesBinder.bind(property, collection) >> manyToOne
 
         when:
-        binder.bindCollectionWithJoinTable(property, mappings, collection)
+        binder.bindCollectionWithJoinTable(property, collection)
 
         then:
         collection.getElement() instanceof ManyToOne


(grails-core) 04/27: refactor(hibernate7): fold AbstractHibernateEventListener into HibernateEventListener

Posted by bo...@apache.org.
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 bd2d1f812bf94bb7070a8f16916db56e58076e59
Author: Walter Duque de Estrada <wb...@mac.com>
AuthorDate: Wed Mar 4 09:33:58 2026 -0600

    refactor(hibernate7): fold AbstractHibernateEventListener into HibernateEventListener
---
 .../grails/orm/hibernate/HibernateDatastore.java   |  6 +-
 .../listener/AbstractHibernateEventListener.java   | 76 ----------------------
 .../event/listener/HibernateEventListener.java     | 26 +++++++-
 3 files changed, 28 insertions(+), 80 deletions(-)

diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/HibernateDatastore.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/HibernateDatastore.java
index 605149a7a1..94f6b27445 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/HibernateDatastore.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/HibernateDatastore.java
@@ -74,7 +74,7 @@ import org.grails.orm.hibernate.cfg.Settings;
 import org.grails.orm.hibernate.connections.HibernateConnectionSource;
 import org.grails.orm.hibernate.connections.HibernateConnectionSourceFactory;
 import org.grails.orm.hibernate.connections.HibernateConnectionSourceSettings;
-import org.grails.orm.hibernate.event.listener.AbstractHibernateEventListener;
+import org.grails.orm.hibernate.event.listener.HibernateEventListener;
 import org.grails.orm.hibernate.event.listener.HibernateEventListener;
 import org.grails.orm.hibernate.multitenancy.MultiTenantEventListener;
 import org.grails.orm.hibernate.support.ClosureEventTriggeringInterceptor;
@@ -146,7 +146,7 @@ public class HibernateDatastore extends AbstractDatastore
   protected final SchemaHandler schemaHandler;
 
   /** The event triggering interceptor. */
-  protected AbstractHibernateEventListener eventTriggeringInterceptor;
+  protected HibernateEventListener eventTriggeringInterceptor;
 
   /** The auto timestamp event listener. */
   protected AutoTimestampEventListener autoTimestampEventListener;
@@ -1073,7 +1073,7 @@ public class HibernateDatastore extends AbstractDatastore
   }
 
   /** For testing: returns the event triggering interceptor. */
-  public AbstractHibernateEventListener getEventTriggeringInterceptor() {
+  public HibernateEventListener getEventTriggeringInterceptor() {
     return eventTriggeringInterceptor;
   }
 
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/event/listener/AbstractHibernateEventListener.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/event/listener/AbstractHibernateEventListener.java
deleted file mode 100644
index 5007ac3ff4..0000000000
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/event/listener/AbstractHibernateEventListener.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.grails.orm.hibernate.event.listener;
-
-import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import org.grails.datastore.mapping.engine.event.AbstractPersistenceEvent;
-import org.grails.datastore.mapping.engine.event.AbstractPersistenceEventListener;
-import org.grails.orm.hibernate.HibernateDatastore;
-import org.grails.orm.hibernate.connections.HibernateConnectionSourceSettings;
-import org.grails.orm.hibernate.support.SoftKey;
-import org.springframework.context.ApplicationEvent;
-
-/**
- * Invokes closure events on domain entities such as beforeInsert, beforeUpdate and beforeDelete.
- *
- * @author Graeme Rocher
- * @author Lari Hotari
- * @author Burt Beckwith
- * @since 2.0
- */
-public abstract class AbstractHibernateEventListener extends AbstractPersistenceEventListener {
-
-  /** The cached should trigger. */
-  protected final transient ConcurrentMap<SoftKey<Class<?>>, Boolean> cachedShouldTrigger =
-      new ConcurrentHashMap<SoftKey<Class<?>>, Boolean>();
-
-  /** The fail on error. */
-  protected final boolean failOnError;
-
-  /** The fail on error packages. */
-  protected final List<?> failOnErrorPackages;
-
-  /** Creates a new {@link AbstractHibernateEventListener} instance. */
-  protected AbstractHibernateEventListener(HibernateDatastore datastore) {
-    super(datastore);
-    HibernateConnectionSourceSettings settings =
-        datastore.getConnectionSources().getDefaultConnectionSource().getSettings();
-    this.failOnError = settings.isFailOnError();
-    this.failOnErrorPackages = settings.getFailOnErrorPackages();
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * @see org.springframework.context.event.SmartApplicationListener#supportsEventType(
-   *     java.lang.Class)
-   */
-  public boolean supportsEventType(Class<? extends ApplicationEvent> eventType) {
-    return AbstractPersistenceEvent.class.isAssignableFrom(eventType);
-  }
-
-  /**
-   * @return The hibernate datastore
-   */
-  protected HibernateDatastore getDatastore() {
-    return (HibernateDatastore) this.datastore;
-  }
-}
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 bbd3005b67..bee8eb02e5 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
@@ -19,15 +19,18 @@
 package org.grails.orm.hibernate.event.listener;
 
 import grails.gorm.MultiTenant;
+import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import org.grails.datastore.gorm.timestamp.DefaultTimestampProvider;
 import org.grails.datastore.gorm.timestamp.TimestampProvider;
 import org.grails.datastore.mapping.engine.event.AbstractPersistenceEvent;
+import org.grails.datastore.mapping.engine.event.AbstractPersistenceEventListener;
 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.connections.HibernateConnectionSourceSettings;
 import org.grails.orm.hibernate.support.ClosureEventListener;
 import org.grails.orm.hibernate.support.SoftKey;
 import org.hibernate.Hibernate;
@@ -44,13 +47,34 @@ import org.springframework.context.ApplicationEvent;
  * @since 2.0
  */
 @SuppressWarnings({"PMD.CloseResource", "PMD.DataflowAnomalyAnalysis"})
-public class HibernateEventListener extends AbstractHibernateEventListener {
+public class HibernateEventListener extends AbstractPersistenceEventListener {
+
+  /** The cached should trigger. */
+  protected final transient ConcurrentMap<SoftKey<Class<?>>, Boolean> cachedShouldTrigger =
+      new ConcurrentHashMap<SoftKey<Class<?>>, Boolean>();
+
+  /** The fail on error. */
+  protected final boolean failOnError;
+
+  /** The fail on error packages. */
+  protected final List<?> failOnErrorPackages;
 
   protected transient ConcurrentMap<SoftKey<Class<?>>, ClosureEventListener> eventListeners =
       new ConcurrentHashMap<>();
 
   public HibernateEventListener(HibernateDatastore datastore) {
     super(datastore);
+    HibernateConnectionSourceSettings settings =
+        datastore.getConnectionSources().getDefaultConnectionSource().getSettings();
+    this.failOnError = settings.isFailOnError();
+    this.failOnErrorPackages = settings.getFailOnErrorPackages();
+  }
+
+  /**
+   * @return The hibernate datastore
+   */
+  protected HibernateDatastore getDatastore() {
+    return (HibernateDatastore) this.datastore;
   }
 
   @Override


(grails-core) 17/27: refactor(hibernate7): type safety, API modernisation, and spec coverage

Posted by bo...@apache.org.
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 19c8b9bdf2d71b8285cb764dbb88fe55cce44891
Author: Walter Duque de Estrada <wb...@mac.com>
AuthorDate: Wed Mar 4 16:58:38 2026 -0600

    refactor(hibernate7): type safety, API modernisation, and spec coverage
---
 .../cfg/domainbinding/binder/CollectionBinder.java       |   2 --
 .../hibernate/cfg/domainbinding/binder/ColumnBinder.java |   6 +-----
 .../connections/HibernateConnectionSourceFactory.java    |  12 +++++++-----
 .../compiler/HibernateEntityTransformationSpec.groovy    |   2 ++
 org/hibernate/engine/spi/ManagedEntity.class             | Bin 0 -> 1528 bytes
 .../engine/spi/PersistentAttributeInterceptable.class    | Bin 0 -> 707 bytes
 .../engine/spi/PersistentAttributeInterceptor.class      | Bin 0 -> 2373 bytes
 7 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/CollectionBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/CollectionBinder.java
index adea9b6d82..114e01ec05 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/CollectionBinder.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/CollectionBinder.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.JoinTable;
 import org.grails.orm.hibernate.cfg.PersistentEntityNamingStrategy;
@@ -67,7 +66,6 @@ import org.slf4j.LoggerFactory;
 @SuppressWarnings("PMD.DataflowAnomalyAnalysis")
 public class CollectionBinder {
 
-  private static final Logger LOG = LoggerFactory.getLogger(CollectionBinder.class);
 
   private final MetadataBuildingContext metadataBuildingContext;
   private final PersistentEntityNamingStrategy namingStrategy;
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ColumnBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ColumnBinder.java
index b68a726b51..d08d1b92a4 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ColumnBinder.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ColumnBinder.java
@@ -114,11 +114,7 @@ public class ColumnBinder {
       } else if (property instanceof HibernateOneToOneProperty
           && association.isBidirectional()
           && !association.isOwningSide()) {
-        if (association.getInverseSide().isHasOne()) {
-          column.setNullable(false);
-        } else {
-          column.setNullable(true);
-        }
+          column.setNullable(!association.getInverseSide().isHasOne());
       } else if ((property instanceof ToOne) && association.isCircular()) {
         column.setNullable(true);
       } else {
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceFactory.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceFactory.java
index 854acb3943..3e1fd89df3 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceFactory.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceFactory.java
@@ -24,6 +24,9 @@ import java.io.Serializable;
 import java.util.Collections;
 import java.util.Map;
 import javax.sql.DataSource;
+
+import jakarta.annotation.Nullable;
+
 import org.grails.datastore.gorm.jdbc.connections.CachedDataSourceConnectionSourceFactory;
 import org.grails.datastore.gorm.jdbc.connections.DataSourceConnectionSourceFactory;
 import org.grails.datastore.gorm.jdbc.connections.DataSourceSettings;
@@ -40,7 +43,6 @@ import org.grails.orm.hibernate.cfg.HibernateMappingContextConfiguration;
 import org.grails.orm.hibernate.cfg.Settings;
 import org.grails.orm.hibernate.cfg.domainbinding.binder.GrailsDomainBinder;
 import org.grails.orm.hibernate.support.ClosureEventTriggeringInterceptor;
-import org.grails.orm.hibernate.support.ClosureEventTriggeringInterceptor;
 import org.hibernate.Interceptor;
 import org.hibernate.SessionFactory;
 import org.hibernate.boot.model.naming.PhysicalNamingStrategy;
@@ -79,7 +81,7 @@ public class HibernateConnectionSourceFactory
       new CachedDataSourceConnectionSourceFactory();
 
   protected HibernateMappingContext mappingContext;
-  protected Class<?>[] persistentClasses = new Class<?>[0];
+  protected Class<?>[] persistentClasses;
   private ApplicationContext applicationContext;
   protected HibernateEventListeners hibernateEventListeners;
   protected Interceptor interceptor;
@@ -289,7 +291,7 @@ public class HibernateConnectionSourceFactory
       String qualified = Settings.SETTING_DATASOURCES + '.' + Settings.SETTING_DATASOURCE;
       HibernateConnectionSourceSettings settings =
           new HibernateConnectionSourceSettingsBuilder(configuration, "", fallbackSettings).build();
-      Map config = configuration.getProperty(qualified, Map.class, Collections.emptyMap());
+      var config = configuration.getProperty(qualified, Map.class, Collections.emptyMap());
       if (!config.isEmpty()) {
         DataSourceSettings dsFallback = extractDataSourceFallback(fallbackSettings);
         settings.setDataSource(
@@ -330,13 +332,13 @@ public class HibernateConnectionSourceFactory
   }
 
   @Override
-  public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+  public void setApplicationContext(@Nullable  ApplicationContext applicationContext) throws BeansException {
     this.applicationContext = applicationContext;
     this.messageSource = applicationContext;
   }
 
   @Override
-  public void setMessageSource(MessageSource messageSource) {
+  public void setMessageSource(@Nullable MessageSource messageSource) {
     this.messageSource = messageSource;
   }
 }
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/compiler/HibernateEntityTransformationSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/compiler/HibernateEntityTransformationSpec.groovy
index c5c6d681da..b3f75d993a 100644
--- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/compiler/HibernateEntityTransformationSpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/compiler/HibernateEntityTransformationSpec.groovy
@@ -184,5 +184,7 @@ class MyEntity {
         cls.getMethod('$$_hibernate_getNextManagedEntity').isAnnotationPresent(Generated)
         cls.getMethod('$$_hibernate_setPreviousManagedEntity', ManagedEntity).isAnnotationPresent(Generated)
         cls.getMethod('$$_hibernate_setNextManagedEntity', ManagedEntity).isAnnotationPresent(Generated)
+        cls.getMethod('$$_hibernate_getInstanceId').isAnnotationPresent(Generated)
+        cls.getMethod('$$_hibernate_setInstanceId', int).isAnnotationPresent(Generated)
     }
 }
\ No newline at end of file
diff --git a/org/hibernate/engine/spi/ManagedEntity.class b/org/hibernate/engine/spi/ManagedEntity.class
new file mode 100644
index 0000000000..beb6247ca7
Binary files /dev/null and b/org/hibernate/engine/spi/ManagedEntity.class differ
diff --git a/org/hibernate/engine/spi/PersistentAttributeInterceptable.class b/org/hibernate/engine/spi/PersistentAttributeInterceptable.class
new file mode 100644
index 0000000000..e7ecf16f75
Binary files /dev/null and b/org/hibernate/engine/spi/PersistentAttributeInterceptable.class differ
diff --git a/org/hibernate/engine/spi/PersistentAttributeInterceptor.class b/org/hibernate/engine/spi/PersistentAttributeInterceptor.class
new file mode 100644
index 0000000000..9c1b81f203
Binary files /dev/null and b/org/hibernate/engine/spi/PersistentAttributeInterceptor.class differ


(grails-core) 20/27: cleanup(hibernate7): Make SimpleValueBinder.bindSimpleValue return SimpleValue

Posted by bo...@apache.org.
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 e639f023f123447ec399b21b49c2b00a11a01ff2
Author: Walter Duque de Estrada <wb...@mac.com>
AuthorDate: Wed Mar 4 19:09:59 2026 -0600

    cleanup(hibernate7):  Make SimpleValueBinder.bindSimpleValue return SimpleValue
---
 .../cfg/domainbinding/binder/CollectionBinder.java   |  3 +--
 .../cfg/domainbinding/binder/ComponentUpdater.java   |  2 --
 .../binder/CompositeIdentifierToManyToOneBinder.java |  2 +-
 .../cfg/domainbinding/binder/GrailsDomainBinder.java |  4 +---
 .../domainbinding/binder/GrailsPropertyBinder.java   |  2 +-
 .../cfg/domainbinding/binder/IdentityBinder.java     |  3 +--
 .../domainbinding/binder/JoinedSubClassBinder.java   |  7 +++----
 .../domainbinding/binder/ManyToOneValuesBinder.java  |  2 +-
 .../cfg/domainbinding/binder/RootBinder.java         |  2 +-
 .../RootPersistentClassCommonValuesBinder.java       |  7 +++----
 .../cfg/domainbinding/binder/SimpleValueBinder.java  | 18 +++++-------------
 .../binder/SingleTableSubclassBinder.java            |  8 +++-----
 .../cfg/domainbinding/binder/SubClassBinder.java     |  1 -
 .../domainbinding/binder/SubclassMappingBinder.java  |  2 +-
 .../cfg/domainbinding/binder/VersionBinder.java      | 12 ------------
 .../hibernate/HibernatePersistentEntity.java         | 20 +++++++-------------
 .../cfg/domainbinding/IdentityBinderSpec.groovy      | 12 ++++++------
 .../cfg/domainbinding/binder/RootBinderSpec.groovy   |  4 ++--
 .../RootPersistentClassCommonValuesBinderSpec.groovy |  4 ++--
 .../binder/SingleTableSubclassBinderSpec.groovy      |  2 +-
 .../binder/SubclassMappingBinderSpec.groovy          |  7 ++-----
 21 files changed, 42 insertions(+), 82 deletions(-)

diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/CollectionBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/CollectionBinder.java
index 114e01ec05..a0cc85e653 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/CollectionBinder.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/CollectionBinder.java
@@ -59,8 +59,7 @@ import org.hibernate.mapping.Collection;
 import org.hibernate.mapping.OneToMany;
 import org.hibernate.mapping.PersistentClass;
 import org.hibernate.mapping.Table;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
 
 /** Handles the binding of collections to the Hibernate runtime meta model. */
 @SuppressWarnings("PMD.DataflowAnomalyAnalysis")
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ComponentUpdater.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ComponentUpdater.java
index 996f8640a3..f480774f14 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ComponentUpdater.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ComponentUpdater.java
@@ -18,8 +18,6 @@
  */
 package org.grails.orm.hibernate.cfg.domainbinding.binder;
 
-import java.util.Iterator;
-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.mapping.Column;
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 785403f21d..0d115077b3 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
@@ -138,6 +138,6 @@ public class CompositeIdentifierToManyToOneBinder {
     }
 
     private String join(String... parts) {
-        return Arrays.stream(parts).map(backticksRemover::apply).collect(Collectors.joining(String.valueOf(UNDERSCORE)));
+        return Arrays.stream(parts).map(backticksRemover).collect(Collectors.joining(String.valueOf(UNDERSCORE)));
     }
 }
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 2e00e23af4..3fb45b072f 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
@@ -58,7 +58,6 @@ import org.slf4j.LoggerFactory;
 public class GrailsDomainBinder implements AdditionalMappingContributor, TypeContributor {
 
   public static final String FOREIGN_KEY_SUFFIX = "_id";
-  private static final String STRING_TYPE = "string";
   public static final String EMPTY_PATH = "";
   public static final char UNDERSCORE = '_';
 
@@ -245,8 +244,7 @@ public class GrailsDomainBinder implements AdditionalMappingContributor, TypeCon
     hibernateMappingContext.getHibernatePersistentEntities(dataSourceName).stream()
         .filter(persistentEntity -> persistentEntity.forGrailsDomainMapping(dataSourceName))
         .forEach(
-            hibernatePersistentEntity ->
-                rootBinder.bindRoot(hibernatePersistentEntity));
+                rootBinder::bindRoot);
   }
 
   /**
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 19f1ea72af..e9d32d668b 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
@@ -76,7 +76,7 @@ public class GrailsPropertyBinder {
               + "]");
     }
 
-    Value value = null;
+    Value value;
 
     // 1. Create Value and apply binders (consolidated block)
     if (currentGrailsProp instanceof HibernateEnumProperty) {
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 fd06e02768..90e987e1db 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
@@ -24,7 +24,7 @@ import org.grails.orm.hibernate.cfg.Identity;
 import org.grails.orm.hibernate.cfg.Mapping;
 import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentEntity;
 import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateIdentity;
-import org.hibernate.boot.spi.InFlightMetadataCollector;
+
 import org.hibernate.mapping.RootClass;
 
 public class IdentityBinder {
@@ -40,7 +40,6 @@ public class IdentityBinder {
   public void bindIdentity(
       @Nonnull GrailsHibernatePersistentEntity domainClass,
       RootClass root,
-      @Nonnull InFlightMetadataCollector mappings,
       Mapping gormMapping) {
 
     HibernateIdentity id = gormMapping != null ? gormMapping.getIdentity() : null;
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/JoinedSubClassBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/JoinedSubClassBinder.java
index 35830aac15..2f5fdaa73c 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/JoinedSubClassBinder.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/JoinedSubClassBinder.java
@@ -82,7 +82,7 @@ public class JoinedSubClassBinder {
         mappings.addTable(
             schemaName,
             catalogName,
-            getJoinedSubClassTableName(sub, joinedSubclass, null),
+            getJoinedSubClassTableName(sub, joinedSubclass),
             null,
             false,
             metadataBuildingContext);
@@ -111,8 +111,7 @@ public class JoinedSubClassBinder {
 
   private String getJoinedSubClassTableName(
       GrailsHibernatePersistentEntity sub,
-      PersistentClass model,
-      Table denormalizedSuperTable) {
+      PersistentClass model) {
 
     String logicalTableName = GrailsHibernateUtil.unqualify(model.getEntityName());
     String physicalTableName = sub.getTableName(namingStrategy);
@@ -121,7 +120,7 @@ public class JoinedSubClassBinder {
     String catalogName = sub.getCatalog(mappings);
 
     mappings.addTableNameBinding(
-        schemaName, catalogName, logicalTableName, physicalTableName, denormalizedSuperTable);
+        schemaName, catalogName, logicalTableName, physicalTableName, null);
     return physicalTableName;
   }
 }
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ManyToOneValuesBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ManyToOneValuesBinder.java
index a37002ecfc..255af28272 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ManyToOneValuesBinder.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ManyToOneValuesBinder.java
@@ -34,7 +34,7 @@ public class ManyToOneValuesBinder {
     var fetchMode = Optional.ofNullable(config.getFetchMode()).orElse(FetchMode.DEFAULT);
     manyToOne.setFetchMode(fetchMode);
 
-    var lazy = Optional.ofNullable(config.getLazy()).orElse(property != null);
+    var lazy = Optional.ofNullable(config.getLazy()).orElse(true);
     manyToOne.setLazy(lazy);
 
     manyToOne.setIgnoreNotFound(config.getIgnoreNotFound());
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/RootBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/RootBinder.java
index 2f52401cc7..5fd2a224f5 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/RootBinder.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/RootBinder.java
@@ -71,7 +71,7 @@ public class RootBinder {
     Collection<GrailsHibernatePersistentEntity> children = entity.getChildEntities(dataSourceName);
     RootClass root =
         rootPersistentClassCommonValuesBinder.bindRootPersistentClassCommonValues(
-            entity, children);
+            entity);
 
     if (!children.isEmpty() && entity.isTablePerHierarchy()) {
       discriminatorPropertyBinder.bindDiscriminatorProperty(root);
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 1b8efc451d..781a7ade71 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
@@ -21,7 +21,7 @@ package org.grails.orm.hibernate.cfg.domainbinding.binder;
 import static java.util.Optional.ofNullable;
 
 import jakarta.annotation.Nonnull;
-import java.util.Collection;
+
 import org.grails.orm.hibernate.cfg.CacheConfig;
 import org.grails.orm.hibernate.cfg.Mapping;
 import org.grails.orm.hibernate.cfg.PersistentEntityNamingStrategy;
@@ -62,8 +62,7 @@ public class RootPersistentClassCommonValuesBinder {
   }
 
   public RootClass bindRootPersistentClassCommonValues(
-      @Nonnull GrailsHibernatePersistentEntity domainClass,
-      @Nonnull Collection<GrailsHibernatePersistentEntity> children) {
+      @Nonnull GrailsHibernatePersistentEntity domainClass) {
 
     RootClass root = new RootClass(this.metadataBuildingContext);
     root.setAbstract(domainClass.isAbstract());
@@ -108,7 +107,7 @@ public class RootPersistentClassCommonValuesBinder {
               + root.getTable().getName());
     }
 
-    identityBinder.bindIdentity(domainClass, root, mappings, gormMapping);
+    identityBinder.bindIdentity(domainClass, root, gormMapping);
     versionBinder.bindVersion(domainClass.getVersion(), root);
     root.createPrimaryKey();
     classPropertiesBinder.bindClassProperties(domainClass, root);
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/SimpleValueBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/SimpleValueBinder.java
index 161ac76f3d..f4e303606e 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/SimpleValueBinder.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/SimpleValueBinder.java
@@ -24,7 +24,6 @@ import org.grails.orm.hibernate.cfg.ColumnConfig;
 import org.grails.orm.hibernate.cfg.PersistentEntityNamingStrategy;
 import org.grails.orm.hibernate.cfg.PropertyConfig;
 import org.grails.orm.hibernate.cfg.domainbinding.generator.GrailsSequenceWrapper;
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentEntity;
 import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty;
 import org.hibernate.boot.spi.MetadataBuildingContext;
 import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
@@ -76,15 +75,7 @@ public class SimpleValueBinder {
         new GrailsSequenceWrapper());
   }
 
-  /** Protected constructor for testing purposes. */
-  protected SimpleValueBinder() {
-    this.metadataBuildingContext = null;
-    this.namingStrategy = null;
-    this.columnConfigToColumnBinder = null;
-    this.columnBinder = null;
-    this.jdbcEnvironment = null;
-    this.grailsSequenceWrapper = null;
-  }
+
 
   public BasicValue bindSimpleValue(
       @jakarta.annotation.Nonnull HibernatePersistentProperty property,
@@ -92,11 +83,11 @@ public class SimpleValueBinder {
       Table table,
       String path) {
     BasicValue basicValue = new BasicValue(metadataBuildingContext, table);
-    bindSimpleValue(property, parentProperty, (SimpleValue) basicValue, path);
+    bindSimpleValue(property, parentProperty, basicValue, path);
     return basicValue;
   }
 
-  public void bindSimpleValue(
+  public SimpleValue bindSimpleValue(
       @jakarta.annotation.Nonnull HibernatePersistentProperty property,
       HibernatePersistentProperty parentProperty,
       SimpleValue simpleValue,
@@ -143,6 +134,7 @@ public class SimpleValueBinder {
                 simpleValue.addColumn(column);
               });
     }
+    return simpleValue;
   }
 
   private Generator createGenerator(
@@ -153,7 +145,7 @@ public class SimpleValueBinder {
         generatorName,
         context,
         null,
-        (GrailsHibernatePersistentEntity) property.getHibernateOwner(),
+            property.getHibernateOwner(),
         jdbcEnvironment,
         namingStrategy);
   }
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/SingleTableSubclassBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/SingleTableSubclassBinder.java
index 574d99b87f..67b8866d6c 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/SingleTableSubclassBinder.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/SingleTableSubclassBinder.java
@@ -20,7 +20,7 @@ package org.grails.orm.hibernate.cfg.domainbinding.binder;
 
 import jakarta.annotation.Nonnull;
 import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentEntity;
-import org.hibernate.boot.spi.InFlightMetadataCollector;
+
 import org.hibernate.mapping.SingleTableSubclass;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -43,14 +43,12 @@ public class SingleTableSubclassBinder {
   /**
    * Binds a sub-class using table-per-hierarchy inheritance mapping
    *
-   * @param sub The Grails domain class instance representing the sub-class
+   * @param sub      The Grails domain class instance representing the sub-class
    * @param subClass The Hibernate SubClass instance
-   * @param mappings The mappings instance
    */
   public void bindSubClass(
       @Nonnull GrailsHibernatePersistentEntity sub,
-      SingleTableSubclass subClass,
-      @Nonnull InFlightMetadataCollector mappings) {
+      SingleTableSubclass subClass) {
     classBinder.bindClass(sub, subClass);
     subClass.setDiscriminatorValue(sub.getDiscriminatorValue());
     if (LOG.isDebugEnabled()) {
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 2a5b3c1495..bddd67c6f2 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
@@ -19,7 +19,6 @@
 package org.grails.orm.hibernate.cfg.domainbinding.binder;
 
 import jakarta.annotation.Nonnull;
-import java.util.Collection;
 import org.grails.orm.hibernate.cfg.MappingCacheHolder;
 import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentEntity;
 import org.grails.orm.hibernate.cfg.domainbinding.util.MultiTenantFilterBinder;
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 4ec70d17d8..0a2198460a 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
@@ -71,7 +71,7 @@ public class SubclassMappingBinder {
 
       var singleTableSubclass = new SingleTableSubclass(parent, this.metadataBuildingContext);
 
-      singleTableSubclassBinder.bindSubClass(subEntity, singleTableSubclass, mappings);
+      singleTableSubclassBinder.bindSubClass(subEntity, singleTableSubclass);
       subClass = singleTableSubclass;
     }
 
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/VersionBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/VersionBinder.java
index fc6455c721..8dbbb308eb 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/VersionBinder.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/VersionBinder.java
@@ -21,11 +21,9 @@ package org.grails.orm.hibernate.cfg.domainbinding.binder;
 import static org.grails.orm.hibernate.cfg.domainbinding.binder.GrailsDomainBinder.EMPTY_PATH;
 
 import java.util.function.BiFunction;
-import org.grails.orm.hibernate.cfg.PersistentEntityNamingStrategy;
 import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty;
 import org.hibernate.boot.spi.MetadataBuildingContext;
 import org.hibernate.engine.OptimisticLockStyle;
-import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
 import org.hibernate.mapping.BasicValue;
 import org.hibernate.mapping.Property;
 import org.hibernate.mapping.RootClass;
@@ -49,16 +47,6 @@ public class VersionBinder {
     this.basicValueFactory = basicValueFactory;
   }
 
-  public VersionBinder(
-      MetadataBuildingContext metadataBuildingContext,
-      PersistentEntityNamingStrategy namingStrategy,
-      JdbcEnvironment jdbcEnvironment) {
-    this(
-        metadataBuildingContext,
-        new SimpleValueBinder(metadataBuildingContext, namingStrategy, jdbcEnvironment),
-        new PropertyBinder(),
-        BasicValue::new);
-  }
 
   public void bindVersion(HibernatePersistentProperty version, RootClass entity) {
 
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernatePersistentEntity.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernatePersistentEntity.java
index d9bc160a16..b029e1d6ec 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernatePersistentEntity.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernatePersistentEntity.java
@@ -19,6 +19,7 @@
 package org.grails.orm.hibernate.cfg.domainbinding.hibernate;
 
 import jakarta.persistence.Entity;
+import java.util.Arrays;
 import java.util.Optional;
 import org.grails.datastore.mapping.core.connections.ConnectionSourcesSupport;
 import org.grails.datastore.mapping.model.*;
@@ -35,7 +36,7 @@ public class HibernatePersistentEntity extends AbstractPersistentEntity<Mapping>
   private final AbstractClassMapping<Mapping> classMapping;
   private String dataSourceName;
 
-  public HibernatePersistentEntity(Class javaClass, final MappingContext context) {
+  public HibernatePersistentEntity(Class<?> javaClass, final MappingContext context) {
     super(javaClass, context);
 
     this.classMapping = new HibernateClassMapping(this, context);
@@ -51,10 +52,6 @@ public class HibernatePersistentEntity extends AbstractPersistentEntity<Mapping>
     return dataSourceName;
   }
 
-  @Override
-  protected boolean includeIdentifiers() {
-    return true;
-  }
 
   @Override
   public ClassMapping<Mapping> getMapping() {
@@ -73,16 +70,13 @@ public class HibernatePersistentEntity extends AbstractPersistentEntity<Mapping>
   @Override
   @SuppressWarnings({"PMD.DataflowAnomalyAnalysis", "PMD.NullAssignment"})
   public HibernatePersistentProperty[] getCompositeIdentity() {
-    PersistentProperty[] compositeIdentity = super.getCompositeIdentity();
+    PersistentProperty<?>[] compositeIdentity = super.getCompositeIdentity();
     if (compositeIdentity == null) {
       return new HibernatePersistentProperty[0];
     }
-    HibernatePersistentProperty[] result =
-        new HibernatePersistentProperty[compositeIdentity.length];
-    for (int i = 0; i < compositeIdentity.length; i++) {
-      result[i] = compositeIdentity[i] instanceof HibernatePersistentProperty ghpp ? ghpp : null;
-    }
-    return result;
+    return Arrays.stream(compositeIdentity)
+        .map(p -> (HibernatePersistentProperty) p)
+        .toArray(HibernatePersistentProperty[]::new);
   }
 
   private boolean isAnnotatedEntity() {
@@ -99,6 +93,6 @@ public class HibernatePersistentEntity extends AbstractPersistentEntity<Mapping>
 
   @Override
   public HibernatePersistentProperty getVersion() {
-    return version instanceof HibernatePersistentProperty ghpp ? ghpp : null;
+    return (HibernatePersistentProperty )version;
   }
 }
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 baff483d68..d7fa1be417 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
@@ -37,7 +37,7 @@ class IdentityBinderSpec extends HibernateGormDatastoreSpec {
         domainClass.getCompositeIdentity() >> null
 
         when:
-        binder.bindIdentity(domainClass, root, mappings, null)
+        binder.bindIdentity(domainClass, root, null)
 
         then:
         1 * simpleIdBinder.bindSimpleId(domainClass, root, null, _)
@@ -52,7 +52,7 @@ class IdentityBinderSpec extends HibernateGormDatastoreSpec {
         domainClass.getCompositeIdentity() >> compositeProps
 
         when:
-        binder.bindIdentity(domainClass, root, mappings, null)
+        binder.bindIdentity(domainClass, root, null)
 
         then:
         1 * compositeIdBinder.bindCompositeId(domainClass, root, null)
@@ -68,7 +68,7 @@ class IdentityBinderSpec extends HibernateGormDatastoreSpec {
         gormMapping.getIdentity() >> compositeIdentity
 
         when:
-        binder.bindIdentity(domainClass, root, mappings, gormMapping)
+        binder.bindIdentity(domainClass, root, gormMapping)
 
         then:
         1 * compositeIdBinder.bindCompositeId(domainClass, root, compositeIdentity)
@@ -88,7 +88,7 @@ class IdentityBinderSpec extends HibernateGormDatastoreSpec {
         domainClass.getName() >> "MyEntity"
 
         when:
-        binder.bindIdentity(domainClass, root, mappings, gormMapping)
+        binder.bindIdentity(domainClass, root, gormMapping)
 
         then:
         1 * simpleIdBinder.bindSimpleId(domainClass, root, identity, _)
@@ -107,7 +107,7 @@ class IdentityBinderSpec extends HibernateGormDatastoreSpec {
         domainClass.getName() >> "MyEntity"
 
         when:
-        binder.bindIdentity(domainClass, root, mappings, gormMapping)
+        binder.bindIdentity(domainClass, root, gormMapping)
 
         then:
         1 * simpleIdBinder.bindSimpleId(domainClass, root, identity, _)
@@ -127,7 +127,7 @@ class IdentityBinderSpec extends HibernateGormDatastoreSpec {
         domainClass.getName() >> "MyEntity"
 
         when:
-        binder.bindIdentity(domainClass, root, mappings, gormMapping)
+        binder.bindIdentity(domainClass, root, gormMapping)
 
         then:
         identity.getName() == "MyEntity"
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/RootBinderSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/RootBinderSpec.groovy
index df21696b11..790546e79d 100644
--- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/RootBinderSpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/RootBinderSpec.groovy
@@ -57,7 +57,7 @@ class RootBinderSpec extends HibernateGormDatastoreSpec {
         binder.bindRoot(entity)
 
         then:
-        1 * rootPersistentClassCommonValuesBinder.bindRootPersistentClassCommonValues(entity, []) >> rootClass
+        1 * rootPersistentClassCommonValuesBinder.bindRootPersistentClassCommonValues(entity) >> rootClass
         0 * discriminatorPropertyBinder.bindDiscriminatorProperty(_)
         0 * subClassBinder.bindSubClass(_, _)
         1 * multiTenantFilterBinder.bind(entity, rootClass)
@@ -84,7 +84,7 @@ class RootBinderSpec extends HibernateGormDatastoreSpec {
         binder.bindRoot(entity)
 
         then:
-        1 * rootPersistentClassCommonValuesBinder.bindRootPersistentClassCommonValues(entity, [childEntity]) >> rootClass
+        1 * rootPersistentClassCommonValuesBinder.bindRootPersistentClassCommonValues(entity) >> rootClass
         1 * discriminatorPropertyBinder.bindDiscriminatorProperty(rootClass)
         1 * subClassBinder.bindSubClass(childEntity, rootClass)
         1 * multiTenantFilterBinder.bind(entity, rootClass)
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 49878ddaee..fbb838dbe5 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
@@ -53,7 +53,7 @@ class RootPersistentClassCommonValuesBinderSpec extends HibernateGormDatastoreSp
         def mappings = getCollector()
 
         when:
-        RootClass rootClass = binder.bindRootPersistentClassCommonValues(entity, [])
+        RootClass rootClass = binder.bindRootPersistentClassCommonValues(entity)
 
         then:
         1 * classPropertiesBinder.bindClassProperties(entity, _)
@@ -69,7 +69,7 @@ class RootPersistentClassCommonValuesBinderSpec extends HibernateGormDatastoreSp
         def mappings = getCollector()
 
         when:
-        RootClass rootClass = binder.bindRootPersistentClassCommonValues(entity, [])
+        RootClass rootClass = binder.bindRootPersistentClassCommonValues(entity)
 
         then:
         rootClass != null
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/SingleTableSubclassBinderSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/SingleTableSubclassBinderSpec.groovy
index ee4844fdf0..a3bcea9100 100644
--- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/SingleTableSubclassBinderSpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/SingleTableSubclassBinderSpec.groovy
@@ -41,7 +41,7 @@ class SingleTableSubclassBinderSpec extends HibernateGormDatastoreSpec {
         singleTableSubclass.setEntityName(SingleTableSubClassSub.name)
 
         when:
-        binder.bindSubClass(subEntity, singleTableSubclass, mappings)
+        binder.bindSubClass(subEntity, singleTableSubclass)
 
         then:
         singleTableSubclass.getTable() == rootTable
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 55eb97790e..fa93644daf 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
@@ -2,16 +2,13 @@ package org.grails.orm.hibernate.cfg.domainbinding.binder
 
 import grails.gorm.annotation.Entity
 import grails.gorm.specs.HibernateGormDatastoreSpec
-import org.grails.orm.hibernate.cfg.Mapping
+
 import org.hibernate.boot.spi.MetadataBuildingContext
 import org.hibernate.mapping.JoinedSubclass
-import org.hibernate.mapping.PersistentClass
 import org.hibernate.mapping.RootClass
 import org.hibernate.mapping.SingleTableSubclass
 import org.hibernate.mapping.Subclass
 import org.hibernate.mapping.UnionSubclass
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentEntity
-import spock.lang.Shared
 
 class SubclassMappingBinderSpec extends HibernateGormDatastoreSpec {
 
@@ -53,7 +50,7 @@ class SubclassMappingBinderSpec extends HibernateGormDatastoreSpec {
 
         then:
         subEntity != null
-        1 * singleTableSubclassBinder.bindSubClass(subEntity, _ as SingleTableSubclass, mappings)
+        1 * singleTableSubclassBinder.bindSubClass(subEntity, _ as SingleTableSubclass)
         1 * classPropertiesBinder.bindClassProperties(subEntity, _ as Subclass)
         subClass instanceof SingleTableSubclass
         subClass.getEntityName() == SMBSSingleSub.name


(grails-core) 11/27: change HibernateQueryConstants to HibernateQueryArgument

Posted by bo...@apache.org.
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 4eae0967636472146dc787ee6f1300099305ddab
Author: Walter Duque de Estrada <wb...@mac.com>
AuthorDate: Wed Mar 4 13:45:28 2026 -0600

    change HibernateQueryConstants to HibernateQueryArgument
---
 .../groovy/grails/orm/CriteriaMethodInvoker.java   |  8 +--
 .../grails/orm/hibernate/HibernateDatastore.java   | 23 ++++---
 .../orm/hibernate/cfg/GrailsHibernateUtil.java     | 57 ++++++++++++----
 .../hibernate/query/GrailsHibernateQueryUtils.java | 63 +++++++++---------
 .../orm/hibernate/query/HibernateHqlQuery.java     | 15 ++---
 .../hibernate/query/HibernateQueryArgument.java    | 75 ++++++++++++++++++++++
 .../hibernate/query/HibernateQueryConstants.java   | 41 ++++++------
 7 files changed, 193 insertions(+), 89 deletions(-)

diff --git a/grails-data-hibernate7/core/src/main/groovy/grails/orm/CriteriaMethodInvoker.java b/grails-data-hibernate7/core/src/main/groovy/grails/orm/CriteriaMethodInvoker.java
index 1ab0d4a48c..9dae907053 100644
--- a/grails-data-hibernate7/core/src/main/groovy/grails/orm/CriteriaMethodInvoker.java
+++ b/grails-data-hibernate7/core/src/main/groovy/grails/orm/CriteriaMethodInvoker.java
@@ -31,7 +31,7 @@ import java.util.Collection;
 import java.util.Map;
 import org.grails.datastore.mapping.query.Query;
 import org.grails.orm.hibernate.query.HibernateQuery;
-import org.grails.orm.hibernate.query.HibernateQueryConstants;
+import org.grails.orm.hibernate.query.HibernateQueryArgument;
 import org.springframework.beans.BeanUtils;
 
 public class CriteriaMethodInvoker {
@@ -104,11 +104,11 @@ public class CriteriaMethodInvoker {
         result = hibernateQuery.singleResult();
       } else if (builder.isPaginationEnabledList()) {
         Map argMap = (Map) args[0];
-        final String sortField = (String) argMap.get(HibernateQueryConstants.ARGUMENT_SORT);
+        final String sortField = (String) argMap.get(HibernateQueryArgument.SORT.value());
         if (sortField != null) {
           final boolean ignoreCase =
-              !(argMap.get(HibernateQueryConstants.ARGUMENT_IGNORE_CASE) instanceof Boolean b) || b;
-          final String orderParam = (String) argMap.get(HibernateQueryConstants.ARGUMENT_ORDER);
+              !(argMap.get(HibernateQueryArgument.IGNORE_CASE.value()) instanceof Boolean b) || b;
+          final String orderParam = (String) argMap.get(HibernateQueryArgument.ORDER.value());
           final Query.Order.Direction direction =
               Query.Order.Direction.DESC.name().equalsIgnoreCase(orderParam)
                   ? Query.Order.Direction.DESC
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/HibernateDatastore.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/HibernateDatastore.java
index 94f6b27445..8c76d7909d 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/HibernateDatastore.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/HibernateDatastore.java
@@ -73,6 +73,7 @@ import org.grails.orm.hibernate.cfg.MappingCacheHolder;
 import org.grails.orm.hibernate.cfg.Settings;
 import org.grails.orm.hibernate.connections.HibernateConnectionSource;
 import org.grails.orm.hibernate.connections.HibernateConnectionSourceFactory;
+import org.grails.orm.hibernate.query.HibernateQueryArgument;
 import org.grails.orm.hibernate.connections.HibernateConnectionSourceSettings;
 import org.grails.orm.hibernate.event.listener.HibernateEventListener;
 import org.grails.orm.hibernate.event.listener.HibernateEventListener;
@@ -119,15 +120,17 @@ public class HibernateDatastore extends AbstractDatastore
         MultipleConnectionSourceCapableDatastore {
   private static final Logger LOG = LoggerFactory.getLogger(HibernateDatastore.class);
 
-  /** The config property cache queries. */
-  public static final String CONFIG_PROPERTY_CACHE_QUERIES = "grails.hibernate.cache.queries";
+  /** @deprecated Use {@link HibernateQueryArgument#CONFIG_CACHE_QUERIES} */
+  @Deprecated(since = "8.0", forRemoval = true)
+  public static final String CONFIG_PROPERTY_CACHE_QUERIES = HibernateQueryArgument.CONFIG_CACHE_QUERIES.value();
 
-  /** The config property osiv readonly. */
-  public static final String CONFIG_PROPERTY_OSIV_READONLY = "grails.hibernate.osiv.readonly";
+  /** @deprecated Use {@link HibernateQueryArgument#CONFIG_OSIV_READONLY} */
+  @Deprecated(since = "8.0", forRemoval = true)
+  public static final String CONFIG_PROPERTY_OSIV_READONLY = HibernateQueryArgument.CONFIG_OSIV_READONLY.value();
 
-  /** The config property pass readonly to hibernate. */
-  public static final String CONFIG_PROPERTY_PASS_READONLY_TO_HIBERNATE =
-      "grails.hibernate.pass.readonly";
+  /** @deprecated Use {@link HibernateQueryArgument#CONFIG_PASS_READONLY} */
+  @Deprecated(since = "8.0", forRemoval = true)
+  public static final String CONFIG_PROPERTY_PASS_READONLY_TO_HIBERNATE = HibernateQueryArgument.CONFIG_PASS_READONLY.value();
 
   /** The session factory. */
   protected final SessionFactory sessionFactory;
@@ -537,11 +540,11 @@ public class HibernateDatastore extends AbstractDatastore
       setApplicationContext(applicationContext);
     }
 
-    this.osivReadOnly = config.getProperty(CONFIG_PROPERTY_OSIV_READONLY, Boolean.class, false);
+    this.osivReadOnly = config.getProperty(HibernateQueryArgument.CONFIG_OSIV_READONLY.value(), Boolean.class, false);
     this.passReadOnlyToHibernate =
-        config.getProperty(CONFIG_PROPERTY_PASS_READONLY_TO_HIBERNATE, Boolean.class, false);
+        config.getProperty(HibernateQueryArgument.CONFIG_PASS_READONLY.value(), Boolean.class, false);
     this.isCacheQueries =
-        config.getProperty(CONFIG_PROPERTY_CACHE_QUERIES, Boolean.class, false);
+        config.getProperty(HibernateQueryArgument.CONFIG_CACHE_QUERIES.value(), Boolean.class, false);
 
     if (config.getProperty(SETTING_AUTO_FLUSH, Boolean.class, false)) {
       this.defaultFlushModeName = FlushMode.AUTO.name();
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsHibernateUtil.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsHibernateUtil.java
index 691c7cd915..ef13486c3c 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsHibernateUtil.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsHibernateUtil.java
@@ -37,6 +37,7 @@ import org.hibernate.SessionFactory;
 import org.hibernate.engine.spi.EntityEntry;
 import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.engine.spi.Status;
+import org.grails.orm.hibernate.query.HibernateQueryArgument;
 import org.hibernate.internal.util.StringHelper;
 import org.hibernate.proxy.HibernateProxy;
 import org.slf4j.Logger;
@@ -52,20 +53,48 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
 public class GrailsHibernateUtil extends HibernateRuntimeUtils {
   protected static final Logger LOG = LoggerFactory.getLogger(GrailsHibernateUtil.class);
 
-  public static final String ARGUMENT_FETCH_SIZE = "fetchSize";
-  public static final String ARGUMENT_TIMEOUT = "timeout";
-  public static final String ARGUMENT_READ_ONLY = "readOnly";
-  public static final String ARGUMENT_FLUSH_MODE = "flushMode";
-  public static final String ARGUMENT_MAX = "max";
-  public static final String ARGUMENT_OFFSET = "offset";
-  public static final String ARGUMENT_ORDER = "order";
-  public static final String ARGUMENT_SORT = "sort";
-  public static final String ORDER_DESC = "desc";
-  public static final String ORDER_ASC = "asc";
-  public static final String ARGUMENT_FETCH = "fetch";
-  public static final String ARGUMENT_IGNORE_CASE = "ignoreCase";
-  public static final String ARGUMENT_CACHE = "cache";
-  public static final String ARGUMENT_LOCK = "lock";
+  /** @deprecated Use {@link org.grails.orm.hibernate.query.HibernateQueryArgument#FETCH_SIZE} */
+  @Deprecated(since = "8.0", forRemoval = true)
+  public static final String ARGUMENT_FETCH_SIZE = HibernateQueryArgument.FETCH_SIZE.value();
+  /** @deprecated Use {@link org.grails.orm.hibernate.query.HibernateQueryArgument#TIMEOUT} */
+  @Deprecated(since = "8.0", forRemoval = true)
+  public static final String ARGUMENT_TIMEOUT = HibernateQueryArgument.TIMEOUT.value();
+  /** @deprecated Use {@link org.grails.orm.hibernate.query.HibernateQueryArgument#READ_ONLY} */
+  @Deprecated(since = "8.0", forRemoval = true)
+  public static final String ARGUMENT_READ_ONLY = HibernateQueryArgument.READ_ONLY.value();
+  /** @deprecated Use {@link org.grails.orm.hibernate.query.HibernateQueryArgument#FLUSH_MODE} */
+  @Deprecated(since = "8.0", forRemoval = true)
+  public static final String ARGUMENT_FLUSH_MODE = HibernateQueryArgument.FLUSH_MODE.value();
+  /** @deprecated Use {@link org.grails.orm.hibernate.query.HibernateQueryArgument#MAX} */
+  @Deprecated(since = "8.0", forRemoval = true)
+  public static final String ARGUMENT_MAX = HibernateQueryArgument.MAX.value();
+  /** @deprecated Use {@link org.grails.orm.hibernate.query.HibernateQueryArgument#OFFSET} */
+  @Deprecated(since = "8.0", forRemoval = true)
+  public static final String ARGUMENT_OFFSET = HibernateQueryArgument.OFFSET.value();
+  /** @deprecated Use {@link org.grails.orm.hibernate.query.HibernateQueryArgument#ORDER} */
+  @Deprecated(since = "8.0", forRemoval = true)
+  public static final String ARGUMENT_ORDER = HibernateQueryArgument.ORDER.value();
+  /** @deprecated Use {@link org.grails.orm.hibernate.query.HibernateQueryArgument#SORT} */
+  @Deprecated(since = "8.0", forRemoval = true)
+  public static final String ARGUMENT_SORT = HibernateQueryArgument.SORT.value();
+  /** @deprecated Use {@link org.grails.orm.hibernate.query.HibernateQueryArgument#ORDER_DESC} */
+  @Deprecated(since = "8.0", forRemoval = true)
+  public static final String ORDER_DESC = HibernateQueryArgument.ORDER_DESC.value();
+  /** @deprecated Use {@link org.grails.orm.hibernate.query.HibernateQueryArgument#ORDER_ASC} */
+  @Deprecated(since = "8.0", forRemoval = true)
+  public static final String ORDER_ASC = HibernateQueryArgument.ORDER_ASC.value();
+  /** @deprecated Use {@link org.grails.orm.hibernate.query.HibernateQueryArgument#FETCH} */
+  @Deprecated(since = "8.0", forRemoval = true)
+  public static final String ARGUMENT_FETCH = HibernateQueryArgument.FETCH.value();
+  /** @deprecated Use {@link org.grails.orm.hibernate.query.HibernateQueryArgument#IGNORE_CASE} */
+  @Deprecated(since = "8.0", forRemoval = true)
+  public static final String ARGUMENT_IGNORE_CASE = HibernateQueryArgument.IGNORE_CASE.value();
+  /** @deprecated Use {@link org.grails.orm.hibernate.query.HibernateQueryArgument#CACHE} */
+  @Deprecated(since = "8.0", forRemoval = true)
+  public static final String ARGUMENT_CACHE = HibernateQueryArgument.CACHE.value();
+  /** @deprecated Use {@link org.grails.orm.hibernate.query.HibernateQueryArgument#LOCK} */
+  @Deprecated(since = "8.0", forRemoval = true)
+  public static final String ARGUMENT_LOCK = HibernateQueryArgument.LOCK.value();
   public static final Class<?>[] EMPTY_CLASS_ARRAY = {};
 
   private static HibernateProxyHandler proxyHandler = new HibernateProxyHandler();
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/GrailsHibernateQueryUtils.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/GrailsHibernateQueryUtils.java
index cc73b32ca9..0cc2f785e8 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/GrailsHibernateQueryUtils.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/GrailsHibernateQueryUtils.java
@@ -25,7 +25,6 @@ import java.util.Comparator;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
-import org.grails.datastore.gorm.finders.DynamicFinder;
 import org.grails.datastore.mapping.config.Property;
 import org.grails.datastore.mapping.model.PersistentEntity;
 import org.grails.datastore.mapping.model.PersistentProperty;
@@ -67,7 +66,7 @@ public class GrailsHibernateQueryUtils {
       Map argMap,
       ConversionService conversionService,
       boolean useDefaultMapping) {
-    Object fetchObj = argMap.get(DynamicFinder.ARGUMENT_FETCH);
+    Object fetchObj = argMap.get(HibernateQueryArgument.FETCH.value());
     if (fetchObj instanceof Map) {
       Map fetch = (Map) fetchObj;
       for (Object o : fetch.keySet()) {
@@ -80,27 +79,27 @@ public class GrailsHibernateQueryUtils {
       }
     }
 
-    final Object sortObj = argMap.get(DynamicFinder.ARGUMENT_SORT);
+    final Object sortObj = argMap.get(HibernateQueryArgument.SORT.value());
     if (sortObj != null) {
       final boolean ignoreCase =
-          !(argMap.get(DynamicFinder.ARGUMENT_IGNORE_CASE) instanceof Boolean b) || b;
+          !(argMap.get(HibernateQueryArgument.IGNORE_CASE.value()) instanceof Boolean b) || b;
       if (sortObj instanceof Map) {
         Map sortMap = (Map) sortObj;
         for (Object sort : sortMap.keySet()) {
           final String order =
-              DynamicFinder.ORDER_DESC.equalsIgnoreCase((String) sortMap.get(sort))
-                  ? DynamicFinder.ORDER_DESC
-                  : DynamicFinder.ORDER_ASC;
+              HibernateQueryArgument.ORDER_DESC.value().equalsIgnoreCase((String) sortMap.get(sort))
+                  ? HibernateQueryArgument.ORDER_DESC.value()
+                  : HibernateQueryArgument.ORDER_ASC.value();
           addOrderPossiblyNested(
               query, queryRoot, criteriaBuilder, entity, (String) sort, order, ignoreCase);
         }
       } else {
         final String sort = (String) sortObj;
         final String order =
-            DynamicFinder.ORDER_DESC.equalsIgnoreCase(
-                    (String) argMap.get(DynamicFinder.ARGUMENT_ORDER))
-                ? DynamicFinder.ORDER_DESC
-                : DynamicFinder.ORDER_ASC;
+            HibernateQueryArgument.ORDER_DESC.value().equalsIgnoreCase(
+                    (String) argMap.get(HibernateQueryArgument.ORDER.value()))
+                ? HibernateQueryArgument.ORDER_DESC.value()
+                : HibernateQueryArgument.ORDER_ASC.value();
         addOrderPossiblyNested(query, queryRoot, criteriaBuilder, entity, sort, order, ignoreCase);
       }
     } else if (useDefaultMapping) {
@@ -110,9 +109,9 @@ public class GrailsHibernateQueryUtils {
         Map sortMap = m.getSort().getNamesAndDirections();
         for (Object sort : sortMap.keySet()) {
           final String order =
-              DynamicFinder.ORDER_DESC.equalsIgnoreCase((String) sortMap.get(sort))
-                  ? DynamicFinder.ORDER_DESC
-                  : DynamicFinder.ORDER_ASC;
+              HibernateQueryArgument.ORDER_DESC.value().equalsIgnoreCase((String) sortMap.get(sort))
+                  ? HibernateQueryArgument.ORDER_DESC.value()
+                  : HibernateQueryArgument.ORDER_ASC.value();
           addOrderPossiblyNested(
               query, queryRoot, criteriaBuilder, entity, (String) sort, order, true);
         }
@@ -135,26 +134,26 @@ public class GrailsHibernateQueryUtils {
       ConversionService conversionService,
       boolean useDefaultMapping) {
     final Integer maxParam =
-        argMap.containsKey(DynamicFinder.ARGUMENT_MAX)
-            ? conversionService.convert(argMap.get(DynamicFinder.ARGUMENT_MAX), Integer.class)
+        argMap.containsKey(HibernateQueryArgument.MAX.value())
+            ? conversionService.convert(argMap.get(HibernateQueryArgument.MAX.value()), Integer.class)
             : null;
     final Integer offsetParam =
-        argMap.containsKey(DynamicFinder.ARGUMENT_OFFSET)
-            ? conversionService.convert(argMap.get(DynamicFinder.ARGUMENT_OFFSET), Integer.class)
+        argMap.containsKey(HibernateQueryArgument.OFFSET.value())
+            ? conversionService.convert(argMap.get(HibernateQueryArgument.OFFSET.value()), Integer.class)
             : null;
-    if (argMap.containsKey(DynamicFinder.ARGUMENT_FETCH_SIZE)) {
+    if (argMap.containsKey(HibernateQueryArgument.FETCH_SIZE.value())) {
       query.setFetchSize(
-          conversionService.convert(argMap.get(DynamicFinder.ARGUMENT_FETCH_SIZE), Integer.class));
+          conversionService.convert(argMap.get(HibernateQueryArgument.FETCH_SIZE.value()), Integer.class));
     }
-    if (argMap.containsKey(DynamicFinder.ARGUMENT_TIMEOUT)) {
+    if (argMap.containsKey(HibernateQueryArgument.TIMEOUT.value())) {
       query.setTimeout(
-          conversionService.convert(argMap.get(DynamicFinder.ARGUMENT_TIMEOUT), Integer.class));
+          conversionService.convert(argMap.get(HibernateQueryArgument.TIMEOUT.value()), Integer.class));
     }
-    if (argMap.containsKey(DynamicFinder.ARGUMENT_FLUSH_MODE)) {
-      query.setQueryFlushMode(convertQueryFlushMode(argMap.get(DynamicFinder.ARGUMENT_FLUSH_MODE)));
+    if (argMap.containsKey(HibernateQueryArgument.FLUSH_MODE.value())) {
+      query.setQueryFlushMode(convertQueryFlushMode(argMap.get(HibernateQueryArgument.FLUSH_MODE.value())));
     }
-    if (argMap.containsKey(DynamicFinder.ARGUMENT_READ_ONLY)) {
-      query.setReadOnly(ClassUtils.getBooleanFromMap(DynamicFinder.ARGUMENT_READ_ONLY, argMap));
+    if (argMap.containsKey(HibernateQueryArgument.READ_ONLY.value())) {
+      query.setReadOnly(ClassUtils.getBooleanFromMap(HibernateQueryArgument.READ_ONLY.value(), argMap));
     }
 
     final int max = maxParam == null ? -1 : maxParam;
@@ -165,12 +164,12 @@ public class GrailsHibernateQueryUtils {
     if (offset > -1) {
       query.setFirstResult(offset);
     }
-    if (ClassUtils.getBooleanFromMap(DynamicFinder.ARGUMENT_LOCK, argMap)) {
+    if (ClassUtils.getBooleanFromMap(HibernateQueryArgument.LOCK.value(), argMap)) {
       query.setLockMode(LockModeType.PESSIMISTIC_WRITE);
       query.setCacheable(false);
     } else {
-      if (argMap.containsKey(DynamicFinder.ARGUMENT_CACHE)) {
-        query.setCacheable(ClassUtils.getBooleanFromMap(DynamicFinder.ARGUMENT_CACHE, argMap));
+      if (argMap.containsKey(HibernateQueryArgument.CACHE.value())) {
+        query.setCacheable(ClassUtils.getBooleanFromMap(HibernateQueryArgument.CACHE.value(), argMap));
       } else {
         cacheCriteriaByMapping(entity.getJavaClass(), query);
       }
@@ -281,7 +280,7 @@ public class GrailsHibernateQueryUtils {
                       ignoreCase ? criteriaBuilder.upper(queryRoot.get(name)) : queryRoot.get(name))
               .map(
                   path ->
-                      DynamicFinder.ORDER_DESC.equals(order)
+                      HibernateQueryArgument.ORDER_DESC.value().equals(order)
                           ? criteriaBuilder.desc(path)
                           : criteriaBuilder.asc(path))
               .sorted(orderComparator)
@@ -295,7 +294,7 @@ public class GrailsHibernateQueryUtils {
       if (ignoreCase) {
         path = criteriaBuilder.upper(path);
       }
-      if (DynamicFinder.ORDER_DESC.equals(order)) {
+      if (HibernateQueryArgument.ORDER_DESC.value().equals(order)) {
         query.orderBy(criteriaBuilder.desc(path));
       } else {
         query.orderBy(criteriaBuilder.asc(path));
@@ -306,7 +305,7 @@ public class GrailsHibernateQueryUtils {
       if (ignoreCase) {
         path = criteriaBuilder.upper(path);
       }
-      if (DynamicFinder.ORDER_DESC.equals(order)) {
+      if (HibernateQueryArgument.ORDER_DESC.value().equals(order)) {
         query.orderBy(criteriaBuilder.desc(path));
       } else {
         query.orderBy(criteriaBuilder.asc(path));
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/HibernateHqlQuery.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/HibernateHqlQuery.java
index 02e21230fc..d658935b36 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/HibernateHqlQuery.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/HibernateHqlQuery.java
@@ -27,7 +27,6 @@ import java.util.Map;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
 import org.apache.groovy.parser.antlr4.util.StringUtils;
-import org.grails.datastore.gorm.finders.DynamicFinder;
 import org.grails.datastore.mapping.core.Datastore;
 import org.grails.datastore.mapping.core.Session;
 import org.grails.datastore.mapping.model.PersistentEntity;
@@ -161,15 +160,15 @@ public class HibernateHqlQuery extends Query {
   }
 
   public void populateQuerySettings(Map<?, ?> args) {
-    ifPresent(args, DynamicFinder.ARGUMENT_MAX, v -> delegate.setMaxResults(toInt(v)));
-    ifPresent(args, DynamicFinder.ARGUMENT_OFFSET, v -> delegate.setFirstResult(toInt(v)));
-    ifPresent(args, DynamicFinder.ARGUMENT_CACHE, v -> delegate.setCacheable(toBool(v)));
-    ifPresent(args, DynamicFinder.ARGUMENT_FETCH_SIZE, v -> delegate.setFetchSize(toInt(v)));
-    ifPresent(args, DynamicFinder.ARGUMENT_TIMEOUT, v -> delegate.setTimeout(toInt(v)));
-    ifPresent(args, DynamicFinder.ARGUMENT_READ_ONLY, v -> delegate.setReadOnly(toBool(v)));
+    ifPresent(args, HibernateQueryArgument.MAX.value(), v -> delegate.setMaxResults(toInt(v)));
+    ifPresent(args, HibernateQueryArgument.OFFSET.value(), v -> delegate.setFirstResult(toInt(v)));
+    ifPresent(args, HibernateQueryArgument.CACHE.value(), v -> delegate.setCacheable(toBool(v)));
+    ifPresent(args, HibernateQueryArgument.FETCH_SIZE.value(), v -> delegate.setFetchSize(toInt(v)));
+    ifPresent(args, HibernateQueryArgument.TIMEOUT.value(), v -> delegate.setTimeout(toInt(v)));
+    ifPresent(args, HibernateQueryArgument.READ_ONLY.value(), v -> delegate.setReadOnly(toBool(v)));
     ifPresent(
         args,
-        DynamicFinder.ARGUMENT_FLUSH_MODE,
+        HibernateQueryArgument.FLUSH_MODE.value(),
         v -> delegate.setQueryFlushMode(GrailsHibernateQueryUtils.convertQueryFlushMode(v)));
   }
 
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/HibernateQueryArgument.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/HibernateQueryArgument.java
new file mode 100644
index 0000000000..191899bea8
--- /dev/null
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/HibernateQueryArgument.java
@@ -0,0 +1,75 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.grails.orm.hibernate.query;
+
+import org.grails.datastore.gorm.finders.DynamicFinder;
+
+/**
+ * Typed enum of all query argument keys and Hibernate config property keys used in the
+ * Hibernate 7 datastore. String values are sourced from {@link DynamicFinder} for the
+ * query arguments, eliminating the three duplicate sets of raw string constants that
+ * previously existed across {@code HibernateQueryConstants}, {@code GrailsHibernateUtil},
+ * and {@code DynamicFinder}.
+ *
+ * <p>Use {@link #value()} to obtain the string key for map lookups. {@link #toString()}
+ * also returns the string value so instances can be used in string-interpolated contexts.
+ *
+ * @since 8.0
+ */
+public enum HibernateQueryArgument {
+
+  // ── pagination & execution ────────────────────────────────────────────────
+  MAX(DynamicFinder.ARGUMENT_MAX),
+  OFFSET(DynamicFinder.ARGUMENT_OFFSET),
+  FETCH_SIZE(DynamicFinder.ARGUMENT_FETCH_SIZE),
+  TIMEOUT(DynamicFinder.ARGUMENT_TIMEOUT),
+  FLUSH_MODE(DynamicFinder.ARGUMENT_FLUSH_MODE),
+  READ_ONLY(DynamicFinder.ARGUMENT_READ_ONLY),
+  CACHE(DynamicFinder.ARGUMENT_CACHE),
+  LOCK(DynamicFinder.ARGUMENT_LOCK),
+  FETCH(DynamicFinder.ARGUMENT_FETCH),
+
+  // ── sorting ───────────────────────────────────────────────────────────────
+  SORT(DynamicFinder.ARGUMENT_SORT),
+  ORDER(DynamicFinder.ARGUMENT_ORDER),
+  IGNORE_CASE(DynamicFinder.ARGUMENT_IGNORE_CASE),
+  ORDER_DESC(DynamicFinder.ORDER_DESC),
+  ORDER_ASC(DynamicFinder.ORDER_ASC),
+
+  // ── Hibernate config properties ───────────────────────────────────────────
+  CONFIG_CACHE_QUERIES("grails.hibernate.cache.queries"),
+  CONFIG_OSIV_READONLY("grails.hibernate.osiv.readonly"),
+  CONFIG_PASS_READONLY("grails.hibernate.pass.readonly");
+
+  private final String value;
+
+  HibernateQueryArgument(String value) {
+    this.value = value;
+  }
+
+  /** Returns the string key used for map lookups and config property resolution. */
+  public String value() {
+    return value;
+  }
+
+  @Override
+  public String toString() {
+    return value;
+  }
+}
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/HibernateQueryConstants.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/HibernateQueryConstants.java
index 6d245d43ff..84aa26ff99 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/HibernateQueryConstants.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/HibernateQueryConstants.java
@@ -19,28 +19,27 @@
 package org.grails.orm.hibernate.query;
 
 /**
- * Constants used for query arguments etc.
- *
- * @since 3.0.7
- * @author Graeme Rocher
+ * @deprecated Use {@link HibernateQueryArgument} instead.
  */
+@Deprecated(since = "8.0", forRemoval = true)
 public interface HibernateQueryConstants {
 
-  String ARGUMENT_FETCH_SIZE = "fetchSize";
-  String ARGUMENT_TIMEOUT = "timeout";
-  String ARGUMENT_READ_ONLY = "readOnly";
-  String ARGUMENT_FLUSH_MODE = "flushMode";
-  String ARGUMENT_MAX = "max";
-  String ARGUMENT_OFFSET = "offset";
-  String ARGUMENT_ORDER = "order";
-  String ARGUMENT_SORT = "sort";
-  String ORDER_DESC = "desc";
-  String ORDER_ASC = "asc";
-  String ARGUMENT_FETCH = "fetch";
-  String ARGUMENT_IGNORE_CASE = "ignoreCase";
-  String ARGUMENT_CACHE = "cache";
-  String ARGUMENT_LOCK = "lock";
-  String CONFIG_PROPERTY_CACHE_QUERIES = "grails.hibernate.cache.queries";
-  String CONFIG_PROPERTY_OSIV_READONLY = "grails.hibernate.osiv.readonly";
-  String CONFIG_PROPERTY_PASS_READONLY_TO_HIBERNATE = "grails.hibernate.pass.readonly";
+  String ARGUMENT_FETCH_SIZE = HibernateQueryArgument.FETCH_SIZE.value();
+  String ARGUMENT_TIMEOUT = HibernateQueryArgument.TIMEOUT.value();
+  String ARGUMENT_READ_ONLY = HibernateQueryArgument.READ_ONLY.value();
+  String ARGUMENT_FLUSH_MODE = HibernateQueryArgument.FLUSH_MODE.value();
+  String ARGUMENT_MAX = HibernateQueryArgument.MAX.value();
+  String ARGUMENT_OFFSET = HibernateQueryArgument.OFFSET.value();
+  String ARGUMENT_ORDER = HibernateQueryArgument.ORDER.value();
+  String ARGUMENT_SORT = HibernateQueryArgument.SORT.value();
+  String ORDER_DESC = HibernateQueryArgument.ORDER_DESC.value();
+  String ORDER_ASC = HibernateQueryArgument.ORDER_ASC.value();
+  String ARGUMENT_FETCH = HibernateQueryArgument.FETCH.value();
+  String ARGUMENT_IGNORE_CASE = HibernateQueryArgument.IGNORE_CASE.value();
+  String ARGUMENT_CACHE = HibernateQueryArgument.CACHE.value();
+  String ARGUMENT_LOCK = HibernateQueryArgument.LOCK.value();
+  String CONFIG_PROPERTY_CACHE_QUERIES = HibernateQueryArgument.CONFIG_CACHE_QUERIES.value();
+  String CONFIG_PROPERTY_OSIV_READONLY = HibernateQueryArgument.CONFIG_OSIV_READONLY.value();
+  String CONFIG_PROPERTY_PASS_READONLY_TO_HIBERNATE = HibernateQueryArgument.CONFIG_PASS_READONLY.value();
 }
+


(grails-core) 08/27: refactor(hibernate7): replace dual-field HibernateHqlQuery with HqlQueryDelegate composition

Posted by bo...@apache.org.
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 fec3c5eaa67ef15740ffbbb52c8bb7b9ea540220
Author: Walter Duque de Estrada <wb...@mac.com>
AuthorDate: Wed Mar 4 12:45:52 2026 -0600

    refactor(hibernate7): replace dual-field HibernateHqlQuery with HqlQueryDelegate composition
---
 .../orm/hibernate/query/HibernateHqlQuery.java     | 109 +++++++++----------
 .../orm/hibernate/query/HqlQueryDelegate.java      |  86 +++++++++++++++
 .../orm/hibernate/query/MutationQueryDelegate.java |  99 ++++++++++++++++++
 .../orm/hibernate/query/SelectQueryDelegate.java   | 115 +++++++++++++++++++++
 .../hibernate/query/HibernateHqlQuerySpec.groovy   |  36 +++++++
 5 files changed, 392 insertions(+), 53 deletions(-)

diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/HibernateHqlQuery.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/HibernateHqlQuery.java
index f896a0adf2..02e21230fc 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/HibernateHqlQuery.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/HibernateHqlQuery.java
@@ -40,33 +40,37 @@ import org.grails.orm.hibernate.HibernateSession;
 import org.grails.orm.hibernate.exceptions.GrailsQueryException;
 import org.hibernate.FlushMode;
 import org.hibernate.SessionFactory;
-import org.hibernate.query.MutationQuery;
 import org.springframework.context.ApplicationEventPublisher;
 
 /**
  * A query implementation for HQL queries.
  *
+ * <p>Hibernate 7 splits query types into {@link org.hibernate.query.Query} (SELECT) and
+ * {@link org.hibernate.query.MutationQuery} (UPDATE/DELETE), which are siblings under
+ * {@link org.hibernate.query.CommonQueryContract}. This class uses composition via
+ * {@link HqlQueryDelegate} to eliminate runtime type-checks and null-field branching.
+ *
  * @author Graeme Rocher
  * @since 6.0
  */
 @SuppressWarnings("PMD.AvoidDuplicateLiterals")
 public class HibernateHqlQuery extends Query {
 
-  private final org.hibernate.query.Query<?> query;
-  private final org.hibernate.query.MutationQuery mutationQuery;
+  /** Handles all query operations; the concrete type encodes whether this is SELECT or UPDATE/DELETE. */
+  private final HqlQueryDelegate delegate;
 
+  /** Constructs a SELECT query wrapper. */
   public HibernateHqlQuery(
       Session session, PersistentEntity entity, org.hibernate.query.Query<?> query) {
     super(session, entity);
-    this.query = query;
-    this.mutationQuery = null;
+    this.delegate = new SelectQueryDelegate(query);
   }
 
+  /** Constructs an UPDATE/DELETE query wrapper. */
   public HibernateHqlQuery(
       Session session, PersistentEntity entity, org.hibernate.query.MutationQuery mutationQuery) {
     super(session, entity);
-    this.query = null;
-    this.mutationQuery = mutationQuery;
+    this.delegate = new MutationQueryDelegate(mutationQuery);
   }
 
   @Override
@@ -80,8 +84,8 @@ public class HibernateHqlQuery extends Query {
     Datastore datastore = getSession().getDatastore();
     ApplicationEventPublisher publisher = datastore.getApplicationEventPublisher();
     publisher.publishEvent(new PreQueryEvent(datastore, this));
-    if (uniqueResult) query.setMaxResults(1);
-    List results = query.list();
+    if (uniqueResult) delegate.setMaxResults(1);
+    List results = delegate.list();
     publisher.publishEvent(new PostQueryEvent(datastore, this, results));
     return results;
   }
@@ -89,7 +93,7 @@ public class HibernateHqlQuery extends Query {
   // ─── Static factory API ──────────────────────────────────────────────────
 
   /**
-   * Session-bound step — creates the {@link org.hibernate.query.Query} from an open {@link
+   * Session-bound step — creates the appropriate Hibernate query from an open {@link
    * org.hibernate.Session} and wraps it in a {@link HibernateHqlQuery}.
    */
   protected static HibernateHqlQuery buildQuery(
@@ -98,26 +102,24 @@ public class HibernateHqlQuery extends Query {
       SessionFactory sessionFactory,
       PersistentEntity entity,
       HqlQueryContext ctx) {
-    org.hibernate.query.Query<?> q;
+    HibernateSession hibernateSession = new HibernateSession(dataStore, sessionFactory);
     if (StringUtils.isEmpty(ctx.hql())) {
-      q = session.createQuery("from " + ctx.targetClass().getName(), ctx.targetClass());
-      return new HibernateHqlQuery(new HibernateSession(dataStore, sessionFactory), entity, q);
+      var q = session.createQuery("from " + ctx.targetClass().getName(), ctx.targetClass());
+      return new HibernateHqlQuery(hibernateSession, entity, q);
     } else if (ctx.isUpdate()) {
-      org.hibernate.query.MutationQuery mq = session.createMutationQuery(ctx.hql());
-      HibernateHqlQuery result =
-          new HibernateHqlQuery(new HibernateSession(dataStore, sessionFactory), entity, mq);
+      var mq = session.createMutationQuery(ctx.hql());
+      var result = new HibernateHqlQuery(hibernateSession, entity, mq);
       result.setFlushMode(session.getHibernateFlushMode());
       return result;
     } else {
-      q =
+      var q =
           ctx.isNative()
               ? session.createNativeQuery(ctx.hql(), ctx.targetClass())
               : session.createQuery(ctx.hql(), ctx.targetClass());
+      var result = new HibernateHqlQuery(hibernateSession, entity, q);
+      result.setFlushMode(session.getHibernateFlushMode());
+      return result;
     }
-    HibernateHqlQuery result =
-        new HibernateHqlQuery(new HibernateSession(dataStore, sessionFactory), entity, q);
-    result.setFlushMode(session.getHibernateFlushMode());
-    return result;
   }
 
   /**
@@ -135,8 +137,9 @@ public class HibernateHqlQuery extends Query {
       GrailsHibernateTemplate template) {
     HibernateHqlQuery hqlQuery =
         template.execute(session -> buildQuery(session, dataStore, sessionFactory, entity, ctx));
-    if (hqlQuery.getQuery() != null) {
-      template.applySettings(hqlQuery.getQuery());
+    var selectQuery = hqlQuery.selectQuery();
+    if (selectQuery != null) {
+      template.applySettings(selectQuery);
     }
     hqlQuery.populateQuerySettings(
         MapUtils.isNotEmpty(args) ? new HashMap<>(args) : Collections.emptyMap());
@@ -158,30 +161,20 @@ public class HibernateHqlQuery extends Query {
   }
 
   public void populateQuerySettings(Map<?, ?> args) {
-    if (mutationQuery != null) {
-      ifPresent(args, DynamicFinder.ARGUMENT_TIMEOUT, v -> mutationQuery.setTimeout(toInt(v)));
-      ifPresent(
-          args,
-          DynamicFinder.ARGUMENT_FLUSH_MODE,
-          v -> mutationQuery.setQueryFlushMode(GrailsHibernateQueryUtils.convertQueryFlushMode(v)));
-      return;
-    }
-    if (query == null) return;
-    ifPresent(args, DynamicFinder.ARGUMENT_MAX, v -> query.setMaxResults(toInt(v)));
-    ifPresent(args, DynamicFinder.ARGUMENT_OFFSET, v -> query.setFirstResult(toInt(v)));
-    ifPresent(args, DynamicFinder.ARGUMENT_CACHE, v -> query.setCacheable(toBool(v)));
-    ifPresent(args, DynamicFinder.ARGUMENT_FETCH_SIZE, v -> query.setFetchSize(toInt(v)));
-    ifPresent(args, DynamicFinder.ARGUMENT_TIMEOUT, v -> query.setTimeout(toInt(v)));
-    ifPresent(args, DynamicFinder.ARGUMENT_READ_ONLY, v -> query.setReadOnly(toBool(v)));
+    ifPresent(args, DynamicFinder.ARGUMENT_MAX, v -> delegate.setMaxResults(toInt(v)));
+    ifPresent(args, DynamicFinder.ARGUMENT_OFFSET, v -> delegate.setFirstResult(toInt(v)));
+    ifPresent(args, DynamicFinder.ARGUMENT_CACHE, v -> delegate.setCacheable(toBool(v)));
+    ifPresent(args, DynamicFinder.ARGUMENT_FETCH_SIZE, v -> delegate.setFetchSize(toInt(v)));
+    ifPresent(args, DynamicFinder.ARGUMENT_TIMEOUT, v -> delegate.setTimeout(toInt(v)));
+    ifPresent(args, DynamicFinder.ARGUMENT_READ_ONLY, v -> delegate.setReadOnly(toBool(v)));
     ifPresent(
         args,
         DynamicFinder.ARGUMENT_FLUSH_MODE,
-        v -> query.setQueryFlushMode(GrailsHibernateQueryUtils.convertQueryFlushMode(v)));
+        v -> delegate.setQueryFlushMode(GrailsHibernateQueryUtils.convertQueryFlushMode(v)));
   }
 
   public void populateQueryWithNamedArguments(Map<?, ?> namedArgs) {
     if (namedArgs == null) return;
-    org.hibernate.query.CommonQueryContract target = mutationQuery != null ? mutationQuery : query;
     namedArgs.forEach(
         (key, value) -> {
           if (!(key instanceof CharSequence)) {
@@ -189,36 +182,46 @@ public class HibernateHqlQuery extends Query {
           }
           String name = key.toString();
           if (value == null) {
-            target.setParameter(name, null);
-          } else if (mutationQuery == null && value instanceof Collection<?> col) {
-            query.setParameterList(name, col);
-          } else if (mutationQuery == null && value.getClass().isArray()) {
-            query.setParameterList(name, (Object[]) value);
+            delegate.setParameter(name, null);
+          } else if (value instanceof Collection<?> col) {
+            delegate.setParameterList(name, col);
+          } else if (value.getClass().isArray()) {
+            delegate.setParameterList(name, (Object[]) value);
           } else if (value instanceof CharSequence cs) {
-            target.setParameter(name, cs.toString(), String.class);
+            delegate.setParameter(name, cs.toString(), String.class);
           } else {
-            target.setParameter(name, value);
+            delegate.setParameter(name, value);
           }
         });
   }
 
   public void populateQueryWithIndexedArguments(List<?> params) {
     if (params == null) return;
-    org.hibernate.query.CommonQueryContract target = mutationQuery != null ? mutationQuery : query;
     for (int i = 0; i < params.size(); i++) {
       Object val = params.get(i);
-      if (val instanceof CharSequence cs) target.setParameter(i + 1, cs.toString(), String.class);
-      else if (val != null) target.setParameter(i + 1, val);
-      else target.setParameter(i + 1, null);
+      if (val instanceof CharSequence cs) delegate.setParameter(i + 1, cs.toString(), String.class);
+      else delegate.setParameter(i + 1, val);
     }
   }
 
+  /**
+   * Returns the underlying {@link org.hibernate.query.Query} for SELECT queries, or {@code null}
+   * for mutation queries.
+   */
   public org.hibernate.query.Query<?> getQuery() {
-    return query;
+    return delegate.selectQuery();
+  }
+
+  /**
+   * Returns the underlying {@link org.hibernate.query.Query} for SELECT queries, or {@code null}
+   * for mutation queries.
+   */
+  public org.hibernate.query.Query<?> selectQuery() {
+    return delegate.selectQuery();
   }
 
   public int executeUpdate() {
-    return mutationQuery != null ? mutationQuery.executeUpdate() : query.executeUpdate();
+    return delegate.executeUpdate();
   }
 
   // ─── Private utilities ────────────────────────────────────────────────────
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/HqlQueryDelegate.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/HqlQueryDelegate.java
new file mode 100644
index 0000000000..42e60fe36d
--- /dev/null
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/HqlQueryDelegate.java
@@ -0,0 +1,86 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.grails.orm.hibernate.query;
+
+import java.util.Collection;
+import java.util.List;
+import org.hibernate.query.QueryFlushMode;
+
+/**
+ * Abstracts over Hibernate's {@link org.hibernate.query.Query} (SELECT) and
+ * {@link org.hibernate.query.MutationQuery} (UPDATE/DELETE). The two types are
+ * siblings under {@link org.hibernate.query.CommonQueryContract} and cannot be held
+ * in a single typed field, so {@link HibernateHqlQuery} delegates all query
+ * operations through this interface instead.
+ *
+ * <p>Select-only methods ({@link #setMaxResults}, {@link #setCacheable}, etc.) are
+ * no-ops by default; {@link SelectQueryDelegate} overrides them. Mutation-only
+ * operations ({@link #executeUpdate}) throw {@link UnsupportedOperationException}
+ * in {@link SelectQueryDelegate} and vice-versa for {@link #list()} in
+ * {@link MutationQueryDelegate}.
+ */
+interface HqlQueryDelegate {
+
+  // ── common ────────────────────────────────────────────────────────────────
+
+  void setTimeout(int timeout);
+
+  void setQueryFlushMode(QueryFlushMode mode);
+
+  void setParameter(String name, Object value);
+
+  <T> void setParameter(String name, T value, Class<T> type);
+
+  void setParameter(int position, Object value);
+
+  <T> void setParameter(int position, T value, Class<T> type);
+
+  // ── select-only (no-ops for mutation queries) ─────────────────────────────
+
+  default void setMaxResults(int n) {}
+
+  default void setFirstResult(int n) {}
+
+  default void setCacheable(boolean b) {}
+
+  default void setFetchSize(int n) {}
+
+  default void setReadOnly(boolean b) {}
+
+  /** Sets a named collection parameter. For mutation queries, falls back to {@link #setParameter}. */
+  default void setParameterList(String name, Collection<?> values) {}
+
+  /** Sets a named array parameter. For mutation queries, falls back to {@link #setParameter}. */
+  default void setParameterList(String name, Object[] values) {}
+
+  // ── execution ─────────────────────────────────────────────────────────────
+
+  /** Returns all results. Throws {@link UnsupportedOperationException} for mutation queries. */
+  @SuppressWarnings("rawtypes")
+  List list();
+
+  /** Executes an UPDATE/DELETE. Throws {@link UnsupportedOperationException} for SELECT queries. */
+  int executeUpdate();
+
+  /**
+   * Returns the underlying {@link org.hibernate.query.Query} for SELECT queries, or {@code null}
+   * for mutation queries (used by {@link org.grails.orm.hibernate.GrailsHibernateTemplate#applySettings}).
+   */
+  org.hibernate.query.Query<?> selectQuery();
+}
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/MutationQueryDelegate.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/MutationQueryDelegate.java
new file mode 100644
index 0000000000..57554ce374
--- /dev/null
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/MutationQueryDelegate.java
@@ -0,0 +1,99 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.grails.orm.hibernate.query;
+
+import java.util.Collection;
+import java.util.List;
+import org.hibernate.query.MutationQuery;
+import org.hibernate.query.QueryFlushMode;
+
+/**
+ * {@link HqlQueryDelegate} for HQL UPDATE/DELETE queries backed by
+ * {@link org.hibernate.query.MutationQuery}.
+ *
+ * <p>Select-only methods (setMaxResults, setCacheable, etc.) are inherited as no-ops since
+ * {@link MutationQuery} does not support them. {@link #setParameterList} falls back to
+ * {@link #setParameter} with the collection value as best-effort support for IN clauses.
+ */
+final class MutationQueryDelegate implements HqlQueryDelegate {
+
+  private final MutationQuery mutationQuery;
+
+  MutationQueryDelegate(MutationQuery mutationQuery) {
+    this.mutationQuery = mutationQuery;
+  }
+
+  @Override
+  public void setTimeout(int timeout) {
+    mutationQuery.setTimeout(timeout);
+  }
+
+  @Override
+  public void setQueryFlushMode(QueryFlushMode mode) {
+    mutationQuery.setQueryFlushMode(mode);
+  }
+
+  @Override
+  public void setParameter(String name, Object value) {
+    mutationQuery.setParameter(name, value);
+  }
+
+  @Override
+  public <T> void setParameter(String name, T value, Class<T> type) {
+    mutationQuery.setParameter(name, value, type);
+  }
+
+  @Override
+  public void setParameter(int position, Object value) {
+    mutationQuery.setParameter(position, value);
+  }
+
+  @Override
+  public <T> void setParameter(int position, T value, Class<T> type) {
+    mutationQuery.setParameter(position, value, type);
+  }
+
+  @Override
+  public void setParameterList(String name, Collection<?> values) {
+    // MutationQuery has no setParameterList; pass collection directly as parameter value
+    mutationQuery.setParameter(name, values);
+  }
+
+  @Override
+  public void setParameterList(String name, Object[] values) {
+    mutationQuery.setParameter(name, values);
+  }
+
+  @Override
+  @SuppressWarnings("rawtypes")
+  public List list() {
+    throw new UnsupportedOperationException(
+        "Mutation query (UPDATE/DELETE) cannot be used for list(); use executeUpdate() instead");
+  }
+
+  @Override
+  public int executeUpdate() {
+    return mutationQuery.executeUpdate();
+  }
+
+  @Override
+  public org.hibernate.query.Query<?> selectQuery() {
+    return null;
+  }
+}
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/SelectQueryDelegate.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/SelectQueryDelegate.java
new file mode 100644
index 0000000000..8b9f9518c8
--- /dev/null
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/SelectQueryDelegate.java
@@ -0,0 +1,115 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.grails.orm.hibernate.query;
+
+import java.util.Collection;
+import java.util.List;
+import org.hibernate.query.QueryFlushMode;
+
+/** {@link HqlQueryDelegate} for HQL SELECT queries backed by {@link org.hibernate.query.Query}. */
+final class SelectQueryDelegate implements HqlQueryDelegate {
+
+  private final org.hibernate.query.Query<?> query;
+
+  SelectQueryDelegate(org.hibernate.query.Query<?> query) {
+    this.query = query;
+  }
+
+  @Override
+  public void setTimeout(int timeout) {
+    query.setTimeout(timeout);
+  }
+
+  @Override
+  public void setQueryFlushMode(QueryFlushMode mode) {
+    query.setQueryFlushMode(mode);
+  }
+
+  @Override
+  public void setParameter(String name, Object value) {
+    query.setParameter(name, value);
+  }
+
+  @Override
+  public <T> void setParameter(String name, T value, Class<T> type) {
+    query.setParameter(name, value, type);
+  }
+
+  @Override
+  public void setParameter(int position, Object value) {
+    query.setParameter(position, value);
+  }
+
+  @Override
+  public <T> void setParameter(int position, T value, Class<T> type) {
+    query.setParameter(position, value, type);
+  }
+
+  @Override
+  public void setMaxResults(int n) {
+    query.setMaxResults(n);
+  }
+
+  @Override
+  public void setFirstResult(int n) {
+    query.setFirstResult(n);
+  }
+
+  @Override
+  public void setCacheable(boolean b) {
+    query.setCacheable(b);
+  }
+
+  @Override
+  public void setFetchSize(int n) {
+    query.setFetchSize(n);
+  }
+
+  @Override
+  public void setReadOnly(boolean b) {
+    query.setReadOnly(b);
+  }
+
+  @Override
+  public void setParameterList(String name, Collection<?> values) {
+    query.setParameterList(name, values);
+  }
+
+  @Override
+  public void setParameterList(String name, Object[] values) {
+    query.setParameterList(name, values);
+  }
+
+  @Override
+  @SuppressWarnings("rawtypes")
+  public List list() {
+    return query.list();
+  }
+
+  @Override
+  public int executeUpdate() {
+    throw new UnsupportedOperationException(
+        "SELECT query cannot be used for executeUpdate(); use a MutationQuery instead");
+  }
+
+  @Override
+  public org.hibernate.query.Query<?> selectQuery() {
+    return query;
+  }
+}
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/query/HibernateHqlQuerySpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/query/HibernateHqlQuerySpec.groovy
index 6c8941381a..ab22d31c14 100644
--- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/query/HibernateHqlQuerySpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/query/HibernateHqlQuerySpec.groovy
@@ -197,6 +197,42 @@ class HibernateHqlQuerySpec extends HibernateGormDatastoreSpec {
         then:
         thrown(Exception)
     }
+
+    // ─── delegate behaviour ─────────────────────────────────────────────────
+
+    void "selectQuery is non-null for SELECT queries"() {
+        expect:
+        buildHqlQuery("from HibernateHqlQuerySpecBook").selectQuery() != null
+    }
+
+    void "selectQuery is null for UPDATE/DELETE queries"() {
+        expect:
+        buildHqlQuery("update HibernateHqlQuerySpecBook set pages = 1 where title = :t",
+                [t: "The Hobbit"], null, [:], true).selectQuery() == null
+    }
+
+    void "populateQuerySettings silently ignores select-only args for mutation queries"() {
+        when: "max/offset/cache args passed to an UPDATE query — should not throw"
+        buildHqlQuery("update HibernateHqlQuerySpecBook set pages = 1 where title = :t",
+                [t: "The Hobbit"], null, [max: 2, offset: 1, cache: true, fetchSize: 10, readOnly: true], true)
+        then:
+        noExceptionThrown()
+    }
+
+    void "executeUpdate throws UnsupportedOperationException for SELECT query"() {
+        when:
+        buildHqlQuery("from HibernateHqlQuerySpecBook").executeUpdate()
+        then:
+        thrown(UnsupportedOperationException)
+    }
+
+    void "list throws UnsupportedOperationException for UPDATE query"() {
+        when:
+        buildHqlQuery("update HibernateHqlQuerySpecBook set pages = 1 where title = :t",
+                [t: "The Hobbit"], null, [:], true).list()
+        then:
+        thrown(UnsupportedOperationException)
+    }
 }
 
 @Entity


(grails-core) 02/27: refactor(hibernate7): fold AbstractHibernateSession into HibernateSession

Posted by bo...@apache.org.
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 b7acdb82458dc17b36103bffe5676a24d64ce1a5
Author: Walter Duque de Estrada <wb...@mac.com>
AuthorDate: Wed Mar 4 09:04:14 2026 -0600

    refactor(hibernate7): fold AbstractHibernateSession into HibernateSession
---
 .../grails/orm/HibernateCriteriaBuilder.java       |   4 +-
 .../orm/hibernate/AbstractHibernateSession.java    | 242 ---------------------
 .../org/grails/orm/hibernate/HibernateSession.java | 198 ++++++++++++++++-
 .../hibernate/query/HibernateAssociationQuery.java |   4 +-
 .../grails/orm/hibernate/query/HibernateQuery.java |   6 +-
 .../gorm/specs/HibernateGormDatastoreSpec.groovy   |   6 +-
 .../HibernateAssociationQuerySpec.groovy           |   4 +-
 .../specs/hibernatequery/HibernateQuerySpec.groovy |  10 +-
 8 files changed, 212 insertions(+), 262 deletions(-)

diff --git a/grails-data-hibernate7/core/src/main/groovy/grails/orm/HibernateCriteriaBuilder.java b/grails-data-hibernate7/core/src/main/groovy/grails/orm/HibernateCriteriaBuilder.java
index c2ed1d8d83..f157479d7c 100644
--- a/grails-data-hibernate7/core/src/main/groovy/grails/orm/HibernateCriteriaBuilder.java
+++ b/grails-data-hibernate7/core/src/main/groovy/grails/orm/HibernateCriteriaBuilder.java
@@ -42,7 +42,7 @@ import org.grails.datastore.mapping.query.api.Criteria;
 import org.grails.datastore.mapping.query.api.ProjectionList;
 import org.grails.datastore.mapping.query.api.QueryableCriteria;
 import org.grails.orm.hibernate.HibernateDatastore;
-import org.grails.orm.hibernate.AbstractHibernateSession;
+import org.grails.orm.hibernate.HibernateSession;
 import org.grails.orm.hibernate.GrailsHibernateTemplate;
 import org.grails.orm.hibernate.query.HibernateQuery;
 import org.hibernate.FetchMode;
@@ -147,7 +147,7 @@ public class HibernateCriteriaBuilder extends GroovyObjectSupport
     setDatastore(datastore);
     this.sessionFactory = sessionFactory;
     this.cb = sessionFactory.getCriteriaBuilder();
-    AbstractHibernateSession session = (AbstractHibernateSession) datastore.connect();
+    HibernateSession session = (HibernateSession) datastore.connect();
     hibernateQuery =
         new HibernateQuery(
             session, datastore.getMappingContext().getPersistentEntity(targetClass.getTypeName()));
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateSession.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateSession.java
deleted file mode 100644
index c95cfe30bd..0000000000
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateSession.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.grails.orm.hibernate;
-
-import jakarta.persistence.FlushModeType;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import org.grails.datastore.mapping.core.AbstractAttributeStoringSession;
-import org.grails.datastore.mapping.core.Datastore;
-import org.grails.datastore.mapping.engine.Persister;
-import org.grails.datastore.mapping.model.MappingContext;
-import org.grails.datastore.mapping.query.api.QueryAliasAwareSession;
-import org.grails.datastore.mapping.transactions.Transaction;
-import org.hibernate.LockMode;
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-import org.springframework.transaction.TransactionDefinition;
-import org.springframework.transaction.support.TransactionSynchronizationManager;
-
-/**
- * Session implementation that wraps a Hibernate {@link Session}.
- *
- * @author Graeme Rocher
- * @since 1.0
- */
-@SuppressWarnings("rawtypes")
-public abstract class AbstractHibernateSession extends AbstractAttributeStoringSession
-    implements QueryAliasAwareSession {
-
-  /** The datastore. */
-  protected HibernateDatastore datastore;
-
-  /** The connected. */
-  protected boolean connected = true;
-
-  /** The hibernate template. */
-  protected IHibernateTemplate hibernateTemplate;
-
-  /** Creates a new {@link AbstractHibernateSession} instance. */
-  protected AbstractHibernateSession(
-      HibernateDatastore hibernateDatastore, SessionFactory sessionFactory) {
-    datastore = hibernateDatastore;
-  }
-
-  @Override
-  public boolean isSchemaless() {
-    return false;
-  }
-
-  public Serializable insert(Object o) {
-    return persist(o);
-  }
-
-  @Override
-  public boolean isConnected() {
-    return connected;
-  }
-
-  @Override
-  public void disconnect() {
-    connected = false; // don't actually do any disconnection here. This will be handled by OSVI
-  }
-
-  public Transaction beginTransaction() {
-    throw new UnsupportedOperationException("Use HibernatePlatformTransactionManager instead");
-  }
-
-  @Override
-  public Transaction beginTransaction(TransactionDefinition definition) {
-    throw new UnsupportedOperationException("Use HibernatePlatformTransactionManager instead");
-  }
-
-  public MappingContext getMappingContext() {
-    return getDatastore().getMappingContext();
-  }
-
-  public Serializable persist(Object o) {
-    hibernateTemplate.persist(o);
-    try {
-      // Try to obtain identifier via mapping context reflectors
-      MappingContext ctx = getDatastore().getMappingContext();
-      org.grails.datastore.mapping.model.PersistentEntity pe =
-          ctx.getPersistentEntity(o.getClass().getName());
-      if (pe != null) {
-        Object id = ctx.getEntityReflector(pe).getIdentifier(o);
-        return id == null ? null : (Serializable) id;
-      }
-    } catch (Exception ignored) {
-      // ignore and return null when identifier cannot be obtained
-    }
-    return null;
-  }
-
-  /**
-   * Merge the given instance state into the current persistence context and return the managed
-   * instance.
-   */
-  public Object merge(Object o) {
-    return hibernateTemplate.merge(o);
-  }
-
-  public void refresh(Object o) {
-    hibernateTemplate.refresh(o);
-  }
-
-  public void attach(Object o) {
-    hibernateTemplate.lock(o, LockMode.NONE);
-  }
-
-  public void flush() {
-    hibernateTemplate.flush();
-  }
-
-  public void clear() {
-    hibernateTemplate.clear();
-  }
-
-  public void clear(Object o) {
-    hibernateTemplate.evict(o);
-  }
-
-  public boolean contains(Object o) {
-    return hibernateTemplate.contains(o);
-  }
-
-  public void lock(Object o) {
-    hibernateTemplate.lock(o, LockMode.PESSIMISTIC_WRITE);
-  }
-
-  public void unlock(Object o) {
-    // do nothing
-  }
-
-  /**
-   * @deprecated persist method needs to be changed to void
-   * @param objects The Objects
-   * @return the result
-   */
-  @Deprecated()
-  public List<Serializable> persist(Iterable objects) {
-    List<Serializable> ids = new ArrayList<>();
-    for (Object object : objects) {
-      Serializable id = persist(object);
-      ids.add(id);
-    }
-    return ids;
-  }
-
-  public <T> T retrieve(Class<T> type, Serializable key) {
-    return hibernateTemplate.get(type, key);
-  }
-
-  public <T> T proxy(Class<T> type, Serializable key) {
-    return hibernateTemplate.load(type, key);
-  }
-
-  public <T> T lock(Class<T> type, Serializable key) {
-    return hibernateTemplate.get(type, key, LockMode.PESSIMISTIC_WRITE);
-  }
-
-  public void delete(Iterable objects) {
-    Collection list = getIterableAsCollection(objects);
-    hibernateTemplate.deleteAll(list);
-  }
-
-  /** TODO: Add description. */
-  @SuppressWarnings("unchecked")
-  protected Collection getIterableAsCollection(Iterable objects) {
-    Collection list;
-    if (objects instanceof Collection) {
-      list = (Collection) objects;
-    } else {
-      list = new ArrayList();
-      for (Object object : objects) {
-        list.add(object);
-      }
-    }
-    return list;
-  }
-
-  public void delete(Object obj) {
-    hibernateTemplate.remove(obj);
-  }
-
-  public List retrieveAll(Class type, Serializable... keys) {
-    return retrieveAll(type, Arrays.asList(keys));
-  }
-
-  public Persister getPersister(Object o) {
-    return null;
-  }
-
-  public Transaction getTransaction() {
-    throw new UnsupportedOperationException("Use HibernatePlatformTransactionManager instead");
-  }
-
-  @Override
-  public boolean hasTransaction() {
-    Object resource =
-        TransactionSynchronizationManager.getResource(hibernateTemplate.getSessionFactory());
-    return resource != null;
-  }
-
-  public Datastore getDatastore() {
-    return datastore;
-  }
-
-  public boolean isDirty(Object o) {
-    // not used, Hibernate manages dirty checking itself
-    return true;
-  }
-
-  public Object getNativeInterface() {
-    return hibernateTemplate;
-  }
-
-  @Override
-  public void setSynchronizedWithTransaction(boolean synchronizedWithTransaction) {
-    // no-op
-  }
-
-  public abstract FlushModeType getFlushMode();
-}
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 41fb238413..32f36b2a71 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
@@ -23,27 +23,38 @@ import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.CriteriaQuery;
 import jakarta.persistence.criteria.Root;
 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import org.grails.datastore.gorm.timestamp.DefaultTimestampProvider;
+import org.grails.datastore.mapping.core.AbstractAttributeStoringSession;
+import org.grails.datastore.mapping.core.Datastore;
+import org.grails.datastore.mapping.engine.Persister;
+import org.grails.datastore.mapping.model.MappingContext;
 import org.grails.datastore.mapping.model.PersistentEntity;
 import org.grails.datastore.mapping.model.PersistentProperty;
 import org.grails.datastore.mapping.model.config.GormProperties;
 import org.grails.datastore.mapping.proxy.ProxyHandler;
 import org.grails.datastore.mapping.query.Query;
+import org.grails.datastore.mapping.query.api.QueryAliasAwareSession;
 import org.grails.datastore.mapping.query.api.QueryableCriteria;
 import org.grails.datastore.mapping.query.event.PostQueryEvent;
 import org.grails.datastore.mapping.query.event.PreQueryEvent;
 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.proxy.HibernateProxyHandler;
 import org.grails.orm.hibernate.query.HibernateHqlQuery;
 import org.grails.orm.hibernate.query.HibernateQuery;
 import org.hibernate.*;
 import org.hibernate.proxy.HibernateProxy;
 import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.transaction.TransactionDefinition;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
 
 /**
  * Session implementation that wraps a Hibernate {@link org.hibernate.Session}.
@@ -52,15 +63,24 @@ import org.springframework.context.ApplicationEventPublisher;
  * @since 1.0
  */
 @SuppressWarnings({"rawtypes", "PMD.DataflowAnomalyAnalysis", "PMD.AvoidDuplicateLiterals"})
-public class HibernateSession extends AbstractHibernateSession {
+public class HibernateSession extends AbstractAttributeStoringSession
+    implements QueryAliasAwareSession {
+
+  /** The datastore. */
+  protected HibernateDatastore datastore;
+
+  /** The connected. */
+  protected boolean connected = true;
+
+  /** The hibernate template. */
+  protected IHibernateTemplate hibernateTemplate;
 
   ProxyHandler proxyHandler = new HibernateProxyHandler();
   DefaultTimestampProvider timestampProvider;
 
   public HibernateSession(
       HibernateDatastore hibernateDatastore, SessionFactory sessionFactory, int defaultFlushMode) {
-    super(hibernateDatastore, sessionFactory);
-
+    datastore = hibernateDatastore;
     hibernateTemplate =
         new GrailsHibernateTemplate(sessionFactory, (HibernateDatastore) getDatastore());
   }
@@ -69,6 +89,177 @@ public class HibernateSession extends AbstractHibernateSession {
     this(hibernateDatastore, sessionFactory, hibernateDatastore.getDefaultFlushMode());
   }
 
+  @Override
+  public boolean isSchemaless() {
+    return false;
+  }
+
+  public Serializable insert(Object o) {
+    return persist(o);
+  }
+
+  @Override
+  public boolean isConnected() {
+    return connected;
+  }
+
+  @Override
+  public void disconnect() {
+    connected = false; // don't actually do any disconnection here. This will be handled by OSVI
+  }
+
+  public Transaction beginTransaction() {
+    throw new UnsupportedOperationException("Use HibernatePlatformTransactionManager instead");
+  }
+
+  @Override
+  public Transaction beginTransaction(TransactionDefinition definition) {
+    throw new UnsupportedOperationException("Use HibernatePlatformTransactionManager instead");
+  }
+
+  public MappingContext getMappingContext() {
+    return getDatastore().getMappingContext();
+  }
+
+  public Serializable persist(Object o) {
+    hibernateTemplate.persist(o);
+    try {
+      MappingContext ctx = getDatastore().getMappingContext();
+      org.grails.datastore.mapping.model.PersistentEntity pe =
+          ctx.getPersistentEntity(o.getClass().getName());
+      if (pe != null) {
+        Object id = ctx.getEntityReflector(pe).getIdentifier(o);
+        return id == null ? null : (Serializable) id;
+      }
+    } catch (Exception ignored) {
+      // ignore and return null when identifier cannot be obtained
+    }
+    return null;
+  }
+
+  public Object merge(Object o) {
+    return hibernateTemplate.merge(o);
+  }
+
+  public void refresh(Object o) {
+    hibernateTemplate.refresh(o);
+  }
+
+  public void attach(Object o) {
+    hibernateTemplate.lock(o, LockMode.NONE);
+  }
+
+  public void flush() {
+    hibernateTemplate.flush();
+  }
+
+  public void clear() {
+    hibernateTemplate.clear();
+  }
+
+  public void clear(Object o) {
+    hibernateTemplate.evict(o);
+  }
+
+  public boolean contains(Object o) {
+    return hibernateTemplate.contains(o);
+  }
+
+  public void lock(Object o) {
+    hibernateTemplate.lock(o, LockMode.PESSIMISTIC_WRITE);
+  }
+
+  public void unlock(Object o) {
+    // do nothing
+  }
+
+  /**
+   * @deprecated persist method needs to be changed to void
+   * @param objects The Objects
+   * @return the result
+   */
+  @Deprecated
+  public List<Serializable> persist(Iterable objects) {
+    List<Serializable> ids = new ArrayList<>();
+    for (Object object : objects) {
+      Serializable id = persist(object);
+      ids.add(id);
+    }
+    return ids;
+  }
+
+  public <T> T retrieve(Class<T> type, Serializable key) {
+    return hibernateTemplate.get(type, key);
+  }
+
+  public <T> T proxy(Class<T> type, Serializable key) {
+    return hibernateTemplate.load(type, key);
+  }
+
+  public <T> T lock(Class<T> type, Serializable key) {
+    return hibernateTemplate.get(type, key, LockMode.PESSIMISTIC_WRITE);
+  }
+
+  public void delete(Iterable objects) {
+    Collection list = getIterableAsCollection(objects);
+    hibernateTemplate.deleteAll(list);
+  }
+
+  @SuppressWarnings("unchecked")
+  protected Collection getIterableAsCollection(Iterable objects) {
+    Collection list;
+    if (objects instanceof Collection) {
+      list = (Collection) objects;
+    } else {
+      list = new ArrayList();
+      for (Object object : objects) {
+        list.add(object);
+      }
+    }
+    return list;
+  }
+
+  public void delete(Object obj) {
+    hibernateTemplate.remove(obj);
+  }
+
+  public List retrieveAll(Class type, Serializable... keys) {
+    return retrieveAll(type, Arrays.asList(keys));
+  }
+
+  public Persister getPersister(Object o) {
+    return null;
+  }
+
+  public Transaction getTransaction() {
+    throw new UnsupportedOperationException("Use HibernatePlatformTransactionManager instead");
+  }
+
+  @Override
+  public boolean hasTransaction() {
+    Object resource =
+        TransactionSynchronizationManager.getResource(hibernateTemplate.getSessionFactory());
+    return resource != null;
+  }
+
+  public Datastore getDatastore() {
+    return datastore;
+  }
+
+  public boolean isDirty(Object o) {
+    // not used, Hibernate manages dirty checking itself
+    return true;
+  }
+
+  public Object getNativeInterface() {
+    return hibernateTemplate;
+  }
+
+  @Override
+  public void setSynchronizedWithTransaction(boolean synchronizedWithTransaction) {
+    // no-op
+  }
+
   @Override
   @SuppressWarnings("PMD.DataflowAnomalyAnalysis")
   public Serializable getObjectIdentifier(Object instance) {
@@ -241,3 +432,4 @@ public class HibernateSession extends AbstractHibernateSession {
     }
   }
 }
+
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/HibernateAssociationQuery.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/HibernateAssociationQuery.java
index 5deac25543..346e7e1ff7 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/HibernateAssociationQuery.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/HibernateAssociationQuery.java
@@ -23,7 +23,7 @@ import org.grails.datastore.mapping.model.PersistentEntity;
 import org.grails.datastore.mapping.model.types.Association;
 import org.grails.datastore.mapping.query.AssociationQuery;
 import org.grails.datastore.mapping.query.Query;
-import org.grails.orm.hibernate.AbstractHibernateSession;
+import org.grails.orm.hibernate.HibernateSession;
 
 /**
  * A thin wrapper over {@link HibernateQuery} that collects criteria for a single association scope.
@@ -50,7 +50,7 @@ public class HibernateAssociationQuery extends AssociationQuery {
   private final HibernateQuery innerQuery;
 
   public HibernateAssociationQuery(
-      AbstractHibernateSession session,
+      HibernateSession session,
       PersistentEntity associatedEntity,
       Association association,
       String associationPath,
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 60fa4a5386..3ffdc015b1 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
@@ -34,7 +34,7 @@ import org.grails.datastore.mapping.query.AssociationQuery;
 import org.grails.datastore.mapping.query.Projections;
 import org.grails.datastore.mapping.query.Query;
 import org.grails.datastore.mapping.query.api.QueryableCriteria;
-import org.grails.orm.hibernate.AbstractHibernateSession;
+import org.grails.orm.hibernate.HibernateSession;
 import org.grails.orm.hibernate.GrailsHibernateTemplate;
 import org.grails.orm.hibernate.HibernateSession;
 import org.grails.orm.hibernate.IHibernateTemplate;
@@ -74,7 +74,7 @@ public class HibernateQuery extends Query {
   private FlushMode flushMode;
   private Boolean readOnly;
 
-  public HibernateQuery(AbstractHibernateSession session, PersistentEntity entity) {
+  public HibernateQuery(HibernateSession session, PersistentEntity entity) {
     super(session, entity);
     this.detachedCriteria = new DetachedCriteria(entity.getJavaClass());
   }
@@ -318,7 +318,7 @@ public class HibernateQuery extends Query {
       String alias = generateAlias(associationName);
       CriteriaAndAlias subCriteria = getOrCreateAlias(associationName, alias);
       return new HibernateAssociationQuery(
-          (AbstractHibernateSession) getSession(),
+          (HibernateSession) getSession(),
           association.getAssociatedEntity(),
           association,
           subCriteria.associationPath,
diff --git a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/specs/HibernateGormDatastoreSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/specs/HibernateGormDatastoreSpec.groovy
index 3420f42423..8a25ef1e4f 100644
--- a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/specs/HibernateGormDatastoreSpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/specs/HibernateGormDatastoreSpec.groovy
@@ -3,7 +3,7 @@ package grails.gorm.specs
 import org.apache.grails.data.hibernate7.core.GrailsDataHibernate7TckManager
 import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec
 import org.grails.datastore.mapping.model.PersistentEntity
-import org.grails.orm.hibernate.AbstractHibernateSession
+import org.grails.orm.hibernate.HibernateSession
 import org.grails.orm.hibernate.HibernateDatastore
 import org.grails.orm.hibernate.cfg.domainbinding.binder.GrailsDomainBinder
 import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentEntity
@@ -135,8 +135,8 @@ class HibernateGormDatastoreSpec extends GrailsDataTckSpec<GrailsDataHibernate7T
     }
 
 
-    protected AbstractHibernateSession getSession() {
-        datastore.connect() as AbstractHibernateSession
+    protected HibernateSession getSession() {
+        datastore.connect() as HibernateSession
     }
 
     protected PersistentEntity getPersistentEntity(Class clazz) {
diff --git a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/specs/hibernatequery/HibernateAssociationQuerySpec.groovy b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/specs/hibernatequery/HibernateAssociationQuerySpec.groovy
index f01f20eb85..65156bf844 100644
--- a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/specs/hibernatequery/HibernateAssociationQuerySpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/specs/hibernatequery/HibernateAssociationQuerySpec.groovy
@@ -23,7 +23,7 @@ import org.apache.grails.data.testing.tck.domains.Person
 import org.apache.grails.data.testing.tck.domains.Pet
 import org.grails.datastore.mapping.query.AssociationQuery
 import org.grails.datastore.mapping.query.Query
-import org.grails.orm.hibernate.AbstractHibernateSession
+import org.grails.orm.hibernate.HibernateSession
 import org.grails.orm.hibernate.HibernateDatastore
 import org.grails.orm.hibernate.query.HibernateAssociationQuery
 import org.grails.orm.hibernate.query.HibernateQuery
@@ -39,7 +39,7 @@ class HibernateAssociationQuerySpec extends HibernateGormDatastoreSpec {
 
     def setup() {
         HibernateDatastore hibernateDatastore = manager.hibernateDatastore
-        AbstractHibernateSession session = hibernateDatastore.connect() as AbstractHibernateSession
+        HibernateSession session = hibernateDatastore.connect() as HibernateSession
         personQuery = new HibernateQuery(session, hibernateDatastore.getMappingContext().getPersistentEntity(Person.typeName))
         bob = new Person(firstName: "Bob", lastName: "Builder", age: 50).save(flush: true)
         new Pet(name: "Lucky", age: 3, owner: bob).save(flush: true)
diff --git a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/specs/hibernatequery/HibernateQuerySpec.groovy b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/specs/hibernatequery/HibernateQuerySpec.groovy
index d97fc5f0b4..09de989d4d 100644
--- a/grails-data-hibernate7/core/src/test/groovy/grails/gorm/specs/hibernatequery/HibernateQuerySpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/grails/gorm/specs/hibernatequery/HibernateQuerySpec.groovy
@@ -10,7 +10,7 @@ import jakarta.persistence.criteria.Subquery
 import org.apache.grails.data.testing.tck.domains.*
 import org.grails.datastore.mapping.engine.event.PersistEvent
 import org.grails.datastore.mapping.query.Query
-import org.grails.orm.hibernate.AbstractHibernateSession
+import org.grails.orm.hibernate.HibernateSession
 import org.grails.orm.hibernate.HibernateDatastore
 import org.grails.orm.hibernate.query.HibernateQuery
 import org.hibernate.query.criteria.JpaPredicate
@@ -31,7 +31,7 @@ class HibernateQuerySpec extends HibernateGormDatastoreSpec {
         def persister = sessionFactory.getMappingMetamodel().getEntityDescriptor(Person)
         println "Person ID generator: ${persister.getGenerator().class.name}"
         HibernateDatastore hibernateDatastore = manager.hibernateDatastore
-        AbstractHibernateSession session = hibernateDatastore.connect() as AbstractHibernateSession
+        HibernateSession session = hibernateDatastore.connect() as HibernateSession
         hibernateQuery = new HibernateQuery(session, hibernateDatastore.getMappingContext().getPersistentEntity(Person.typeName))
         petHibernateQuery = new HibernateQuery(session, hibernateDatastore.getMappingContext().getPersistentEntity(Pet.typeName))
         eagerHibernateQuery = new HibernateQuery(session, hibernateDatastore.getMappingContext().getPersistentEntity(EagerOwner.typeName))
@@ -527,7 +527,7 @@ class HibernateQuerySpec extends HibernateGormDatastoreSpec {
     def betweenBigDecimal() {
         given:
         HibernateDatastore hibernateDatastore = manager.hibernateDatastore
-        AbstractHibernateSession session = hibernateDatastore.connect() as AbstractHibernateSession
+        HibernateSession session = hibernateDatastore.connect() as HibernateSession
         HibernateQuery query = new HibernateQuery(session, hibernateDatastore.getMappingContext().getPersistentEntity(BigDecimalEntity.typeName))
         new BigDecimalEntity(amount: 10.5G).save(flush: true, failOnError: true)
         new BigDecimalEntity(amount: 20.5G).save(flush: true, failOnError: true)
@@ -700,7 +700,7 @@ class HibernateQuerySpec extends HibernateGormDatastoreSpec {
     def sumBigDecimal() {
         given:
         HibernateDatastore hibernateDatastore = manager.hibernateDatastore
-        AbstractHibernateSession session = hibernateDatastore.connect() as AbstractHibernateSession
+        HibernateSession session = hibernateDatastore.connect() as HibernateSession
         HibernateQuery query = new HibernateQuery(session, hibernateDatastore.getMappingContext().getPersistentEntity(BigDecimalEntity.typeName))
         new BigDecimalEntity(amount: 100.0G).save(flush: true, failOnError: true)
         new BigDecimalEntity(amount: 200.0G).save(flush: true, failOnError: true)
@@ -717,7 +717,7 @@ class HibernateQuerySpec extends HibernateGormDatastoreSpec {
     def avgBigDecimal() {
         given:
         HibernateDatastore hibernateDatastore = manager.hibernateDatastore
-        AbstractHibernateSession session = hibernateDatastore.connect() as AbstractHibernateSession
+        HibernateSession session = hibernateDatastore.connect() as HibernateSession
         HibernateQuery query = new HibernateQuery(session, hibernateDatastore.getMappingContext().getPersistentEntity(BigDecimalEntity.typeName))
         new BigDecimalEntity(amount: 100.0G).save(flush: true, failOnError: true)
         new BigDecimalEntity(amount: 200.0G).save(flush: true, failOnError: true)


(grails-core) 03/27: refactor(hibernate7): fold AbstractClosureEventTriggeringInterceptor into ClosureEventTriggeringInterceptor

Posted by bo...@apache.org.
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 d76b7ef1bb49b9d3b06f6b8b2f1a2f9309eac440
Author: Walter Duque de Estrada <wb...@mac.com>
AuthorDate: Wed Mar 4 09:14:59 2026 -0600

    refactor(hibernate7): fold AbstractClosureEventTriggeringInterceptor into ClosureEventTriggeringInterceptor
---
 .../HibernateConnectionSourceFactory.java          |  8 ++--
 .../HibernateConnectionSourceSettings.groovy       | 10 ++---
 .../AbstractClosureEventTriggeringInterceptor.java | 43 ----------------------
 .../support/ClosureEventTriggeringInterceptor.java | 28 +++++++++++++-
 4 files changed, 35 insertions(+), 54 deletions(-)

diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceFactory.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceFactory.java
index 4af992756a..bf69e27f29 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceFactory.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceFactory.java
@@ -39,7 +39,7 @@ import org.grails.orm.hibernate.cfg.HibernateMappingContext;
 import org.grails.orm.hibernate.cfg.HibernateMappingContextConfiguration;
 import org.grails.orm.hibernate.cfg.Settings;
 import org.grails.orm.hibernate.cfg.domainbinding.binder.GrailsDomainBinder;
-import org.grails.orm.hibernate.support.AbstractClosureEventTriggeringInterceptor;
+import org.grails.orm.hibernate.support.ClosureEventTriggeringInterceptor;
 import org.grails.orm.hibernate.support.ClosureEventTriggeringInterceptor;
 import org.hibernate.Interceptor;
 import org.hibernate.SessionFactory;
@@ -142,7 +142,7 @@ public class HibernateConnectionSourceFactory
 
     configureNamingStrategy(name, hibernateSettings);
 
-    AbstractClosureEventTriggeringInterceptor eventTriggeringInterceptor =
+    ClosureEventTriggeringInterceptor eventTriggeringInterceptor =
         resolveEventTriggeringInterceptor(
             hibernateSettings.getClosureEventTriggeringInterceptorClass());
     hibernateSettings.setEventTriggeringInterceptor(eventTriggeringInterceptor);
@@ -248,8 +248,8 @@ public class HibernateConnectionSourceFactory
     }
   }
 
-  private static AbstractClosureEventTriggeringInterceptor resolveEventTriggeringInterceptor(
-      Class<? extends AbstractClosureEventTriggeringInterceptor> clazz) {
+  private static ClosureEventTriggeringInterceptor resolveEventTriggeringInterceptor(
+      Class<? extends ClosureEventTriggeringInterceptor> clazz) {
     return clazz != null
         ? BeanUtils.instantiateClass(clazz)
         : new ClosureEventTriggeringInterceptor();
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.groovy b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.groovy
index f87692be51..f3a18c27aa 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.groovy
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.groovy
@@ -8,7 +8,7 @@ import org.grails.datastore.mapping.core.connections.ConnectionSourceSettings
 import org.grails.orm.hibernate.HibernateEventListeners
 import org.grails.datastore.gorm.jdbc.connections.DataSourceSettings
 import org.grails.orm.hibernate.dirty.GrailsEntityDirtinessStrategy
-import org.grails.orm.hibernate.support.AbstractClosureEventTriggeringInterceptor
+import org.grails.orm.hibernate.support.ClosureEventTriggeringInterceptor
 import org.hibernate.CustomEntityDirtinessStrategy
 import org.hibernate.boot.model.naming.CamelCaseToUnderscoresNamingStrategy
 import org.hibernate.boot.model.naming.PhysicalNamingStrategy
@@ -97,14 +97,14 @@ class HibernateConnectionSourceSettings extends ConnectionSourceSettings {
         Class<? extends CustomEntityDirtinessStrategy> entity_dirtiness_strategy = GrailsEntityDirtinessStrategy
 
         /**
-         * A subclass of AbstractClosureEventTriggeringInterceptor
+         * A subclass of ClosureEventTriggeringInterceptor
          */
-        Class<? extends AbstractClosureEventTriggeringInterceptor> closureEventTriggeringInterceptorClass
+        Class<? extends ClosureEventTriggeringInterceptor> closureEventTriggeringInterceptorClass
 
         /**
          * The event triggering interceptor
          */
-        AbstractClosureEventTriggeringInterceptor eventTriggeringInterceptor
+        ClosureEventTriggeringInterceptor eventTriggeringInterceptor
         /**
          * The default hibernate event listeners
          */
@@ -191,7 +191,7 @@ class HibernateConnectionSourceSettings extends ConnectionSourceSettings {
         Properties additionalProperties = new Properties()
 
         @CompileStatic
-        Map<String, Object> toHibernateEventListeners(AbstractClosureEventTriggeringInterceptor eventTriggeringInterceptor) {
+        Map<String, Object> toHibernateEventListeners(ClosureEventTriggeringInterceptor eventTriggeringInterceptor) {
             if(eventTriggeringInterceptor != null) {
                 return [
 //                    'save': eventTriggeringInterceptor,
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/support/AbstractClosureEventTriggeringInterceptor.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/support/AbstractClosureEventTriggeringInterceptor.java
deleted file mode 100644
index d7fb9f90ff..0000000000
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/support/AbstractClosureEventTriggeringInterceptor.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.grails.orm.hibernate.support;
-
-import org.hibernate.event.spi.*;
-import org.hibernate.jpa.event.spi.CallbackRegistryConsumer;
-import org.springframework.context.ApplicationContextAware;
-
-/**
- * Abstract class for defining the event triggering interceptor
- *
- * @author Graeme Rocher
- * @since 6.0
- */
-public abstract class AbstractClosureEventTriggeringInterceptor
-    implements ApplicationContextAware,
-        PreLoadEventListener,
-        PostLoadEventListener,
-        PostInsertEventListener,
-        PostUpdateEventListener,
-        PostDeleteEventListener,
-        PreDeleteEventListener,
-        PreUpdateEventListener,
-        PreInsertEventListener,
-        MergeEventListener,
-        PersistEventListener,
-        CallbackRegistryConsumer {}
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.java
index 2c44fc1e3f..922dccb4ab 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.java
@@ -38,17 +38,29 @@ import org.hibernate.event.internal.DefaultMergeEventListener;
 import org.hibernate.event.internal.DefaultPersistEventListener;
 import org.hibernate.event.spi.MergeContext;
 import org.hibernate.event.spi.MergeEvent;
+import org.hibernate.event.spi.MergeEventListener;
 import org.hibernate.event.spi.PersistContext;
 import org.hibernate.event.spi.PersistEvent;
+import org.hibernate.event.spi.PersistEventListener;
 import org.hibernate.event.spi.PostDeleteEvent;
+import org.hibernate.event.spi.PostDeleteEventListener;
 import org.hibernate.event.spi.PostInsertEvent;
+import org.hibernate.event.spi.PostInsertEventListener;
 import org.hibernate.event.spi.PostLoadEvent;
+import org.hibernate.event.spi.PostLoadEventListener;
 import org.hibernate.event.spi.PostUpdateEvent;
+import org.hibernate.event.spi.PostUpdateEventListener;
 import org.hibernate.event.spi.PreDeleteEvent;
+import org.hibernate.event.spi.PreDeleteEventListener;
 import org.hibernate.event.spi.PreInsertEvent;
+import org.hibernate.event.spi.PreInsertEventListener;
 import org.hibernate.event.spi.PreLoadEvent;
+import org.hibernate.event.spi.PreLoadEventListener;
 import org.hibernate.event.spi.PreUpdateEvent;
+import org.hibernate.event.spi.PreUpdateEventListener;
 import org.hibernate.jpa.event.spi.CallbackRegistry;
+import org.hibernate.jpa.event.spi.CallbackRegistryConsumer;
+import org.springframework.context.ApplicationContextAware;
 import org.hibernate.metamodel.mapping.AttributeMapping;
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.persister.entity.EntityPersister;
@@ -65,8 +77,20 @@ import org.springframework.context.ConfigurableApplicationContext;
  * @since 1.0
  */
 @SuppressWarnings({"PMD.DataflowAnomalyAnalysis", "PMD.NonSerializableClass"})
-public class ClosureEventTriggeringInterceptor extends AbstractClosureEventTriggeringInterceptor
-    implements Serializable {
+public class ClosureEventTriggeringInterceptor
+    implements Serializable,
+        ApplicationContextAware,
+        PreLoadEventListener,
+        PostLoadEventListener,
+        PostInsertEventListener,
+        PostUpdateEventListener,
+        PostDeleteEventListener,
+        PreDeleteEventListener,
+        PreUpdateEventListener,
+        PreInsertEventListener,
+        MergeEventListener,
+        PersistEventListener,
+        CallbackRegistryConsumer {
 
   //    private final Logger log = LoggerFactory.getLogger(getClass());
   private static final long serialVersionUID = 1;


(grails-core) 26/27: cleanup(hibernate7): ConfigureDerivedPropertiesConsumer

Posted by bo...@apache.org.
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 d29d3122c237c17c6f21a9df42a6b05c33113593
Author: Walter Duque de Estrada <wb...@mac.com>
AuthorDate: Thu Mar 5 07:50:56 2026 -0600

    cleanup(hibernate7): ConfigureDerivedPropertiesConsumer
---
 .../util/ConfigureDerivedPropertiesConsumer.java   |  5 +-
 .../ConfigureDerivedPropertiesConsumerSpec.groovy  | 68 ++++++++++++----------
 2 files changed, 41 insertions(+), 32 deletions(-)

diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/ConfigureDerivedPropertiesConsumer.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/ConfigureDerivedPropertiesConsumer.java
index 2c22d58277..e870c85e84 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/ConfigureDerivedPropertiesConsumer.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/ConfigureDerivedPropertiesConsumer.java
@@ -24,8 +24,9 @@ import java.util.Objects;
 import java.util.function.Consumer;
 import org.grails.datastore.mapping.model.PersistentProperty;
 import org.grails.orm.hibernate.cfg.Mapping;
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty;
 
-public class ConfigureDerivedPropertiesConsumer implements Consumer<PersistentProperty> {
+public class ConfigureDerivedPropertiesConsumer implements Consumer<HibernatePersistentProperty> {
 
   private final Mapping m;
 
@@ -34,7 +35,7 @@ public class ConfigureDerivedPropertiesConsumer implements Consumer<PersistentPr
   }
 
   @Override
-  public void accept(PersistentProperty persistentProperty) {
+  public void accept(HibernatePersistentProperty persistentProperty) {
     ofNullable(m.getPropertyConfig(persistentProperty.getName()))
         .ifPresent(
             propertyConfig ->
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/ConfigureDerivedPropertiesConsumerSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/ConfigureDerivedPropertiesConsumerSpec.groovy
index 3c340ed18f..8928764bb8 100644
--- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/ConfigureDerivedPropertiesConsumerSpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/ConfigureDerivedPropertiesConsumerSpec.groovy
@@ -1,31 +1,37 @@
 package org.grails.orm.hibernate.cfg.domainbinding
 
 import grails.gorm.specs.HibernateGormDatastoreSpec
-import org.grails.datastore.mapping.model.PersistentProperty
-import org.grails.orm.hibernate.cfg.Mapping
-import org.grails.orm.hibernate.cfg.PropertyConfig
+import grails.gorm.hibernate.HibernateEntity
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty
 import spock.lang.Subject
 
 import org.grails.orm.hibernate.cfg.domainbinding.util.ConfigureDerivedPropertiesConsumer
 
 class ConfigureDerivedPropertiesConsumerSpec extends HibernateGormDatastoreSpec {
 
+    HibernatePersistentProperty titleProperty
+
+    def setupSpec() {
+        manager.addAllDomainClasses([CDPCBook])
+    }
+
+    def setup() {
+        titleProperty = mappingContext.getPersistentEntity(CDPCBook.name)
+            .persistentProperties.find { it.name == 'title' } as HibernatePersistentProperty
+    }
+
     def "should set derived to true if formula is present"() {
         given:
-        def mapping = Mock(Mapping)
-        def propConfig = new PropertyConfig()
-        propConfig.setFormula("some SQL formula")
-        
-        def persistentProperty = Mock(PersistentProperty)
-        persistentProperty.getName() >> "derivedProp"
-        
-        mapping.getPropertyConfig("derivedProp") >> propConfig
-        
+        def mapping = mappingContext.getPersistentEntity(CDPCBook.name).mappedForm
+        def propConfig = new org.grails.orm.hibernate.cfg.PropertyConfig()
+        propConfig.formula = "upper(title)"
+        mapping.columns['title'] = propConfig
+
         @Subject
         def consumer = new ConfigureDerivedPropertiesConsumer(mapping)
 
         when:
-        consumer.accept(persistentProperty)
+        consumer.accept(titleProperty)
 
         then:
         propConfig.isDerived() == true
@@ -33,20 +39,16 @@ class ConfigureDerivedPropertiesConsumerSpec extends HibernateGormDatastoreSpec
 
     def "should set derived to false if formula is null"() {
         given:
-        def mapping = Mock(Mapping)
-        def propConfig = new PropertyConfig()
-        propConfig.setFormula(null)
-        
-        def persistentProperty = Mock(PersistentProperty)
-        persistentProperty.getName() >> "nonDerivedProp"
-        
-        mapping.getPropertyConfig("nonDerivedProp") >> propConfig
-        
+        def mapping = mappingContext.getPersistentEntity(CDPCBook.name).mappedForm
+        def propConfig = new org.grails.orm.hibernate.cfg.PropertyConfig()
+        propConfig.formula = null
+        mapping.columns['title'] = propConfig
+
         @Subject
         def consumer = new ConfigureDerivedPropertiesConsumer(mapping)
 
         when:
-        consumer.accept(persistentProperty)
+        consumer.accept(titleProperty)
 
         then:
         propConfig.isDerived() == false
@@ -54,19 +56,25 @@ class ConfigureDerivedPropertiesConsumerSpec extends HibernateGormDatastoreSpec
 
     def "should do nothing if property configuration is missing"() {
         given:
-        def mapping = Mock(Mapping)
-        def persistentProperty = Mock(PersistentProperty)
-        persistentProperty.getName() >> "missingProp"
-        
-        mapping.getPropertyConfig("missingProp") >> null
-        
+        def mapping = mappingContext.getPersistentEntity(CDPCBook.name).mappedForm
+
         @Subject
         def consumer = new ConfigureDerivedPropertiesConsumer(mapping)
 
+        // use a property name with no PropertyConfig entry
+        HibernatePersistentProperty idProp = mappingContext
+            .getPersistentEntity(CDPCBook.name).identity as HibernatePersistentProperty
+
         when:
-        consumer.accept(persistentProperty)
+        consumer.accept(idProp)
 
         then:
         noExceptionThrown()
     }
 }
+
+class CDPCBook implements HibernateEntity<CDPCBook> {
+    Long id
+    Long version
+    String title
+}