You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@grails.apache.org by bo...@apache.org on 2026/10/20 00:46:37 UTC

(grails-core) 04/04: Merge refactor/java-to-groovy-grails-spring into groovyism/grails-spring

This is an automated email from the ASF dual-hosted git repository.

borinquenkid pushed a commit to branch groovyism/grails-spring
in repository https://gitbox.apache.org/repos/asf/grails-core.git

commit 1df9beb709ff284ae8e55c29c92d073e7ecac437
Merge: f69982d384 e0638d8534
Author: Walter Duque de Estrada <wb...@mac.com>
AuthorDate: Sun Oct 18 10:27:28 2026 -0400

    Merge refactor/java-to-groovy-grails-spring into groovyism/grails-spring
    
    DefaultBeanConfiguration and DefaultRuntimeSpringConfiguration keep the
    idiomatic side; the incoming change only restores @CompileStatic, which this
    branch already carries.
    
    Co-Authored-By: Claude Fable 5.1 <no...@anthropic.com>

 .agents/skills/gradle-developer/SKILL.md           |   8 +
 .github/workflows/gradle.yml                       |   2 +-
 AGENTS.md                                          |   1 +
 THREAT_MODEL.md                                    |   2 +-
 .../apache/grails/buildsrc/CompilePlugin.groovy    |  56 +-
 .../grails/buildsrc/CompilePluginSpec.groovy       |  58 ++
 dependencies.gradle                                |   2 +-
 gradle.properties                                  |   8 +-
 gradle/grails-extension-gradle-config.gradle       |   4 +-
 .../org/grails/io/support/AntPathMatcher.groovy    |  36 +-
 .../grails/io/support/AntPathMatcherSpec.groovy    | 347 ++++++++++
 .../grails/io/support/ByteArrayResourceSpec.groovy |  97 +++
 grails-common/build.gradle                         |   4 -
 grails-converters/build.gradle                     |   3 +-
 .../src/main/groovy/grails/converters/JSON.java    |  75 ++-
 .../converters/ConvertersGrailsPlugin.groovy       |  20 +
 .../ConvertersConfigurationHolder.java             |  44 ++
 .../ConvertersConfigurationInitializer.java        | 161 ++++-
 .../jackson/DomainClassJacksonModule.java          | 119 ++++
 .../converters/jackson/DomainClassRendering.java   | 256 ++++++++
 .../converters/jackson/DomainClassSerializer.java  | 481 ++++++++++++++
 .../marshaller/json/ByteArrayMarshaller.java       |   4 +
 .../marshaller/json/CalendarMarshaller.java        |   4 +
 .../converters/marshaller/json/DateMarshaller.java |   4 +
 .../marshaller/json/DomainClassMarshaller.java     | 104 ++-
 .../marshaller/json/InstantMarshaller.java         |   4 +
 .../marshaller/json/JsonMapperValueMarshaller.java |  88 +++
 .../marshaller/json/LocalDateMarshaller.java       |   4 +
 .../marshaller/json/LocalDateTimeMarshaller.java   |   4 +
 .../converters/marshaller/json/MapMarshaller.java  |   3 +-
 .../marshaller/json/OffsetDateTimeMarshaller.java  |   4 +
 ...rrayMarshaller.java => OptionalMarshaller.java} |  15 +-
 ...alDateMarshaller.java => RecordMarshaller.java} |  30 +-
 .../marshaller/json/SimpleEnumMarshaller.java      |  17 +-
 .../marshaller/json/ToStringBeanMarshaller.java    |   4 +
 .../marshaller/json/ZonedDateTimeMarshaller.java   |   4 +
 .../converters/ConvertersGrailsPluginSpec.groovy   | 104 +++
 .../ConvertersConfigurationInitializerSpec.groovy  |  77 +++
 .../jackson/DomainClassJacksonModuleSpec.groovy    | 524 +++++++++++++++
 .../converters/json/JsonMapperRenderingSpec.groovy | 719 +++++++++++++++++++++
 .../web/converters/json/JsonParsingSpec.groovy     |  99 +++
 .../json/legacy/Grails8DomainRendering.groovy      | 213 ++++++
 .../json/legacy/Grails8JsonRenderingSpec.groovy    | 397 ++++++++++++
 .../commands/io/FileSystemInteractionImpl.groovy   |   9 +-
 .../io/FileSystemInteractionImplSpec.groovy        |  75 +++
 .../core/cli/io/FileSystemInteractionImpl.groovy   |   9 +-
 .../groovy/org/grails/config/CompositeConfig.java  |  59 +-
 .../additional-spring-configuration-metadata.json  |  12 +
 .../cli/io/FileSystemInteractionImplSpec.groovy    |  75 +++
 .../beans/util/LazyMetaPropertyMapSpec.groovy      | 138 ++++
 .../groovy/grails/util/GrailsClassUtilsSpec.groovy | 192 ++++++
 .../test/groovy/grails/util/GrailsUtilTests.java   |   2 +-
 .../org/grails/config/CompositeConfigSpec.groovy   | 220 +++++++
 .../org/grails/config/PrefixedConfigSpec.groovy    | 141 ++++
 .../org/grails/core/util/StopWatchSpec.groovy      | 150 +++++
 grails-data-hibernate5/core/build.gradle           |   4 +
 .../proxy/ByteBuddyGroovyInterceptor.java          |  23 +
 .../proxy/ByteBuddyGroovyProxyFactory.java         |  30 +-
 .../hibernate/proxy/GroovyProxyClassBuilder.java   | 115 ++++
 .../proxy/GroovyProxyMetaClassDispatcher.java      |  57 ++
 .../hibernate/proxy/SerializableGroovyProxy.java   | 126 ++++
 .../TraitInitializerProxySpec.groovy               | 232 +++++++
 .../proxy/ByteBuddyGroovyProxyFactorySpec.groovy   | 175 +++++
 .../proxy/GroovyProxyClassBuilderSpec.groovy       | 109 ++++
 .../GroovyProxyMetaClassDispatcherSpec.groovy      |  47 ++
 .../proxy/SerializableGroovyProxySpec.groovy       | 111 ++++
 grails-data-hibernate7/core/build.gradle           |   2 +
 .../generator/GrailsNativeGenerator.java           |  64 +-
 .../generator/GrailsSequenceGeneratorEnum.groovy   |   4 +-
 .../proxy/ByteBuddyGroovyInterceptor.java          |  24 +
 .../proxy/ByteBuddyGroovyProxyFactory.java         |  44 +-
 .../hibernate/proxy/GrailsBytecodeProvider.java    |  10 +-
 .../hibernate/proxy/GrailsProxyFactoryFactory.java |   2 +-
 .../hibernate/proxy/GroovyProxyClassBuilder.java   |  93 +++
 .../proxy/GroovyProxyMetaClassDispatcher.java      |  56 ++
 .../hibernate/proxy/SerializableGroovyProxy.java   | 146 +++++
 .../tests/NativeIdGeneratorHibernate7Spec.groovy   | 135 ++++
 .../TraitInitializerProxySpec.groovy               | 232 +++++++
 .../domainbinding/GrailsNativeGeneratorSpec.groovy | 137 ++--
 .../GrailsSequenceGeneratorEnumSpec.groovy         |   8 +-
 .../proxy/ByteBuddyGroovyInterceptorSpec.groovy    |  28 +
 .../proxy/ByteBuddyGroovyProxyFactorySpec.groovy   | 152 ++++-
 .../proxy/GrailsBytecodeProviderSpec.groovy        |  47 ++
 .../proxy/GroovyProxyClassBuilderSpec.groovy       | 107 +++
 .../GroovyProxyMetaClassDispatcherSpec.groovy      |  47 ++
 .../proxy/SerializableGroovyProxySpec.groovy       | 112 ++++
 .../dbmigration-core/build.gradle                  |   2 +
 grails-data-hibernate7/dbmigration/build.gradle    |   2 +
 .../GormIdentifierSnapshot16497Spec.groovy         |   6 +-
 grails-data-mongodb/core/build.gradle              |   2 +
 .../Jsr310ConvertersConfiguration.groovy           |   6 +-
 .../mapping/collection/PersistentList.groovy       |   2 +-
 .../datastore/mapping/core/AbstractSession.groovy  |   2 +-
 .../mapping/config/KeyValueMappingFactory.groovy   |  16 +-
 .../grails/datastore/mapping/query/Query.groovy    |   2 +-
 .../en/guide/REST/renderers/defaultRenderers.adoc  | 108 +++-
 .../src/en/guide/deployment/deploymentAot.adoc     |   6 +
 grails-doc/src/en/guide/introduction/whatsNew.adoc |  31 +
 .../springSecurity/core/filters.adoc               |   2 +
 .../src/en/guide/upgrading/upgrading80x.adoc       |  79 ++-
 .../src/en/guide/upgrading/upgrading90x.adoc       | 259 ++++++++
 .../gradle/classic-framework.init.gradle           |  34 +-
 grails-forge/gradle/test-config.gradle             |  10 +
 grails-forge/grails-forge-cli/build.gradle         |   4 -
 .../groovy/org/grails/forge/cli/CommandSpec.groovy |  16 +-
 .../org/grails/forge/cli/GeneratedBuildSpec.groovy |  34 +-
 .../forge/cli/command/CreateAppCommandSpec.groovy  |  21 +
 .../org/grails/forge/cli/GeneratedBuild.groovy     |  48 ++
 .../feature/database/GrailsDataHibernate5.groovy   |   7 +-
 .../feature/database/GrailsDataHibernate7.groovy   |   7 +-
 .../database/GrailsDataHibernate5Spec.groovy       |  12 +-
 .../database/GrailsDataHibernate7Spec.groovy       |  10 +-
 .../org/grails/forge/utils/CommandSpec.groovy      |   7 +-
 .../grails/build/parsing/DefaultCommandLine.groovy |  12 +-
 .../grails/io/support/GrailsResourceUtils.groovy   |   4 +-
 .../grails/io/support/ClassPathResourceSpec.groovy | 186 +++---
 .../io/support/FileSystemResourceSpec.groovy       | 162 ++---
 .../io/support/GrailsResourceUtilsSpec.groovy      | 520 ++++++---------
 .../grails/io/support/MainClassFinderSpec.groovy   | 171 ++++-
 .../org/grails/io/support/UrlResourceSpec.groovy   | 167 +++--
 .../gradle/plugin/core/GrailsExtension.groovy      |  12 +-
 .../gradle/plugin/core/GrailsGradlePlugin.groovy   |  61 +-
 .../gradle/plugin/core/GrailsExtensionSpec.groovy  |  23 +
 .../gradle/plugin/core/GrailsIndySpec.groovy       |  75 +++
 .../core/GrailsNativeImageDefaultsSpec.groovy      |  53 +-
 .../test-projects/indy-settings/build.gradle       |  40 ++
 .../test-projects/indy-settings/gradle.properties  |   1 +
 .../indy-settings/grails-app/conf/application.yml  |   0
 .../test-projects/indy-settings/settings.gradle    |   1 +
 .../src/main/groovy/demo/Dynamic.groovy            |   5 +
 .../test-projects/native-defaults-off/build.gradle |   7 +-
 .../test-projects/native-defaults-on/build.gradle  |  47 +-
 .../src/main/groovy/demo/Dynamic.groovy            |   5 +
 .../web/layout/TokenizedHTMLPage2Content.java      |   2 +-
 .../web/layout/GSPGrailsLayoutPageSpec.groovy      | 155 +++++
 .../web/layout/GrailsHTMLPageParserSpec.groovy     |  82 +++
 .../web/layout/GrailsLayoutTagLibSpec.groovy       | 112 ++++
 .../layout/GrailsPageResponseWrapperSpec.groovy    | 223 +++++++
 .../layout/GrailsViewBufferingResponseSpec.groovy  | 165 +++++
 .../grails/web/layout/LayoutDecoratorSpec.groovy   | 125 ++++
 .../web/layout/RenderGrailsLayoutTagLibSpec.groovy | 102 +++
 .../web/rest/render/atom/AtomRendererSpec.groovy   | 261 ++++++++
 .../web/rest/render/hal/HalXmlRendererSpec.groovy  | 290 +++++++++
 grails-shell-cli/build.gradle                      |   2 +
 .../commands/io/FileSystemInteractionImpl.groovy   |   9 +-
 .../grails/cli/command/CommandExceptionSpec.groovy |  73 +++
 .../grails/cli/command/CommandRunnerSpec.groovy    | 269 ++++++++
 .../org/grails/cli/command/HelpExampleSpec.groovy  |  33 +-
 .../cli/command/OptionParsingCommandSpec.groovy    |  84 +++
 .../io/FileSystemInteractionImplSpec.groovy        | 151 +++++
 .../templates/TemplateRendererImplSpec.groovy      | 151 +++++
 .../developer/skills/grails-developer/SKILL.md     |  30 +
 .../intercept/FilterSecurityInterceptor.groovy     |   4 +
 .../intercept/FilterSecurityInterceptorSpec.groovy | 141 +++-
 .../grails-hibernate-groovy-proxy/build.gradle     |   1 +
 .../grails-app/conf/application.yml                |   4 +
 .../grails-app/domain/example/Book.groovy          |  27 +-
 .../grails-app/domain/example/Loan.groovy          |  28 +-
 .../example/TraitDefaultValuesProxySpec.groovy     | 189 ++++++
 .../src/main/groovy/example/Auditable.groovy       |  28 +-
 .../hibernate5/grails-hibernate/build.gradle       |   1 +
 .../grails-app/conf/application.yml                |  11 +-
 .../functional/tests/ShipmentController.groovy     |  24 +-
 .../domain/functional/tests/Carrier.groovy         |  24 +-
 .../domain/functional/tests/Shipment.groovy        |  25 +-
 .../tests/JsonMapperConverterSpec.groovy           |  86 +++
 .../grails-hibernate-groovy-proxy/build.gradle     |   1 +
 .../grails-app/conf/application.yml                |   5 +-
 .../grails-app/domain/example/Book.groovy          |  27 +-
 .../grails-app/domain/example/Loan.groovy          |  28 +-
 .../example/TraitDefaultValuesProxySpec.groovy     | 189 ++++++
 .../src/main/groovy/example/Auditable.groovy       |  28 +-
 .../grails-app/conf/application.groovy             |  13 +
 .../groovy/specs/NoAnonymousFilterSpec.groovy      | 105 +++
 .../spring-security/ui/common/build.gradle         |   2 +
 .../binding/DateTimeRoundTripBindingSpec.groovy    |  10 +-
 .../web/converters/JSONConverterTests.groovy       |   9 +-
 .../org/grails/web/json/JSONWriterSpec.groovy      |  62 --
 grails-web-common/build.gradle                     |   1 +
 .../org/grails/web/json/GrailsPrettyPrinter.java   | 116 ++++
 .../org/grails/web/json/HtmlSafeJsonWriter.java    | 102 +++
 .../groovy/org/grails/web/json/JSONTokener.java    |   2 +-
 .../groovy/org/grails/web/json/JSONWriter.java     | 367 ++++++++---
 .../org/grails/web/json/JsonMapperSupport.java     | 244 +++++++
 .../org/grails/web/json/JsonMapperValue.java       |  86 +++
 .../org/grails/web/json/NestedValueSerializer.java | 215 ++++++
 .../web/json/PathCapturingJSONWriterWrapper.java   | 136 +++-
 .../org/grails/web/json/PrettyPrintJSONWriter.java | 138 +---
 .../org/grails/web/json/parser/JSONParser.java     |   7 +
 .../grails/web/json/HtmlSafeJsonWriterSpec.groovy  |  50 ++
 .../org/grails/web/json/JSONArrayApiSpec.groovy    | 322 +++++++++
 .../org/grails/web/json/JSONObjectApiSpec.groovy   | 345 ++++++++++
 .../org/grails/web/json/JSONTokenerApiSpec.groovy  | 245 +++++++
 .../org/grails/web/json/JSONWriterApiSpec.groovy   | 135 ++++
 .../org/grails/web/json/JSONWriterSpec.groovy      | 332 ++++++++++
 .../PathCapturingJSONWriterWrapperApiSpec.groovy   | 159 +++++
 .../web/json/PrettyPrintJSONWriterApiSpec.groovy   |  92 +++
 .../BoundedCharsAsEncodedBytesCounterSpec.groovy   | 167 +++++
 .../web/util/IncludeResponseWrapperSpec.groovy     | 181 ++++++
 .../org/grails/web/util/IncludedContentSpec.groovy |  88 +++
 .../groovy/org/grails/web/util/WebUtilsSpec.groovy | 269 +++++++-
 .../web/xml/PrettyPrintXMLStreamWriterSpec.groovy  | 112 ++++
 .../web/xml/StreamingMarkupWriterSpec.groovy       |  76 +++
 threat-model.yaml                                  |   2 +-
 204 files changed, 15860 insertions(+), 1578 deletions(-)