Merge pull request #14970 from apache/remove-servletContext-bootstrap

jamesfredley · web-flow · commit 183698bf7270 · 2025-08-14T09:12:09.000-04:00
fix: remove ServletContext from generated and test BootStrap.groovy files
diff --git a/grails-data-graphql/plugin/grails-app/init/gorm/graphql/BootStrap.groovy b/grails-data-graphql/plugin/grails-app/init/gorm/graphql/BootStrap.groovy
@@ -21,7 +21,7 @@ package gorm.graphql
 
 class BootStrap {
 
-    def init = { servletContext ->
+    def init = {
     }
     def destroy = {
     }
diff --git a/grails-data-neo4j/examples/grails3-neo4j-hibernate/grails-app/init/BootStrap.groovy b/grails-data-neo4j/examples/grails3-neo4j-hibernate/grails-app/init/BootStrap.groovy
@@ -19,7 +19,7 @@
 
 class BootStrap {
 
-    def init = { servletContext ->
+    def init = {
     }
     def destroy = {
     }
diff --git a/grails-data-neo4j/examples/grails3-neo4j/grails-app/init/BootStrap.groovy b/grails-data-neo4j/examples/grails3-neo4j/grails-app/init/BootStrap.groovy
@@ -19,7 +19,7 @@
 
 class BootStrap {
 
-    def init = { servletContext ->
+    def init = {
     }
     def destroy = {
     }
diff --git a/grails-data-neo4j/examples/test-data-service/grails-app/init/example/BootStrap.groovy b/grails-data-neo4j/examples/test-data-service/grails-app/init/example/BootStrap.groovy
@@ -21,7 +21,7 @@ package example
 
 class BootStrap {
 
-    def init = { servletContext ->
+    def init = {
     }
     def destroy = {
     }
diff --git a/grails-doc/src/en/guide/upgrading/upgrading60x.adoc b/grails-doc/src/en/guide/upgrading/upgrading60x.adoc
@@ -408,3 +408,11 @@ These limits can be customized using `server.tomcat.max-part-count` and `server.
 `server.tomcat.max-part-header-size` defalt is 512B
 
 https://docs.spring.io/spring-boot/appendix/application-properties/index.html#application-properties.server.server.tomcat.max-part-count[Spring Boot Common Application Properties]
+
+===== 12.16 servletContext no longer included by default in generated Bootstrap init{}
+
+The `servletContext` is no longer included by default in the generated `Bootstrap` class. If you need access to the `servletContext`, you can inject it into your `Bootstrap` class using:
+
+```console
+ServletContext servletContext
+```
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/lang/groovy/bootStrap.rocker.raw b/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/lang/groovy/bootStrap.rocker.raw
@@ -23,12 +23,8 @@ under the License.
 
 package @project.getPackageName()
 
-import jakarta.servlet.ServletContext
-
 class BootStrap {
 
-    ServletContext servletContext
-
     def init = {
     }
 
diff --git a/grails-profiles/base/skeleton/grails-app/init/@grails.codegen.defaultPackage.path@/BootStrap.groovy b/grails-profiles/base/skeleton/grails-app/init/@grails.codegen.defaultPackage.path@/BootStrap.groovy
@@ -1,11 +1,7 @@
 package @grails.codegen.defaultPackage@
 
-import jakarta.servlet.ServletContext
-
 class BootStrap {
 
-    ServletContext servletContext
-
     def init = {
     }
 
diff --git a/grails-test-examples/app1/grails-app/init/functionaltests/BootStrap.groovy b/grails-test-examples/app1/grails-app/init/functionaltests/BootStrap.groovy
@@ -19,12 +19,8 @@
 
 package functionaltests
 
-import jakarta.servlet.ServletContext
-
 class BootStrap {
 
-    ServletContext servletContext
-
     def init = {
         Book.withTransaction {
             new Book(title:"Example Book").save(flush:true)
diff --git a/grails-test-examples/app2/grails-app/init/BootStrap.groovy b/grails-test-examples/app2/grails-app/init/BootStrap.groovy
@@ -17,12 +17,8 @@
  *  under the License.
  */
 
-import jakarta.servlet.ServletContext
-
 class BootStrap {
 
-    ServletContext servletContext
-
     def init = {
     }
 
diff --git a/grails-test-examples/app3/grails-app/init/app3/BootStrap.groovy b/grails-test-examples/app3/grails-app/init/app3/BootStrap.groovy
@@ -19,12 +19,8 @@
 
 package app3
 
-import jakarta.servlet.ServletContext
-
 class BootStrap {
 
-    ServletContext servletContext
-
     def init = {
     }
 
diff --git a/grails-test-examples/demo33/grails-app/init/demo/BootStrap.groovy b/grails-test-examples/demo33/grails-app/init/demo/BootStrap.groovy
@@ -19,12 +19,8 @@
 
 package demo
 
-import jakarta.servlet.ServletContext
-
 class BootStrap {
 
-    ServletContext servletContext
-
     def init = {
     }
 
diff --git a/grails-test-examples/gorm/grails-app/init/gorm/BootStrap.groovy b/grails-test-examples/gorm/grails-app/init/gorm/BootStrap.groovy
@@ -19,12 +19,8 @@
 
 package gorm
 
-import jakarta.servlet.ServletContext
-
 class BootStrap {
 
-    ServletContext servletContext
-
     def init = {
         Book.withTransaction {
             def b = new Book(title:"The Stand")
diff --git a/grails-test-examples/hibernate5/grails-data-service/grails-app/init/example/BootStrap.groovy b/grails-test-examples/hibernate5/grails-data-service/grails-app/init/example/BootStrap.groovy
@@ -19,12 +19,8 @@
 
 package example
 
-import jakarta.servlet.ServletContext
-
 class BootStrap {
 
-    ServletContext servletContext
-
     def init = {
     }
 
diff --git a/grails-test-examples/hyphenated/grails-app/init/BootStrap.groovy b/grails-test-examples/hyphenated/grails-app/init/BootStrap.groovy
@@ -17,12 +17,8 @@
  *  under the License.
  */
 
-import jakarta.servlet.ServletContext
-
 class BootStrap {
 
-    ServletContext servletContext
-
     def init = {
     }
 
diff --git a/grails-test-examples/issue-11102/grails-app/init/issue11102/BootStrap.groovy b/grails-test-examples/issue-11102/grails-app/init/issue11102/BootStrap.groovy
@@ -19,12 +19,8 @@
 
 package issue11102
 
-import jakarta.servlet.ServletContext
-
 class BootStrap {
 
-    ServletContext servletContext
-
     def init = {
     }
 
diff --git a/grails-test-examples/issue-698-domain-save-npe/grails-app/init/BootStrap.groovy b/grails-test-examples/issue-698-domain-save-npe/grails-app/init/BootStrap.groovy
@@ -17,12 +17,8 @@
  *  under the License.
  */
 
-import jakarta.servlet.ServletContext
-
 class BootStrap {
 
-    ServletContext servletContext
-
     def init = {
     }
 
diff --git a/grails-test-examples/issue-views-182/grails-app/init/issueviews182/BootStrap.groovy b/grails-test-examples/issue-views-182/grails-app/init/issueviews182/BootStrap.groovy
@@ -19,12 +19,8 @@
 
 package issueviews182
 
-import jakarta.servlet.ServletContext
-
 class BootStrap {
 
-    ServletContext servletContext
-
     def init = {
     }
 
diff --git a/grails-test-examples/micronaut/grails-app/init/micronaut/BootStrap.groovy b/grails-test-examples/micronaut/grails-app/init/micronaut/BootStrap.groovy
@@ -21,8 +21,6 @@ package micronaut
 
 class BootStrap {
 
-    ServletContext servletContext
-
     def init = {
     }
     
diff --git a/grails-test-examples/mongodb/base/grails-app/init/BootStrap.groovy b/grails-test-examples/mongodb/base/grails-app/init/BootStrap.groovy
@@ -18,12 +18,9 @@
  */
 
 import functional.tests.*
-import jakarta.servlet.ServletContext
 
 class BootStrap {
 
-    ServletContext servletContext
-
     def init = {
     	Book.DB.drop()
     }
diff --git a/grails-test-examples/mongodb/database-per-tenant/grails-app/init/BootStrap.groovy b/grails-test-examples/mongodb/database-per-tenant/grails-app/init/BootStrap.groovy
@@ -17,12 +17,10 @@
  *  under the License.
  */
 
-import jakarta.servlet.ServletContext
 import org.grails.datastore.mapping.mongo.MongoDatastore
 
 class BootStrap {
 
-    ServletContext servletContext
     MongoDatastore mongoDatastore
 
     def init = {
diff --git a/grails-test-examples/mongodb/gson-templates/grails-app/init/BootStrap.groovy b/grails-test-examples/mongodb/gson-templates/grails-app/init/BootStrap.groovy
@@ -18,13 +18,10 @@
  */
 
 import groovy.transform.CompileStatic
-import jakarta.servlet.ServletContext
 
 @CompileStatic
 class BootStrap {
 
-    ServletContext servletContext
-
     def init = {
     }
 }
diff --git a/grails-test-examples/mongodb/hibernate5/grails-app/init/BootStrap.groovy b/grails-test-examples/mongodb/hibernate5/grails-app/init/BootStrap.groovy
@@ -18,12 +18,8 @@
  */
 
 import functional.tests.*
-import jakarta.servlet.ServletContext
 
 class BootStrap {
-
-    ServletContext servletContext
-
     def init = {
     	Book.DB.drop()
     }
diff --git a/grails-test-examples/mongodb/test-data-service/grails-app/init/example/BootStrap.groovy b/grails-test-examples/mongodb/test-data-service/grails-app/init/example/BootStrap.groovy
@@ -19,12 +19,8 @@
 
 package example
 
-import jakarta.servlet.ServletContext
-
 class BootStrap {
 
-    ServletContext servletContext
-
     def init = {
     }
 
diff --git a/grails-test-examples/plugins/issue11005/grails-app/init/issue11005/BootStrap.groovy b/grails-test-examples/plugins/issue11005/grails-app/init/issue11005/BootStrap.groovy
@@ -19,12 +19,8 @@
 
 package issue11005
 
-import jakarta.servlet.ServletContext
-
 class BootStrap {
 
-    ServletContext servletContext
-
     def init = {
     }
 
diff --git a/grails-test-examples/plugins/loadafter/grails-app/init/loadafter/BootStrap.groovy b/grails-test-examples/plugins/loadafter/grails-app/init/loadafter/BootStrap.groovy
@@ -19,12 +19,8 @@
 
 package loadafter
 
-import jakarta.servlet.ServletContext
-
 class BootStrap {
 
-    ServletContext servletContext
-
     def init = {
     }
 

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ package gorm.graphql`
`21`	`21`
`22`	`22`	`class BootStrap {`
`23`	`23`
`24`		`- def init = { servletContext ->`
	`24`	`+ def init = {`
`25`	`25`	`}`
`26`	`26`	`def destroy = {`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`
`20`	`20`	`class BootStrap {`
`21`	`21`
`22`		`- def init = { servletContext ->`
	`22`	`+ def init = {`
`23`	`23`	`}`
`24`	`24`	`def destroy = {`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ package example`
`21`	`21`
`22`	`22`	`class BootStrap {`
`23`	`23`
`24`		`- def init = { servletContext ->`
	`24`	`+ def init = {`
`25`	`25`	`}`
`26`	`26`	`def destroy = {`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,12 +23,8 @@ under the License.`
`23`	`23`
`24`	`24`	`package @project.getPackageName()`
`25`	`25`
`26`		`-import jakarta.servlet.ServletContext`
`27`		`-`
`28`	`26`	`class BootStrap {`
`29`	`27`
`30`		`- ServletContext servletContext`
`31`		`-`
`32`	`28`	`def init = {`
`33`	`29`	`}`
`34`	`30`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,7 @@`
`1`	`1`	`package @grails.codegen.defaultPackage@`
`2`	`2`
`3`		`-import jakarta.servlet.ServletContext`
`4`		`-`
`5`	`3`	`class BootStrap {`
`6`	`4`
`7`		`- ServletContext servletContext`
`8`		`-`
`9`	`5`	`def init = {`
`10`	`6`	`}`
`11`	`7`
Original file line number	Diff line number	Diff line change
`@@ -19,12 +19,8 @@`
`19`	`19`
`20`	`20`	`package app3`
`21`	`21`
`22`		`-import jakarta.servlet.ServletContext`
`23`		`-`
`24`	`22`	`class BootStrap {`
`25`	`23`
`26`		`- ServletContext servletContext`
`27`		`-`
`28`	`24`	`def init = {`
`29`	`25`	`}`
`30`	`26`