Merge pull request #1253 from rainboyan

rainboyan · web-flow · commit c843dd95b786 · 2025-12-15T17:45:16.000+08:00
* pr/1253: Refactor grace-web-url-mappings - Relocate CORS related to grace-plugin-url-mappings - Remove method `setGrailsCorsConfiguration()` in `UrlMappingsHandlerMapping`, use `AbstractHandlerMapping.setCorsConfigurations()` instead - Relocate `UrlMappingsErrorPageCustomizer` and `AnsiConsoleUrlMappingsRendererSpec` to grace-plugin-url-mappings Closes gh-1253
diff --git a/grace-plugin-url-mappings/build.gradle b/grace-plugin-url-mappings/build.gradle
@@ -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")
 }
diff --git a/grace-plugin-url-mappings/src/main/groovy/grails/web/mapping/cors/GrailsCorsConfiguration.groovy b/grace-plugin-url-mappings/src/main/groovy/grails/web/mapping/cors/GrailsCorsConfiguration.groovy
@@ -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.
diff --git a/grace-plugin-url-mappings/src/main/groovy/grails/web/mapping/cors/GrailsCorsFilter.groovy b/grace-plugin-url-mappings/src/main/groovy/grails/web/mapping/cors/GrailsCorsFilter.groovy
@@ -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.
diff --git a/grace-plugin-url-mappings/src/main/groovy/grails/web/mapping/cors/GrailsDefaultCorsConfiguration.groovy b/grace-plugin-url-mappings/src/main/groovy/grails/web/mapping/cors/GrailsDefaultCorsConfiguration.groovy
@@ -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.
diff --git a/grace-plugin-url-mappings/src/main/groovy/org/grails/plugins/web/mapping/UrlMappingsPluginConfiguration.java b/grace-plugin-url-mappings/src/main/groovy/org/grails/plugins/web/mapping/UrlMappingsPluginConfiguration.java
@@ -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.
@@ -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;
diff --git a/grace-plugin-url-mappings/src/main/groovy/org/grails/web/mapping/servlet/UrlMappingsErrorPageCustomizer.groovy b/grace-plugin-url-mappings/src/main/groovy/org/grails/web/mapping/servlet/UrlMappingsErrorPageCustomizer.groovy
@@ -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.
diff --git a/grace-plugin-url-mappings/src/test/groovy/org/grails/web/mapping/reporting/AnsiConsoleUrlMappingsRendererSpec.groovy b/grace-plugin-url-mappings/src/test/groovy/org/grails/web/mapping/reporting/AnsiConsoleUrlMappingsRendererSpec.groovy
diff --git a/grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/mvc/UrlMappingsHandlerMapping.groovy b/grace-web-url-mappings/src/main/groovy/org/grails/web/mapping/mvc/UrlMappingsHandlerMapping.groovy
@@ -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.
@@ -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
 
@@ -213,8 +212,4 @@ class UrlMappingsHandlerMapping extends AbstractHandlerMapping {
 
     }
 
-    void setGrailsCorsConfiguration(GrailsCorsConfiguration grailsCorsConfiguration) {
-        this.corsConfigurations = grailsCorsConfiguration.corsConfigurations
-    }
-
 }

Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,8 @@ dependencies {`
`14`	`14`	`api libs.spring.boot.autoconfigure`
`15`	`15`	`annotationProcessor libs.spring.boot.autoconfigureProcessor`
`16`	`16`	`annotationProcessor libs.spring.boot.configurationProcessor`
	`17`	`+`
	`18`	`+ testImplementation libs.jakarta.servlet`
	`19`	`+ testImplementation libs.spring.test`
	`20`	`+ testImplementation project(":grace-test")`
`17`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2014-2022 the original author or authors.`
	`2`	`+ * Copyright 2014-2025 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2021-2024 the original author or authors.`
	`2`	`+ * Copyright 2021-2025 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -87,7 +87,7 @@ public UrlMappingsHandlerMapping urlMappingsHandlerMapping(ObjectProvider<Grails`
`87`	`87`	`UrlMappingsHandlerMapping handlerMapping = new UrlMappingsHandlerMapping(urlMappingsHolderProvider.getIfAvailable());`
`88`	`88`
`89`	`89`	`if (!corsFilterEnabled) {`
`90`		`- handlerMapping.setGrailsCorsConfiguration(grailsCorsConfiguration);`
	`90`	`+ handlerMapping.setCorsConfigurations(grailsCorsConfiguration.getCorsConfigurations());`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`return handlerMapping;`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2015-2023 the original author or authors.`
	`2`	`+ * Copyright 2015-2025 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2014-2024 the original author or authors.`
	`2`	`+ * Copyright 2014-2025 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -34,7 +34,6 @@ import grails.web.http.HttpHeaders`
`34`	`34`	`import grails.web.mapping.UrlMapping`
`35`	`35`	`import grails.web.mapping.UrlMappingInfo`
`36`	`36`	`import grails.web.mapping.UrlMappingsHolder`
`37`		`-import grails.web.mapping.cors.GrailsCorsConfiguration`
`38`	`37`	`import grails.web.mime.MimeType`
`39`	`38`	`import grails.web.mime.MimeTypeResolver`
`40`	`39`
`@@ -213,8 +212,4 @@ class UrlMappingsHandlerMapping extends AbstractHandlerMapping {`
`213`	`212`
`214`	`213`	`}`
`215`	`214`
`216`		`- void setGrailsCorsConfiguration(GrailsCorsConfiguration grailsCorsConfiguration) {`
`217`		`- this.corsConfigurations = grailsCorsConfiguration.corsConfigurations`
`218`		`- }`
`219`		`-`
`220`	`215`	`}`