This is an automated email from the ASF dual-hosted git repository. borinquenkid pushed a commit to branch 8.0.x-hibernate7-dev in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit f513c2a13ac42a4ffbd12efcb6f51d26d24d1ac8 Merge: a10ab1f03f 84825ba25f Author: Walter Duque de Estrada <[email protected]> AuthorDate: Thu Mar 19 09:59:39 2026 -0500 Merge branch '8.0.x-hibernate7-bom' into 8.0.x-hibernate7-dev .github/workflows/codestyle.yml | 1 + .../hibernate/query/AbstractHibernateQuery.java | 16 + .../DetachedCriteriaCountSpec.groovy | 147 +++++++ .../groovy/grails/orm/CriteriaMethodInvoker.java | 32 +- .../grails/orm/HibernateCriteriaBuilder.java | 16 +- .../orm/hibernate/EventListenerIntegrator.java | 6 +- .../orm/hibernate/GrailsHibernateTemplate.java | 20 +- .../grails/orm/hibernate/GrailsSessionContext.java | 8 +- .../grails/orm/hibernate/HibernateDatastore.java | 71 ++-- .../org/grails/orm/hibernate/HibernateSession.java | 4 +- .../access/TraitPropertyAccessStrategy.java | 45 +- .../orm/hibernate/cfg/CompositeIdentity.groovy | 2 +- .../orm/hibernate/cfg/HibernateMappingContext.java | 16 +- .../cfg/HibernateMappingContextConfiguration.java | 26 +- .../binder/ClassPropertiesBinder.java | 6 +- .../cfg/domainbinding/binder/ColumnBinder.java | 24 +- .../cfg/domainbinding/binder/ComponentBinder.java | 1 - .../cfg/domainbinding/binder/ComponentUpdater.java | 4 +- .../domainbinding/binder/CompositeIdBinder.java | 6 +- .../CompositeIdentifierToManyToOneBinder.java | 4 +- .../binder/ForeignKeyOneToOneBinder.java | 4 +- .../domainbinding/binder/GrailsDomainBinder.java | 2 +- .../cfg/domainbinding/binder/IdentityBinder.java | 3 - .../cfg/domainbinding/binder/IndexBinder.java | 4 +- .../domainbinding/binder/JoinedSubClassBinder.java | 8 +- .../binder/NumericColumnConstraintsBinder.java | 12 +- .../cfg/domainbinding/binder/PropertyBinder.java | 16 +- .../RootPersistentClassCommonValuesBinder.java | 9 +- .../cfg/domainbinding/binder/SimpleIdBinder.java | 1 - .../domainbinding/binder/SimpleValueBinder.java | 8 +- .../binder/SingleTableSubclassBinder.java | 4 +- .../cfg/domainbinding/binder/SubClassBinder.java | 2 - .../binder/SubclassMappingBinder.java | 1 - .../domainbinding/binder/UnionSubclassBinder.java | 8 +- .../generator/GrailsIncrementGenerator.java | 10 +- .../hibernate/GrailsHibernatePersistentEntity.java | 19 +- .../hibernate/HibernateAssociation.java | 10 +- .../hibernate/HibernateBasicProperty.java | 3 +- .../HibernateEmbeddedCollectionProperty.java | 2 + .../HibernateEmbeddedPersistentEntity.java | 4 +- .../hibernate/HibernateManyToManyProperty.java | 2 + .../hibernate/HibernateOneToManyProperty.java | 2 + .../hibernate/HibernateOneToOneProperty.java | 16 +- .../hibernate/HibernatePersistentEntity.java | 6 +- .../secondpass/CollectionKeyBinder.java | 4 +- .../secondpass/CollectionOrderByBinder.java | 10 +- .../secondpass/CollectionWithJoinTableBinder.java | 8 +- .../secondpass/DependentKeyValueBinder.java | 6 +- .../domainbinding/secondpass/ListSecondPass.java | 3 - .../secondpass/ListSecondPassBinder.java | 16 +- .../domainbinding/secondpass/MapSecondPass.java | 3 - .../domainbinding/secondpass/SetSecondPass.java | 3 - .../secondpass/UnidirectionalOneToManyBinder.java | 16 +- .../domainbinding/util/BasicValueIdCreator.java | 8 +- .../cfg/domainbinding/util/CascadeBehavior.java | 4 +- .../domainbinding/util/CascadeBehaviorFetcher.java | 4 +- .../util/ColumnNameForPropertyAndPathFetcher.java | 6 +- .../util/DefaultColumnNameFetcher.java | 16 +- .../domainbinding/util/NamingStrategyProvider.java | 6 +- .../domainbinding/util/OrderByClauseBuilder.java | 8 +- .../util/SimpleValueColumnFetcher.java | 6 +- .../domainbinding/util/TableForManyCalculator.java | 6 +- .../HibernateConnectionSourceFactory.java | 11 +- .../event/listener/HibernateEventListener.java | 18 +- .../multitenancy/MultiTenantEventListener.java | 26 +- .../orm/hibernate/proxy/HibernateProxyHandler.java | 8 +- .../orm/hibernate/query/HibernateHqlQuery.java | 16 +- .../grails/orm/hibernate/query/HibernateQuery.java | 32 +- .../orm/hibernate/query/HqlListQueryBuilder.java | 6 +- .../orm/hibernate/query/HqlQueryContext.java | 16 +- .../hibernate/query/JpaCriteriaQueryCreator.java | 63 ++- .../orm/hibernate/query/JpaFromProvider.java | 15 +- .../orm/hibernate/query/RegexDialectPattern.java | 7 +- .../hibernate/support/ClosureEventListener.java | 51 ++- .../support/ClosureEventTriggeringInterceptor.java | 6 +- .../gorm/specs/BasicCollectionInQuerySpec.groovy | 167 ++++++++ ...hedCriteriaProjectionNullAssociationSpec.groovy | 136 ++++++ .../gorm/specs/HibernateValidationSpec.groovy | 80 ++++ .../test/groovy/grails/gorm/specs/RLikeSpec.groovy | 42 +- .../groovy/grails/gorm/specs/SqlQuerySpec.groovy | 149 +++++++ .../grails/gorm/specs/WhereQueryBugFixSpec.groovy | 106 +++++ .../WhereQueryOldIssueVerificationSpec.groovy | 373 +++++++++++++++++ .../DetachedCriteriaCountSpec.groovy | 145 +++++++ .../hasmany/TwoUnidirectionalHasManySpec.groovy | 49 ++- .../gorm/specs/proxy/ByteBuddyProxySpec.groovy | 112 ++++- .../core/GrailsDataHibernate7TckManager.groovy | 96 ++++- .../orm/hibernate/ExistsCrossJoinSpec.groovy | 122 ++++++ .../DataServiceDatasourceInheritanceSpec.groovy | 239 +++++++++++ .../DataServiceMultiDataSourceSpec.groovy | 460 +++++++++++++++++++++ ...ataServiceMultiTenantMultiDataSourceSpec.groovy | 287 +++++++++++++ .../MultipleDataSourceConnectionsSpec.groovy | 65 +++ .../WhereQueryMultiDataSourceSpec.groovy | 179 ++++++++ .../proxy/HibernateProxyHandler7Spec.groovy | 197 ++++++++- .../proxy/SimpleHibernateProxyHandlerSpec.groovy | 65 +++ .../support/MultiDataSourceSessionSpec.groovy | 193 +++++++++ .../groovy/grails/gorm/DetachedCriteria.groovy | 20 +- .../org/grails/datastore/gorm/GormStaticApi.groovy | 1 - .../data/testing/tck/tests/FindByMethodSpec.groovy | 2 +- .../mapping/model/DefaultIdentityMapping.java | 2 +- .../datastore/mapping/model/MappingFactory.java | 2 +- .../config/GormMappingConfigurationStrategy.java | 2 +- .../org/grails/datastore/mapping/query/Query.java | 16 + .../mapping/query/api/BuildableCriteria.java | 2 +- .../build.gradle | 25 +- .../grails-app/conf/application.yml | 58 +++ .../grails-app/conf/logback.xml | 37 ++ .../grails-app/domain/example/Product.groovy | 27 +- .../grails-app/init/example/Application.groovy | 17 +- .../example/InheritedProductService.groovy | 26 +- .../services/example/ProductService.groovy | 58 +++ .../DataServiceDatasourceInheritanceSpec.groovy | 112 +++++ .../DataServiceMultiDataSourceSpec.groovy | 180 ++++++++ .../functional/tests/BookControllerSpec.groovy | 22 +- .../BookPages.groovy} | 48 ++- .../grails-multiple-datasources/build.gradle | 3 + .../datasources/SecondaryBookController.groovy | 78 ++++ .../controllers/datasources/UrlMappings.groovy | 20 +- .../MultiDataSourceWithSessionSpec.groovy | 86 ++++ .../build.gradle | 25 +- .../grails-app/conf/application.yml | 62 +++ .../grails-app/conf/logback.xml | 37 ++ .../grails-app/domain/example/Metric.groovy} | 37 +- .../grails-app/init/example/Application.groovy | 16 +- .../services/example/MetricService.groovy | 65 +++ .../MultiTenantMultiDataSourceSpec.groovy | 186 +++++++++ settings.gradle | 6 + 126 files changed, 5019 insertions(+), 540 deletions(-) diff --cc grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionWithJoinTableBinder.java index 8988966a35,32a0396006..38aebd6d77 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionWithJoinTableBinder.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionWithJoinTableBinder.java @@@ -26,10 -28,9 +28,10 @@@ import org.grails.orm.hibernate.cfg.Per import org.grails.orm.hibernate.cfg.domainbinding.binder.CollectionForPropertyConfigBinder; import org.grails.orm.hibernate.cfg.domainbinding.binder.CompositeIdentifierToManyToOneBinder; import org.grails.orm.hibernate.cfg.domainbinding.binder.SimpleValueColumnBinder; +import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateBasicProperty; import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateToManyProperty; - import static org.grails.orm.hibernate.cfg.domainbinding.binder.GrailsDomainBinder.*; + import static org.grails.orm.hibernate.cfg.domainbinding.binder.GrailsDomainBinder.EMPTY_PATH; /** Binds a collection with a join table. */ @SuppressWarnings("PMD.DataflowAnomalyAnalysis") diff --cc grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/CascadeBehaviorFetcher.java index 41a972206d,a7ffdbb29b..e0a629a908 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/CascadeBehaviorFetcher.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/CascadeBehaviorFetcher.java @@@ -35,11 -35,11 +35,13 @@@ import org.grails.orm.hibernate.cfg.dom import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateOneToOneProperty; import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty; - import static org.grails.orm.hibernate.cfg.domainbinding.util.CascadeBehavior.*; + import static org.grails.orm.hibernate.cfg.domainbinding.util.CascadeBehavior.ALL; + import static org.grails.orm.hibernate.cfg.domainbinding.util.CascadeBehavior.NONE; + import static org.grails.orm.hibernate.cfg.domainbinding.util.CascadeBehavior.SAVE_UPDATE; -/** The cascade behavior fetcher class. */ +/** + * The cascade behavior fetcher class. + */ public class CascadeBehaviorFetcher { private static final Logger LOG = LoggerFactory.getLogger(CascadeBehaviorFetcher.class);
