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 d351356ffb2c3d1a565ee911fccceab4c87d16ea Author: Walter Duque de Estrada <[email protected]> AuthorDate: Fri Feb 6 19:46:26 2026 -0600 progress --- .../grails/orm/hibernate/cfg/domainbinding/CollectionBinder.java | 7 +++---- .../cfg/domainbinding/secondpass/GrailsCollectionSecondPass.java | 5 +---- .../orm/hibernate/cfg/domainbinding/secondpass/MapSecondPass.java | 6 +----- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/CollectionBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/CollectionBinder.java index 5641a71411..ff2995e9df 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/CollectionBinder.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/CollectionBinder.java @@ -257,7 +257,7 @@ public class CollectionBinder { } else if ((otherSide instanceof ManyToMany) || Map.class.isAssignableFrom(property.getType())) { - bindDependentKeyValue((GrailsHibernatePersistentProperty) property, key, mappings, sessionFactoryBeanName); + bindDependentKeyValue((GrailsHibernatePersistentProperty) property, key); } @@ -271,7 +271,7 @@ public class CollectionBinder { } else { - bindDependentKeyValue((GrailsHibernatePersistentProperty) property, key, mappings, sessionFactoryBeanName); + bindDependentKeyValue((GrailsHibernatePersistentProperty) property, key); } @@ -696,8 +696,7 @@ public class CollectionBinder { manyToOne.setReferencedEntityName(property.getAssociatedEntity().getName()); } - private void bindDependentKeyValue(GrailsHibernatePersistentProperty property, DependantValue key, - @Nonnull InFlightMetadataCollector mappings, String sessionFactoryBeanName) { + private void bindDependentKeyValue(GrailsHibernatePersistentProperty property, DependantValue key) { if (LOG.isDebugEnabled()) { LOG.debug("[CollectionBinder] binding [" + property.getName() + "] with dependant key"); diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/GrailsCollectionSecondPass.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/GrailsCollectionSecondPass.java index f53fa43b46..15344cd02e 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/GrailsCollectionSecondPass.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/GrailsCollectionSecondPass.java @@ -46,10 +46,7 @@ public class GrailsCollectionSecondPass implements org.hibernate.boot.spi.Second this.sessionFactoryBeanName = sessionFactoryBeanName; } - public void doSecondPass(Map<?, ?> persistentClasses, Map<?, ?> inheritedMetas) throws MappingException { - grailsDomainBinder.bindCollectionSecondPass(property, mappings, persistentClasses, collection, sessionFactoryBeanName); - createCollectionKeys(); - } + private void createCollectionKeys() { collection.createAllKeys(); 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 5680a5e66e..45006c3b2c 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 @@ -20,11 +20,7 @@ public class MapSecondPass extends GrailsCollectionSecondPass { super(grailsDomainBinder, property, mappings, coll, sessionFactoryBeanName); } - @Override - public void doSecondPass(Map<?, ?> persistentClasses, Map<?, ?> inheritedMetas) throws MappingException { - grailsDomainBinder.bindMapSecondPass(property, mappings, persistentClasses, - (org.hibernate.mapping.Map) collection, sessionFactoryBeanName); - } + @SuppressWarnings("rawtypes") @Override
