From 4697ae10ee063fbf48448a6bd11f9630c803e2c5 Mon Sep 17 00:00:00 2001 From: Hejow Date: Thu, 24 Oct 2024 01:31:38 +0900 Subject: [PATCH] Relax the visibility of MockMVC DSL constructors Closes gh-33778 --- .../test/web/servlet/MockHttpServletRequestDsl.kt | 2 +- .../test/web/servlet/MockMultipartHttpServletRequestDsl.kt | 2 +- .../test/web/servlet/MockMvcResultHandlersDsl.kt | 2 +- .../test/web/servlet/MockMvcResultMatchersDsl.kt | 2 +- .../org/springframework/test/web/servlet/ResultActionsDsl.kt | 3 +-- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/spring-test/src/main/kotlin/org/springframework/test/web/servlet/MockHttpServletRequestDsl.kt b/spring-test/src/main/kotlin/org/springframework/test/web/servlet/MockHttpServletRequestDsl.kt index bacee88b6a..0e42b64188 100644 --- a/spring-test/src/main/kotlin/org/springframework/test/web/servlet/MockHttpServletRequestDsl.kt +++ b/spring-test/src/main/kotlin/org/springframework/test/web/servlet/MockHttpServletRequestDsl.kt @@ -41,7 +41,7 @@ import org.springframework.test.web.servlet.request.AbstractMockHttpServletReque * @author Sebastien Deleuze * @since 5.2 */ -open class MockHttpServletRequestDsl internal constructor (private val builder: AbstractMockHttpServletRequestBuilder<*>) { +open class MockHttpServletRequestDsl(private val builder: AbstractMockHttpServletRequestBuilder<*>) { /** * @see [MockHttpServletRequestBuilder.contextPath] diff --git a/spring-test/src/main/kotlin/org/springframework/test/web/servlet/MockMultipartHttpServletRequestDsl.kt b/spring-test/src/main/kotlin/org/springframework/test/web/servlet/MockMultipartHttpServletRequestDsl.kt index e2b3ad565c..827174c079 100644 --- a/spring-test/src/main/kotlin/org/springframework/test/web/servlet/MockMultipartHttpServletRequestDsl.kt +++ b/spring-test/src/main/kotlin/org/springframework/test/web/servlet/MockMultipartHttpServletRequestDsl.kt @@ -27,7 +27,7 @@ import jakarta.servlet.http.Part * @author Sebastien Deleuze * @since 5.2 */ -class MockMultipartHttpServletRequestDsl internal constructor (private val builder: MockMultipartHttpServletRequestBuilder) : MockHttpServletRequestDsl(builder) { +class MockMultipartHttpServletRequestDsl(private val builder: MockMultipartHttpServletRequestBuilder) : MockHttpServletRequestDsl(builder) { /** * @see [MockMultipartHttpServletRequestBuilder.file] diff --git a/spring-test/src/main/kotlin/org/springframework/test/web/servlet/MockMvcResultHandlersDsl.kt b/spring-test/src/main/kotlin/org/springframework/test/web/servlet/MockMvcResultHandlersDsl.kt index c493b450de..72727ed14b 100644 --- a/spring-test/src/main/kotlin/org/springframework/test/web/servlet/MockMvcResultHandlersDsl.kt +++ b/spring-test/src/main/kotlin/org/springframework/test/web/servlet/MockMvcResultHandlersDsl.kt @@ -26,7 +26,7 @@ import java.io.Writer * @author Sebastien Deleuze * @since 5.2 */ -class MockMvcResultHandlersDsl internal constructor (private val actions: ResultActions) { +class MockMvcResultHandlersDsl(private val actions: ResultActions) { /** * @see MockMvcResultHandlers.print diff --git a/spring-test/src/main/kotlin/org/springframework/test/web/servlet/MockMvcResultMatchersDsl.kt b/spring-test/src/main/kotlin/org/springframework/test/web/servlet/MockMvcResultMatchersDsl.kt index 1a65758d76..810285d153 100644 --- a/spring-test/src/main/kotlin/org/springframework/test/web/servlet/MockMvcResultMatchersDsl.kt +++ b/spring-test/src/main/kotlin/org/springframework/test/web/servlet/MockMvcResultMatchersDsl.kt @@ -25,7 +25,7 @@ import org.springframework.test.web.servlet.result.* * @author Sebastien Deleuze * @since 5.2 */ -class MockMvcResultMatchersDsl internal constructor (private val actions: ResultActions) { +class MockMvcResultMatchersDsl(private val actions: ResultActions) { /** * @see MockMvcResultMatchers.request diff --git a/spring-test/src/main/kotlin/org/springframework/test/web/servlet/ResultActionsDsl.kt b/spring-test/src/main/kotlin/org/springframework/test/web/servlet/ResultActionsDsl.kt index 5d41370246..e60dfba6b0 100644 --- a/spring-test/src/main/kotlin/org/springframework/test/web/servlet/ResultActionsDsl.kt +++ b/spring-test/src/main/kotlin/org/springframework/test/web/servlet/ResultActionsDsl.kt @@ -8,7 +8,7 @@ import org.springframework.test.web.servlet.request.MockMvcRequestBuilders * @author Sebastien Deleuze * @since 5.2 */ -class ResultActionsDsl internal constructor (private val actions: ResultActions, private val mockMvc: MockMvc) { +class ResultActionsDsl(private val actions: ResultActions, private val mockMvc: MockMvc) { /** * Provide access to [MockMvcResultMatchersDsl] Kotlin DSL. @@ -19,7 +19,6 @@ class ResultActionsDsl internal constructor (private val actions: ResultActions, return this } - /** * Provide access to [MockMvcResultMatchersDsl] Kotlin DSL. * @since 6.0.4