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 aaf8f260ece44c4fbe6ccfe34257beb255526ff3 Author: Walter B Duque de Estrada <[email protected]> AuthorDate: Mon Jan 26 10:42:30 2026 -0600 progress --- .../org/grails/orm/hibernate/cfg/GrailsDomainBinder.java | 6 ++---- .../grails/orm/hibernate/cfg/HibernateClassMapping.java | 15 ++++----------- .../org/grails/orm/hibernate/cfg/MappingCacheHolder.java | 6 +++--- 3 files changed, 9 insertions(+), 18 deletions(-) diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsDomainBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsDomainBinder.java index 3c7c7466ea..8f7a4af37f 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsDomainBinder.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsDomainBinder.java @@ -1090,10 +1090,8 @@ public class GrailsDomainBinder } } - private void evaluateMapping(GrailsHibernatePersistentEntity persistentEntity) { - Optional.ofNullable(persistentEntity).ifPresent(domainClass -> { - domainClass.getMappedForm(); - }); + public void evaluateMapping(GrailsHibernatePersistentEntity persistentEntity) { + MappingCacheHolder.getInstance().cacheMapping(persistentEntity); } diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/HibernateClassMapping.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/HibernateClassMapping.java index 71201e7f27..5c89a05fc3 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/HibernateClassMapping.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/HibernateClassMapping.java @@ -16,7 +16,6 @@ package org.grails.orm.hibernate.cfg; import org.grails.datastore.mapping.model.AbstractClassMapping; -import org.grails.datastore.mapping.model.DatastoreConfigurationException; import org.grails.datastore.mapping.model.MappingContext; import org.grails.datastore.mapping.model.PersistentEntity; import org.grails.datastore.mapping.model.PersistentProperty; @@ -33,17 +32,11 @@ public class HibernateClassMapping extends AbstractClassMapping<Mapping> { public HibernateClassMapping(PersistentEntity entity, MappingContext context) { super(entity, context); - try { - this.mappedForm = (Mapping) context.getMappingFactory().createMappedForm(entity); - for (PropertyConfig propConf : mappedForm.getPropertyConfigs().values()) { - if (propConf != null && propConf.getCascade() != null) { - propConf.setExplicitSaveUpdateCascade(CascadeBehavior.isSaveUpdate(propConf.getCascade())); - } + this.mappedForm = (Mapping) context.getMappingFactory().createMappedForm(entity); + for (PropertyConfig propConf : mappedForm.getPropertyConfigs().values()) { + if (propConf != null && propConf.getCascade() != null) { + propConf.setExplicitSaveUpdateCascade(CascadeBehavior.isSaveUpdate(propConf.getCascade())); } - MappingCacheHolder.getInstance().cacheMapping(entity.getJavaClass(), mappedForm); - } catch (Exception e) { - throw new DatastoreConfigurationException("Error evaluating ORM mappings block for domain [" + - entity.getName() + "]: " + e.getMessage(), e); } } diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/MappingCacheHolder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/MappingCacheHolder.java index c1a95b7d8e..dcbf863b59 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/MappingCacheHolder.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/MappingCacheHolder.java @@ -33,10 +33,10 @@ public class MappingCacheHolder { /** * Obtains a mapping object for the given domain class nam * - * @param theClass The domain class in question + * @param entity The domain class in question */ - public void cacheMapping(Class<?> theClass, Mapping mapping) { - MAPPING_CACHE.put(theClass, mapping); + public void cacheMapping(GrailsHibernatePersistentEntity entity) { + MAPPING_CACHE.put(entity.getJavaClass(), entity.getMappedForm()); } public void clear() {
