(grails-core) branch 8.0.x-hibernate7 updated: fix broken test and codestyle

[borinquenkid]

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


The following commit(s) were added to refs/heads/8.0.x-hibernate7 by this push:
     new 0f07b70bc6 fix broken test and codestyle
0f07b70bc6 is described below

commit 0f07b70bc6fc625aa13297bc52f11b3559a1ecd5
Author: Walter Duque de Estrada <wbdu...@mac.com>
AuthorDate: Sun May 24 14:32:56 2026 -0500

    fix broken test and codestyle
---
 .../core/GrailsDataHibernate5TckManager.groovy           | 16 ++++++++++------
 .../cfg/domainbinding/binder/ManyToOneBinder.java        |  4 ++--
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git 
a/grails-data-hibernate5/core/src/test/groovy/org/apache/grails/data/hibernate5/core/GrailsDataHibernate5TckManager.groovy
 
b/grails-data-hibernate5/core/src/test/groovy/org/apache/grails/data/hibernate5/core/GrailsDataHibernate5TckManager.groovy
index e71e88bd59..e4ce172698 100644
--- 
a/grails-data-hibernate5/core/src/test/groovy/org/apache/grails/data/hibernate5/core/GrailsDataHibernate5TckManager.groovy
+++ 
b/grails-data-hibernate5/core/src/test/groovy/org/apache/grails/data/hibernate5/core/GrailsDataHibernate5TckManager.groovy
@@ -53,6 +53,7 @@ class GrailsDataHibernate5TckManager extends 
GrailsDataTckManager {
     ApplicationContext applicationContext
     HibernateDatastore multiDataSourceDatastore
     HibernateDatastore multiTenantMultiDataSourceDatastore
+    Map grailsConfig
 
     @Override
     void setup(Class<? extends Specification> spec) {
@@ -62,17 +63,20 @@ class GrailsDataHibernate5TckManager extends 
GrailsDataTckManager {
 
     @Override
     Session createSession() {
-        ConfigObject grailsConfig = new ConfigObject()
+        ConfigObject config = new ConfigObject()
+        if (grailsConfig) {
+            config.putAll(grailsConfig)
+        }
+        if (!config.containsKey('dataSource.dbCreate') && 
!config.dataSource.containsKey('dbCreate')) {
+            config.dataSource.dbCreate = "create-drop"
+        }
         boolean isTransactional = true
 
         System.setProperty('hibernate5.gorm.suite', "true")
         grailsApplication = new DefaultGrailsApplication(domainClasses as 
Class[], new GroovyClassLoader(GrailsDataHibernate5TckManager.getClassLoader()))
-        if (grailsConfig) {
-            grailsApplication.config.putAll(grailsConfig)
-        }
+        grailsApplication.config.putAll(config)
 
-        grailsConfig.dataSource.dbCreate = "create-drop"
-        hibernateDatastore = new 
HibernateDatastore(DatastoreUtils.createPropertyResolver(grailsConfig), 
domainClasses as Class[])
+        hibernateDatastore = new 
HibernateDatastore(DatastoreUtils.createPropertyResolver(config), domainClasses 
as Class[])
         transactionManager = hibernateDatastore.getTransactionManager()
         sessionFactory = hibernateDatastore.sessionFactory
         if (transactionStatus == null && isTransactional) {
diff --git 
a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ManyToOneBinder.java
 
b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ManyToOneBinder.java
index 2280c0a95a..f4f452a9d3 100644
--- 
a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ManyToOneBinder.java
+++ 
b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ManyToOneBinder.java
@@ -18,6 +18,8 @@
  */
 package org.grails.orm.hibernate.cfg.domainbinding.binder;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Optional;
 
 import org.hibernate.boot.spi.MetadataBuildingContext;
@@ -29,8 +31,6 @@ import org.hibernate.mapping.Table;
 import org.grails.orm.hibernate.cfg.ColumnConfig;
 import org.grails.orm.hibernate.cfg.HibernateCompositeIdentity;
 import org.grails.orm.hibernate.cfg.JoinTable;
-import java.util.List;
-import java.util.ArrayList;
 import org.grails.orm.hibernate.cfg.Mapping;
 import org.grails.orm.hibernate.cfg.PersistentEntityNamingStrategy;
 import 
org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentEntity;