This is an automated email from the ASF dual-hosted git repository. jamesfredley pushed a commit to branch improve-gh-ci-speed in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 7f9cbe083ed74f6b99b1888ab0a5d893f8ba46cc Author: James Fredley <[email protected]> AuthorDate: Sun Jan 25 13:50:40 2026 -0500 Use proper imports instead of inline fully-qualified class names --- .../groovy/org/grails/web/codecs/HTMLJSCodecIntegrationSpec.groovy | 3 ++- .../grails/web/servlet/DefaultGrailsApplicationAttributesTests.groovy | 3 ++- .../src/test/groovy/org/grails/web/util/StreamCharBufferSpec.groovy | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/codecs/HTMLJSCodecIntegrationSpec.groovy b/grails-test-suite-uber/src/test/groovy/org/grails/web/codecs/HTMLJSCodecIntegrationSpec.groovy index c0a050589c..c3724f350a 100644 --- a/grails-test-suite-uber/src/test/groovy/org/grails/web/codecs/HTMLJSCodecIntegrationSpec.groovy +++ b/grails-test-suite-uber/src/test/groovy/org/grails/web/codecs/HTMLJSCodecIntegrationSpec.groovy @@ -30,6 +30,7 @@ import org.grails.encoder.impl.JavaScriptCodec import org.grails.encoder.impl.RawCodec import org.grails.plugins.codecs.HTMLCodec import org.grails.web.servlet.mvc.GrailsWebRequest +import org.springframework.web.context.request.RequestContextHolder import spock.lang.Specification import spock.lang.Unroll @@ -59,7 +60,7 @@ public class HTMLJSCodecIntegrationSpec extends Specification { } def cleanup() { - org.springframework.web.context.request.RequestContextHolder.resetRequestAttributes() + RequestContextHolder.resetRequestAttributes() } @Unroll diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/DefaultGrailsApplicationAttributesTests.groovy b/grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/DefaultGrailsApplicationAttributesTests.groovy index 23a537766d..d02602e34a 100644 --- a/grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/DefaultGrailsApplicationAttributesTests.groovy +++ b/grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/DefaultGrailsApplicationAttributesTests.groovy @@ -21,6 +21,7 @@ package org.grails.web.servlet import org.grails.buffer.StreamCharBuffer import org.grails.web.servlet.mvc.GrailsWebRequest import org.grails.web.util.GrailsApplicationAttributes +import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import org.springframework.mock.web.MockHttpServletRequest @@ -50,7 +51,7 @@ class DefaultGrailsApplicationAttributesTests { request.setAttribute(GrailsApplicationAttributes.CONTROLLER, controller) } - @org.junit.jupiter.api.AfterEach + @AfterEach void tearDown() { RequestContextHolder.resetRequestAttributes() } diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/util/StreamCharBufferSpec.groovy b/grails-test-suite-uber/src/test/groovy/org/grails/web/util/StreamCharBufferSpec.groovy index f0253b4cd0..6a81e85a82 100644 --- a/grails-test-suite-uber/src/test/groovy/org/grails/web/util/StreamCharBufferSpec.groovy +++ b/grails-test-suite-uber/src/test/groovy/org/grails/web/util/StreamCharBufferSpec.groovy @@ -32,6 +32,7 @@ import org.grails.encoder.impl.HTML4Codec import org.grails.encoder.impl.JavaScriptCodec import org.grails.encoder.impl.RawCodec import org.grails.plugins.codecs.HTMLCodec +import org.springframework.web.context.request.RequestContextHolder import spock.lang.Issue import spock.lang.Specification @@ -67,7 +68,7 @@ class StreamCharBufferSpec extends Specification { } def cleanup() { - org.springframework.web.context.request.RequestContextHolder.resetRequestAttributes() + RequestContextHolder.resetRequestAttributes() } def "stream char buffer should support encoding"() {
