This is an automated email from the ASF dual-hosted git repository. borinquenkid pushed a commit to branch 7.1.x-hibernate6 in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 5d4dd508910aff5be208cf87d46c8b871de23297 Merge: 47b4641654 9ca377b921 Author: Walter Duque de Estrada <[email protected]> AuthorDate: Sat Nov 8 19:59:44 2025 -0600 Merge branch '7.1.x' into 7.1.x-hibernate6 # Conflicts: # grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormEntity.groovy .github/ISSUE_TEMPLATE/config.yml | 10 +- RELEASE.md | 16 +- .../org/apache/grails/buildsrc/SbomPlugin.groovy | 2 +- dependencies.gradle | 4 +- gradle.properties | 2 +- .../compiler/web/ControllerActionTransformer.java | 3 +- .../datastore/mapping/mongo/MongoDatastore.java | 35 ++- .../converters/DefaultConvertersConfiguration.java | 5 + .../Jsr310ConvertersConfiguration.groovy | 15 ++ .../groovy/grails/gorm/async/AsyncEntity.groovy | 2 + .../schemaless/ImplementsDynamicAttributes.groovy | 37 +-- .../src/main/groovy/grails/gorm/MultiTenant.groovy | 4 + .../grails/gorm/time/InstantConverter.groovy | 3 + .../grails/gorm/time/LocalDateConverter.groovy | 3 + .../grails/gorm/time/LocalDateTimeConverter.groovy | 3 + .../grails/gorm/time/LocalTimeConverter.groovy | 3 + .../gorm/time/OffsetDateTimeConverter.groovy | 3 + .../grails/gorm/time/OffsetTimeConverter.groovy | 3 + .../groovy/grails/gorm/time/PeriodConverter.groovy | 3 + .../grails/gorm/time/TemporalConverter.groovy | 3 + .../grails/gorm/time/ZonedDateTimeConverter.groovy | 3 + .../compiler/gorm/DirtyCheckingTransformer.groovy | 9 +- .../compiler/gorm/GormEntityTransformation.groovy | 19 +- .../org/grails/datastore/gorm/GormEntity.groovy | 115 +++++++++ .../datastore/gorm/GormEntityDirtyCheckable.groovy | 3 +- .../grails/datastore/gorm/GormValidateable.groovy | 19 +- .../gorm/schemaless/DynamicAttributes.groovy | 6 + ...AbstractArrayOrIterableResultImplementer.groovy | 3 + .../AbstractReadOperationImplementer.groovy | 3 + .../AbstractWriteOperationImplementer.groovy | 3 + .../implementers/InterfaceProjectionBuilder.groovy | 6 + .../IterableInterfaceProjectionBuilder.groovy | 3 + .../SingleResultInterfaceProjectionBuilder.groovy | 2 + .../transform/ServiceTransformation.groovy | 8 +- .../transform/TransactionalTransform.groovy | 11 +- ...tDatastoreMethodDecoratingTransformation.groovy | 10 +- .../AbstractMethodDecoratingTransformation.groovy | 2 + .../jakarta/services/ValidatedService.groovy | 19 +- .../MethodValidationImplementer.groovy | 2 + .../services/MethodValidationTransformSpec.groovy | 111 ++++---- .../grails/gorm/time/InstantConverterSpec.groovy | 18 +- .../grails/gorm/time/LocalDateConverterSpec.groovy | 23 +- .../gorm/time/LocalDateTimeConverterSpec.groovy | 36 ++- .../grails/gorm/time/LocalTimeConverterSpec.groovy | 25 +- .../gorm/time/OffsetDateTimeConverterSpec.groovy | 44 +++- .../gorm/time/OffsetTimeConverterSpec.groovy | 35 ++- .../grails/gorm/time/PeriodConverterSpec.groovy | 18 +- .../gorm/time/ZonedDateTimeConverterSpec.groovy | 43 +++- .../gorm/EntityWithGenericSignaturesSpec.groovy | 82 +++--- .../compiler/gorm/GormEntityTransformSpec.groovy | 286 ++++++++++++--------- .../compiler/gorm/JpaEntityTransformSpec.groovy | 65 ++--- .../main/groovy/grails/gorm/rx/MultiTenant.groovy | 11 +- .../src/main/groovy/grails/gorm/rx/RxEntity.groovy | 68 ++++- .../datastore/rx/collection/RxCollection.groovy | 10 +- .../transform/DelegateAsyncTransformation.java | 2 + .../gorm/async/transform/DelegateAsyncSpec.groovy | 41 +-- .../mapping/dirty/checking/DirtyCheckable.groovy | 12 + .../datastore/mapping/services/Service.groovy | 14 +- .../dirty/checking/DirtyCheckableSpec.groovy | 29 ++- .../services/DefaultServiceRegistrySpec.groovy | 31 ++- grails-doc/build.gradle | 2 +- .../src/en/guide/async/events/asyncConsuming.adoc | 4 +- .../src/en/guide/async/events/asyncNotifying.adoc | 4 +- .../en/guide/testing/unitTesting/annotations.adoc | 4 +- .../src/en/guide/upgrading/upgrading60x.adoc | 10 +- .../plugin/formfields/FormFieldsTagLib.groovy | 23 +- .../plugin/formfields/DisplayWidgetSpec.groovy | 15 +- .../grails/plugin/formfields/mock/Person.groovy | 5 + .../taglib/AbstractFormFieldsTagLibSpec.groovy | 5 +- .../plugin/formfields/taglib/DisplayTagSpec.groovy | 2 +- .../build/gradle/templates/buildGradle.rocker.raw | 2 +- .../forge/feature/grails/GrailsGradlePlugin.java | 4 +- .../feature/micronaut/MicronautHttpClient.java | 2 +- .../grails/forge/feature/view/GrailsGspSpec.groovy | 17 +- .../main/groovy/grails/util/BuildSettings.groovy | 2 +- .../gradle/plugin/core/GrailsGradlePlugin.groovy | 1 + .../plugins/web/DefaultGrailsTagDateHelper.groovy | 4 + grails-profiles/web-plugin/profile.yml | 1 + .../functionaltests/DataBindingController.groovy | 22 +- .../groovy/functionaltests/DataBindingSpec.groovy | 27 +- 80 files changed, 1101 insertions(+), 464 deletions(-) diff --cc grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormEntity.groovy index 43cb584214,8bdba0199a..bcb10a7314 --- a/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormEntity.groovy +++ b/grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormEntity.groovy @@@ -1338,8 -1450,34 +1450,10 @@@ trait GormEntity<D> implements GormVali currentGormStaticApi().findAll(query, params, args) } - /** - * Looks up a named query - * - * @param queryName The name of the query - * @return The query or null - * - * @deprecated Named queries are deprecated, use where queries instead - */ - @Generated - @Deprecated - static GormQueryOperations<D> getNamedQuery(String queryName) { - GormEnhancer.createNamedQuery(this, queryName) - } - /** - * Looks up a named query - * - * @param queryName The name of the query - * @return The query or null - * - * @deprecated Named queries are deprecated, use where queries instead - */ - @Generated - @Deprecated - static GormQueryOperations<D> getNamedQuery(String queryName, Object...args) { - GormEnhancer.createNamedQuery(this, queryName, args) - } + + + + @Generated private GormInstanceApi<D> currentGormInstanceApi() { (GormInstanceApi<D>) GormEnhancer.findInstanceApi(getClass()) }
