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 c942767e879158c82f1ff9782deb86575d29ffb8 Author: Walter Duque de Estrada <[email protected]> AuthorDate: Mon Feb 23 14:33:26 2026 -0600 Removed deprecated methods in HibernateDatastore --- grails-data-hibernate7/REMOVAL_WARNINGS.md | 4 ---- .../org/grails/orm/hibernate/HibernateDatastore.java | 15 +++++++-------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/grails-data-hibernate7/REMOVAL_WARNINGS.md b/grails-data-hibernate7/REMOVAL_WARNINGS.md index 64fa40fb75..347ade680f 100644 --- a/grails-data-hibernate7/REMOVAL_WARNINGS.md +++ b/grails-data-hibernate7/REMOVAL_WARNINGS.md @@ -9,10 +9,6 @@ Generated from: Hibernate `7.1.11.Final` | Fully Qualified Class | Line | Warning | |---|---|---| -| `org.grails.orm.hibernate.HibernateDatastore` | 686 | `SchemaAutoTooling in org.hibernate.boot` has been deprecated and marked for removal | -| `org.grails.orm.hibernate.HibernateDatastore` | 687 | `SchemaAutoTooling in org.hibernate.boot` has been deprecated and marked for removal | -| `org.grails.orm.hibernate.HibernateDatastore` | 689 | `SchemaAutoTooling in org.hibernate.boot` has been deprecated and marked for removal | -| `org.grails.orm.hibernate.HibernateDatastore` | 690 | `SchemaAutoTooling in org.hibernate.boot` has been deprecated and marked for removal | | `org.grails.orm.hibernate.support.ClosureEventListener` | 342 | `EntityMetamodel in org.hibernate.tuple.entity` has been deprecated and marked for removal | | `org.grails.orm.hibernate.support.ClosureEventTriggeringInterceptor` | 286 | `EntityMetamodel in org.hibernate.tuple.entity` has been deprecated and marked for removal | | `org.grails.orm.hibernate.support.ClosureEventTriggeringInterceptor` | 305 | `EntityMetamodel in org.hibernate.tuple.entity` has been deprecated and marked for removal | diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/HibernateDatastore.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/HibernateDatastore.java index 76b6344e44..2b784df2be 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/HibernateDatastore.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/HibernateDatastore.java @@ -63,12 +63,12 @@ import org.grails.orm.hibernate.multitenancy.MultiTenantEventListener; import org.grails.orm.hibernate.support.ClosureEventTriggeringInterceptor; import org.hibernate.SessionFactory; import org.hibernate.boot.Metadata; -import org.hibernate.boot.SchemaAutoTooling; import org.hibernate.cfg.Environment; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.integrator.spi.Integrator; import org.hibernate.integrator.spi.IntegratorService; import org.hibernate.service.ServiceRegistry; +import org.hibernate.tool.schema.Action; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeansException; @@ -683,11 +683,10 @@ public class HibernateDatastore extends AbstractHibernateDatastore implements Me String dbCreate = tenantSettings.getDataSource().getDbCreate(); - SchemaAutoTooling schemaAutoTooling = - dbCreate != null ? SchemaAutoTooling.interpret(dbCreate) : null; - if (schemaAutoTooling != null - && schemaAutoTooling != SchemaAutoTooling.VALIDATE - && schemaAutoTooling != SchemaAutoTooling.NONE) { + Action schemaAutoTooling = + Action.interpretHbm2ddlSetting(dbCreate); + if (schemaAutoTooling != Action.VALIDATE + && schemaAutoTooling != Action.NONE) { Connection connection = null; try { @@ -718,14 +717,14 @@ public class HibernateDatastore extends AbstractHibernateDatastore implements Me dataSource = new MultiTenantDataSource(dataSource, schemaName) { @Override - public Connection getConnection() throws SQLException { + public Connection getConnection() { Connection connection = super.getConnection(); schemaHandler.useSchema(connection, schemaName); return new MultiTenantConnection(connection, schemaHandler); } @Override - public Connection getConnection(String username, String password) throws SQLException { + public Connection getConnection(String username, String password){ Connection connection = super.getConnection(username, password); schemaHandler.useSchema(connection, schemaName); return new MultiTenantConnection(connection, schemaHandler);
