This is an automated email from the ASF dual-hosted git repository. borinquenkid pushed a commit to branch 8.0.x-hibernate7 in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit e4cde38bc6339e2a1077cf6cab27285f13f356ad Author: Walter Duque de Estrada <[email protected]> AuthorDate: Wed Feb 25 19:00:30 2026 -0600 refactor methods for clarity --- .../hibernate/HibernatePersistentProperty.java | 29 +++++++++++++--------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernatePersistentProperty.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernatePersistentProperty.java index a04e73730f..5ab4ae3dd2 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernatePersistentProperty.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernatePersistentProperty.java @@ -27,6 +27,8 @@ import org.grails.datastore.mapping.model.types.Embedded; import org.grails.orm.hibernate.cfg.ColumnConfig; import org.grails.orm.hibernate.cfg.Mapping; import org.grails.orm.hibernate.cfg.PropertyConfig; + +import org.checkerframework.checker.nullness.qual.Nullable; import org.hibernate.mapping.DependantValue; import org.hibernate.mapping.Property; import org.hibernate.mapping.SimpleValue; @@ -82,19 +84,22 @@ public interface HibernatePersistentProperty extends PersistentProperty<Property * @return The type name */ default String getTypeName(Class<?> propertyType, PropertyConfig config, Mapping mapping) { - return ofNullable(config) - .map(PropertyConfig::getTypeName) - .orElseGet( - () -> - ofNullable(mapping) - .map(__ -> __.getTypeName(propertyType)) - .orElseGet( - () -> - Optional.ofNullable(propertyType) - .filter(__ -> !__.isEnum()) - .map(Class::getName) - .orElse(null))); + .map(PropertyConfig::getTypeName) + .orElseGet(() -> getMappingName(propertyType, mapping)); + } + + private static @Nullable String getMappingName(Class<?> propertyClass, Mapping mapping) { + return ofNullable(mapping) + .map(__ -> __.getTypeName(propertyClass)) + .orElseGet(() -> getClassName(propertyClass)); + } + + private static @Nullable String getClassName(Class<?> propertyClass) { + return ofNullable(propertyClass) + .filter(__ -> !__.isEnum()) + .map(Class::getName) + .orElse(null); } default GrailsHibernatePersistentEntity getHibernateOwner() {
