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:26 UTC
(grails-core) 21/27: cleanup(hibernate7): General cleanup
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