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:47:05 UTC

(grails-core) 02/05: Merge branch 'refactor/java-to-groovy-spring-security' into groovyism/spring-security

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

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

commit 195ab56192cccaa022570f98fa72b6cfc2c6d711
Merge: 3c97784cc2 516865829f
Author: Walter Duque de Estrada <wb...@mac.com>
AuthorDate: Sat Oct 17 23:09:59 2026 -0400

    Merge branch 'refactor/java-to-groovy-spring-security' into groovyism/spring-security
    
    # Conflicts:
    #       grails-controllers/src/main/groovy/org/grails/plugins/web/controllers/GrailsSecurityHeadersFilter.groovy

 .../cache/GrailsConcurrentLinkedMapCache.groovy    |   86 +-
 .../grails/commons/DefaultGrailsCodecClass.groovy  |  261 ++--
 .../plugins/codecs/DefaultCodecLookup.groovy       |   51 +-
 .../org/grails/plugins/codecs/HTMLCodec.groovy     |   65 +-
 .../ControllersAutoConfiguration.groovy            |  180 +--
 .../controllers/GrailsSecurityHeadersFilter.groovy |    1 +
 .../metaclass/RenderDynamicMethod.groovy           |   54 +-
 .../src/main/groovy/grails/converters/JSON.groovy  |  463 ++++---
 .../src/main/groovy/grails/converters/XML.groovy   |  369 ++---
 .../org/grails/web/converters/ConverterUtil.groovy |  102 +-
 .../ChainedConverterConfiguration.groovy           |  116 +-
 .../DefaultConverterConfiguration.groovy           |  126 +-
 .../marshaller/json/ByteArrayMarshaller.groovy     |   20 +-
 .../marshaller/json/ToStringBeanMarshaller.groovy  |   24 +-
 .../json/ValidationErrorsMarshaller.groovy         |   84 +-
 .../marshaller/xml/GroovyBeanMarshaller.groovy     |   98 +-
 .../marshaller/xml/ToStringBeanMarshaller.groovy   |   24 +-
 .../xml/ValidationErrorsMarshaller.groovy          |   64 +-
 .../grails/beans/util/LazyMetaPropertyMap.groovy   |  134 +-
 .../grails/core/ArtefactHandlerAdapter.groovy      |  126 +-
 .../plugins/DefaultGrailsPluginManager.groovy      |  179 +--
 .../src/main/groovy/grails/util/Holders.groovy     |  161 +--
 .../core/internal/util/TypeConverters.groovy       |  153 ++-
 .../compiler/injection/PluginAstReader.groovy      |  131 +-
 .../org/grails/config/CompositeConfig.groovy       |  185 +--
 .../groovy/org/grails/config/PrefixedConfig.groovy |  145 +-
 .../org/grails/config/PropertySourcesConfig.groovy |  147 +-
 .../grails/core/AbstractGrailsApplication.groovy   |  104 +-
 .../core/DefaultGrailsControllerClass.groovy       |  170 +--
 .../artefact/DomainClassArtefactHandler.groovy     |  115 +-
 .../org/grails/core/io/SpringResource.groovy       |   43 +-
 .../util/BeanCreationProfilingPostProcessor.groovy |   43 +-
 .../org/grails/plugins/AbstractGrailsPlugin.groovy |  191 +--
 .../plugins/AbstractGrailsPluginManager.groovy     |  471 +++----
 .../org/grails/plugins/DefaultGrailsPlugin.groovy  |  596 ++++----
 .../plugins/ProfilingGrailsPluginManager.groovy    |  175 +--
 .../transaction/GrailsTransactionAttribute.groovy  |  119 +-
 .../ChainedTransactionManagerTests.groovy          |  503 +++----
 .../grails/datastore/bson/json/JsonReader.groovy   |  379 ++---
 .../grails/datastore/bson/json/JsonScanner.groovy  |  341 ++---
 .../grails/datastore/bson/json/JsonToken.groovy    |   59 +-
 .../grails/datastore/bson/json/JsonWriter.groovy   |  275 ++--
 .../grails/datastore/bson/query/BsonQuery.groovy   |  933 ++++++-------
 .../mongo/config/MongoMappingContext.groovy        |  392 +++---
 .../connections/RestartableMongoClient.groovy      |  193 +--
 .../mapping/mongo/query/MongoQuery.groovy          | 1332 +++++++++---------
 .../datastore/gorm/neo4j/CypherBuilder.groovy      |  190 +--
 .../gorm/neo4j/Neo4jMappingContext.groovy          |  145 +-
 .../datastore/gorm/neo4j/TypeDirectionPair.groovy  |   48 +-
 .../neo4j/engine/RelationshipPendingDelete.groovy  |   93 +-
 .../gorm/neo4j/parsers/PlingStemmer.groovy         | 1450 ++++++++++----------
 .../proxy/HashcodeEqualsAwareProxyFactory.groovy   |  108 +-
 .../main/groovy/grails/gorm/CriteriaBuilder.groovy |  120 +-
 .../main/groovy/grails/gorm/PagedResultList.groovy |  113 +-
 .../gorm/events/DomainEventListener.groovy         |  258 ++--
 .../gorm/finders/DynamicFinderInvocation.groovy    |   50 +-
 .../datastore/gorm/finders/ListResultFinder.groovy |   73 +-
 .../datastore/gorm/finders/MethodExpression.groovy |  265 ++--
 .../datastore/gorm/jdbc/DataSourceBuilder.groovy   |  160 +--
 .../datastore/gorm/query/AbstractResultList.groovy |  142 +-
 ...ctDatastorePersistenceContextInterceptor.groovy |   80 +-
 .../rx/proxy/RxJavassistProxyFactory.groovy        |  111 +-
 .../grails/compiler/gorm/GormTransformer.groovy    |   50 +-
 .../gorm/proxy/EntityProxyHandlerAdapter.groovy    |   37 +-
 .../gorm/proxy/ProxyHandlerAdapter.groovy          |   29 +-
 .../AggregatePersistenceContextInterceptor.groovy  |   33 +-
 .../validation/constraints/MaxConstraint.groovy    |   45 +-
 .../validation/constraints/MinConstraint.groovy    |   46 +-
 .../collection/AbstractPersistentCollection.groovy |  248 ++--
 .../mapping/collection/PersistentList.groovy       |  110 +-
 .../mapping/collection/PersistentSet.groovy        |   19 +-
 .../mapping/collection/PersistentSortedSet.groovy  |   33 +-
 .../mapping/core/AbstractDatastore.groovy          |  197 +--
 .../datastore/mapping/core/AbstractSession.groovy  |  812 ++++++-----
 .../mapping/core/impl/PendingInsertAdapter.groovy  |   27 +-
 .../core/impl/PendingOperationAdapter.groovy       |   51 +-
 .../mapping/core/impl/PendingUpdateAdapter.groovy  |   27 +-
 .../config/DocumentPersistentEntity.groovy         |   38 +-
 .../mapping/engine/BeanEntityAccess.groovy         |  118 +-
 .../mapping/engine/EntityPersister.groovy          |  218 +--
 .../engine/event/AbstractPersistenceEvent.groovy   |   93 +-
 .../mapping/engine/event/PostDeleteEvent.groovy    |   17 +-
 .../mapping/engine/event/PostInsertEvent.groovy    |   19 +-
 .../mapping/engine/event/PostLoadEvent.groovy      |   19 +-
 .../mapping/engine/event/PostUpdateEvent.groovy    |   17 +-
 .../mapping/engine/event/PreDeleteEvent.groovy     |   17 +-
 .../mapping/engine/event/PreInsertEvent.groovy     |   19 +-
 .../mapping/engine/event/PreLoadEvent.groovy       |   19 +-
 .../mapping/engine/event/PreUpdateEvent.groovy     |   17 +-
 .../mapping/engine/event/ValidationEvent.groovy    |   23 +-
 ...AbstractMappingAwareCustomTypeMarshaller.groovy |   45 +-
 .../mapping/config/KeyValueMappingContext.groovy   |   56 +-
 .../mapping/config/KeyValueMappingFactory.groovy   |   32 +-
 .../mapping/config/KeyValuePersistentEntity.groovy |   44 +-
 .../mapping/model/AbstractMappingContext.groovy    |  383 +++---
 .../mapping/model/AbstractPersistentEntity.groovy  |  338 ++---
 .../model/AbstractPersistentProperty.groovy        |   80 +-
 .../mapping/model/config/GormProperties.groovy     |    5 +-
 .../mapping/model/types/Association.groovy         |  198 ++-
 .../datastore/mapping/model/types/Basic.groovy     |   84 +-
 .../datastore/mapping/model/types/Embedded.groovy  |   17 +-
 .../mapping/model/types/ManyToMany.groovy          |   23 +-
 .../datastore/mapping/model/types/ToOne.groovy     |   23 +-
 .../conversion/DefaultConversionService.groovy     |   56 +-
 .../model/types/mapping/BasicWithMapping.groovy    |   23 +-
 .../model/types/mapping/CustomWithMapping.groovy   |   23 +-
 .../mapping/EmbeddedCollectionWithMapping.groovy   |   25 +-
 .../model/types/mapping/EmbeddedWithMapping.groovy |   25 +-
 .../model/types/mapping/IdentityWithMapping.groovy |   25 +-
 .../types/mapping/ManyToManyWithMapping.groovy     |   21 +-
 .../types/mapping/ManyToOneWithMapping.groovy      |   25 +-
 .../types/mapping/OneToManyWithMapping.groovy      |   25 +-
 .../model/types/mapping/OneToOneWithMapping.groovy |   25 +-
 .../model/types/mapping/PropertyWithMapping.groovy |    9 +-
 .../model/types/mapping/SimpleWithMapping.groovy   |   23 +-
 .../model/types/mapping/TenantIdWithMapping.groovy |   23 +-
 .../grails/datastore/mapping/query/Query.groovy    |  908 ++++++------
 .../query/criteria/FunctionCallingCriterion.groovy |   44 +-
 .../mapping/query/jpa/JpaQueryBuilder.groovy       | 1205 ++++++++--------
 .../query/order/ManualEntityOrdering.groovy        |  172 ++-
 .../mapping/reflect/FieldEntityAccess.groovy       |  459 +++----
 .../datastore/mapping/reflect/NameUtils.groovy     |  150 +-
 ...CustomizableRollbackTransactionAttribute.groovy |  105 +-
 .../validation/BeanFactoryValidatorRegistry.groovy |   22 +-
 .../mapping/validation/ValidationException.groovy  |   59 +-
 .../org/grails/buffer/CodecPrintWriter.groovy      |   55 +-
 .../org/grails/buffer/GrailsPrintWriter.groovy     |  432 +++---
 .../grails/buffer/GrailsPrintWriterAdapter.groovy  |  157 +--
 .../grails/buffer/GrailsRoutablePrintWriter.groovy |  223 +--
 .../org/grails/buffer/StreamByteBuffer.groovy      |  329 ++---
 .../org/grails/buffer/StreamCharBufferTests.groovy |  655 ++++-----
 .../grails/build/parsing/DefaultCommandLine.groovy |  150 +-
 .../gsp/compiler/GrailsLayoutPreprocessor.groovy   |   75 +-
 .../gsp/compiler/tags/GroovyCollectTag.groovy      |   45 +-
 .../gsp/compiler/tags/GroovyFindAllTag.groovy      |   45 +-
 .../grails/gsp/compiler/tags/GroovyGrepTag.groovy  |   45 +-
 .../gsp/compiler/tags/GroovySyntaxTag.groovy       |  149 +-
 .../CachingGroovyPageStaticResourceLocator.groovy  |   41 +-
 .../layout/EmbeddedGrailsLayoutViewResolver.groovy |   71 +-
 .../grails/web/layout/GSPGrailsLayoutPage.groovy   |  169 ++-
 .../layout/GrailsContentBufferingResponse.groovy   |  101 +-
 .../web/layout/GrailsLayoutViewResolver.groovy     |  115 +-
 .../web/layout/GrailsPageResponseWrapper.groovy    |  295 ++--
 .../web/layout/SpringMVCViewDecorator.groovy       |   96 +-
 .../taglib/AbstractTemplateVariableBinding.groovy  |  132 +-
 .../org/grails/taglib/GrailsTagException.groovy    |   47 +-
 .../discovery/ReflectedTagLibraryView.groovy       |   37 +-
 .../taglib/discovery/ReflectedTagMethodView.groovy |   49 +-
 .../encoder/DefaultOutputContextLookup.groovy      |   67 +-
 .../taglib/encoder/OutputEncodingStack.groovy      |  349 ++---
 .../encoder/OutputEncodingStackAttributes.groovy   |  179 +--
 .../org/grails/gsp/jsp/BodyContentImpl.groovy      |  109 +-
 .../jsp/GroovyPagesJspApplicationContext.groovy    |  139 +-
 .../grails/gsp/jsp/GroovyPagesPageContext.groovy   |  321 ++---
 .../org/grails/gsp/jsp/JspWriterDelegate.groovy    |   91 +-
 .../org/grails/gsp/jsp/LocalEntityResolver.groovy  |   67 +-
 .../grails/web/taglib/jsp/JspFormRemoteTag.groovy  |  113 +-
 .../org/grails/web/taglib/jsp/JspFormTag.groovy    |   49 +-
 .../web/taglib/jsp/JspInvokeGrailsTagLibTag.groovy |  287 ++--
 .../web/taglib/jsp/JspRemoteFunctionTag.groovy     |  113 +-
 .../grails/web/taglib/jsp/JspRemoteLinkTag.groovy  |  113 +-
 .../web/taglib/jsp/JspSubmitToRemoteTag.groovy     |  125 +-
 .../taglib/compiler/PageBindingCollector.groovy    |   60 +-
 .../WebRequestTemplateVariableBinding.groovy       |  126 +-
 .../org/grails/gsp/compiler/ScanTests.groovy       |   99 +-
 .../gsp/compiler/tags/GroovyCollectTagTests.groovy |   51 +-
 .../gsp/boot/StandaloneGrailsApplication.groovy    |   88 +-
 .../compiler/logging/LoggingTransformer.groovy     |   61 +-
 .../plugins/quartz/GrailsJobClassConstants.groovy  |   64 +-
 ...ailsApplicationCompilerAutoConfiguration.groovy |  160 +--
 .../cli/command/archive/ResourceMatcher.groovy     |  152 +-
 .../command/options/CompilerOptionHandler.groovy   |   37 +-
 .../org/grails/cli/command/run/RunCommand.groovy   |   79 +-
 .../GrailsCompilerAutoConfiguration.groovy         |   34 +-
 ...GroovyTemplatesCompilerAutoConfiguration.groovy |   30 +-
 .../JdbcCompilerAutoConfiguration.groovy           |   24 +-
 .../JmsCompilerAutoConfiguration.groovy            |   24 +-
 .../RabbitCompilerAutoConfiguration.groovy         |   24 +-
 .../SpringBatchCompilerAutoConfiguration.groovy    |   48 +-
 .../SpringBootCompilerAutoConfiguration.groovy     |   82 +-
 ...ringIntegrationCompilerAutoConfiguration.groovy |   44 +-
 .../SpringMvcCompilerAutoConfiguration.groovy      |   28 +-
 .../SpringSecurityCompilerAutoConfiguration.groovy |   22 +-
 .../SpringTestCompilerAutoConfiguration.groovy     |   42 +-
 ...SpringWebsocketCompilerAutoConfiguration.groovy |   22 +-
 ...ctionManagementCompilerAutoConfiguration.groovy |   24 +-
 .../compiler/grape/MavenResolverGrapeEngine.groovy |  274 ++--
 .../gradle/FetchAllTaskSelectorsBuildAction.groovy |   78 +-
 .../interactive/completers/StringsCompleter.groovy |   41 +-
 .../grails/spring/DefaultBeanConfiguration.groovy  |  244 ++--
 .../DefaultRuntimeSpringConfiguration.groovy       |  279 ++--
 .../grails/spring/GrailsApplicationContext.groovy  |  127 +-
 .../StartupProgressApplicationStartup.groovy       |  205 +--
 .../test/groovy/grails/validation/TestClass.groovy |   71 +-
 .../grails/plugin/json/builder/JsonOutput.groovy   |   47 +-
 .../main/groovy/grails/web/http/HttpHeaders.groovy |  128 +-
 .../grails/web/binding/StructuredDateEditor.groovy |   65 +-
 .../DefaultGrailsApplicationAttributes.groovy      |  215 +--
 .../org/grails/web/servlet/GrailsFlashScope.groovy |  160 +--
 .../WebRequestDelegatingRequestContext.groovy      |   59 +-
 .../util/BoundedCharsAsEncodedBytesCounter.groovy  |  139 +-
 .../grails/web/util/IncludeResponseWrapper.groovy  |  128 +-
 .../web/xml/PrettyPrintXMLStreamWriter.groovy      |   77 +-
 .../org/grails/web/xml/XMLStreamWriter.groovy      |  101 +-
 .../context/GrailsWebApplicationContext.groovy     |  155 ++-
 .../context/support/GrailsEnvironment.groovy       |   39 +-
 .../boostrap/DefaultGrailsBootstrapClass.groovy    |   56 +-
 .../support/WebRuntimeSpringConfiguration.groovy   |   65 +-
 .../grails/web/mapping/AbstractUrlMapping.groovy   |  129 +-
 .../grails/web/mapping/CachingLinkGenerator.groovy |  155 ++-
 .../web/mapping/DefaultUrlMappingData.groovy       |  149 +-
 .../web/mapping/DefaultUrlMappingInfo.groovy       |  256 ++--
 .../web/mapping/ResponseCodeMappingData.groovy     |   33 +-
 .../web/mapping/ResponseCodeUrlMapping.groovy      |   76 +-
 214 files changed, 15812 insertions(+), 15366 deletions(-)