Skip to content

Refactor web url mappings #1253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rainboyan merged 3 commits into from
Dec 15, 2025
Merged

Refactor web url mappings #1253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ff146e
Relocate AnsiConsoleUrlMappingsRendererSpec
rainboyan Dec 15, 2025
5f7f4df
Relocate UrlMappingsErrorPageCustomizer
rainboyan Dec 15, 2025
4b83e7c
Relocate CORS related to grace-plugin-url-mappings
rainboyan Dec 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions grace-plugin-url-mappings/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,8 @@ dependencies {
api libs.spring.boot.autoconfigure
annotationProcessor libs.spring.boot.autoconfigureProcessor
annotationProcessor libs.spring.boot.configurationProcessor

testImplementation libs.jakarta.servlet
testImplementation libs.spring.test
testImplementation project(":grace-test")
}
2 changes: 1 addition & 1 deletion ...pping/cors/GrailsCorsConfiguration.groovy → ...pping/cors/GrailsCorsConfiguration.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2014-2022 the original author or authors.
* Copyright 2014-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion .../web/mapping/cors/GrailsCorsFilter.groovy → .../web/mapping/cors/GrailsCorsFilter.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2014-2022 the original author or authors.
* Copyright 2014-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion ...ors/GrailsDefaultCorsConfiguration.groovy → ...ors/GrailsDefaultCorsConfiguration.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2014-2022 the original author or authors.
* Copyright 2014-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
4 changes: 2 additions & 2 deletions ...ppings/src/main/groovy/org/grails/plugins/web/mapping/UrlMappingsPluginConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2021-2024 the original author or authors.
* Copyright 2021-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -87,7 +87,7 @@ public UrlMappingsHandlerMapping urlMappingsHandlerMapping(ObjectProvider<Grails
UrlMappingsHandlerMapping handlerMapping = new UrlMappingsHandlerMapping(urlMappingsHolderProvider.getIfAvailable());

if (!corsFilterEnabled) {
handlerMapping.setGrailsCorsConfiguration(grailsCorsConfiguration);
handlerMapping.setCorsConfigurations(grailsCorsConfiguration.getCorsConfigurations());
}

return handlerMapping;
Expand Down
2 changes: 1 addition & 1 deletion ...let/UrlMappingsErrorPageCustomizer.groovy → ...let/UrlMappingsErrorPageCustomizer.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2015-2023 the original author or authors.
* Copyright 2015-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
0 ...AnsiConsoleUrlMappingsRendererSpec.groovy → ...AnsiConsoleUrlMappingsRendererSpec.groovy
View file
Open in desktop
File renamed without changes.
7 changes: 1 addition & 6 deletions ...-url-mappings/src/main/groovy/org/grails/web/mapping/mvc/UrlMappingsHandlerMapping.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2014-2024 the original author or authors.
* Copyright 2014-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -34,7 +34,6 @@ import grails.web.http.HttpHeaders
import grails.web.mapping.UrlMapping
import grails.web.mapping.UrlMappingInfo
import grails.web.mapping.UrlMappingsHolder
import grails.web.mapping.cors.GrailsCorsConfiguration
import grails.web.mime.MimeType
import grails.web.mime.MimeTypeResolver

Expand Down Expand Up @@ -213,8 +212,4 @@ class UrlMappingsHandlerMapping extends AbstractHandlerMapping {

}

void setGrailsCorsConfiguration(GrailsCorsConfiguration grailsCorsConfiguration) {
this.corsConfigurations = grailsCorsConfiguration.corsConfigurations
}

}