diff --git a/spring-test/src/main/kotlin/org/springframework/test/web/reactive/server/WebTestClientExtensions.kt b/spring-test/src/main/kotlin/org/springframework/test/web/reactive/server/WebTestClientExtensions.kt index b518fb1690c..81a1cd56723 100644 --- a/spring-test/src/main/kotlin/org/springframework/test/web/reactive/server/WebTestClientExtensions.kt +++ b/spring-test/src/main/kotlin/org/springframework/test/web/reactive/server/WebTestClientExtensions.kt @@ -30,7 +30,6 @@ import org.springframework.test.web.reactive.server.WebTestClient.* * @author Sebastien Deleuze * @since 5.0 */ -@Suppress("EXTENSION_SHADOWED_BY_MEMBER") inline fun > RequestBodySpec.body(publisher: S): RequestHeadersSpec<*> = body(publisher, object : ParameterizedTypeReference() {}) @@ -125,6 +124,5 @@ inline fun ResponseSpec.expectBodyList(): ListBodySpec = * @author Sebastien Deleuze * @since 5.0 */ -@Suppress("EXTENSION_SHADOWED_BY_MEMBER") inline fun ResponseSpec.returnResult(): FluxExchangeResult = returnResult(object : ParameterizedTypeReference() {}) diff --git a/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/client/WebClientExtensions.kt b/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/client/WebClientExtensions.kt index 211363fb260..1700ebfd803 100644 --- a/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/client/WebClientExtensions.kt +++ b/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/client/WebClientExtensions.kt @@ -35,7 +35,6 @@ import reactor.core.publisher.Mono * @author Sebastien Deleuze * @since 5.0 */ -@Suppress("EXTENSION_SHADOWED_BY_MEMBER") inline fun > RequestBodySpec.body(publisher: S): RequestHeadersSpec<*> = body(publisher, object : ParameterizedTypeReference() {}) diff --git a/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/server/ServerResponseExtensions.kt b/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/server/ServerResponseExtensions.kt index 726986633ae..951f387832f 100644 --- a/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/server/ServerResponseExtensions.kt +++ b/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/server/ServerResponseExtensions.kt @@ -32,7 +32,6 @@ import reactor.core.publisher.Mono * @author Sebastien Deleuze * @since 5.0 */ -@Suppress("EXTENSION_SHADOWED_BY_MEMBER") inline fun ServerResponse.BodyBuilder.body(publisher: Publisher): Mono = body(publisher, object : ParameterizedTypeReference() {}) diff --git a/spring-webmvc/src/test/kotlin/org/springframework/web/servlet/view/script/ScriptTemplateWithBindingsExtensions.kt b/spring-webmvc/src/test/kotlin/org/springframework/web/servlet/view/script/ScriptTemplateWithBindingsExtensions.kt index 4dd36838af5..683c7823969 100644 --- a/spring-webmvc/src/test/kotlin/org/springframework/web/servlet/view/script/ScriptTemplateWithBindingsExtensions.kt +++ b/spring-webmvc/src/test/kotlin/org/springframework/web/servlet/view/script/ScriptTemplateWithBindingsExtensions.kt @@ -1,6 +1,6 @@ @file:Suppress("UNCHECKED_CAST") -package org.springframework.web.reactive.result.view.script +package org.springframework.web.servlet.view.script import kotlin.script.templates.standard.ScriptTemplateWithBindings diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/kotlin/template.kts b/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/kotlin/template.kts index 5f4a0d56291..f72c9414b81 100644 --- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/kotlin/template.kts +++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/view/script/kotlin/template.kts @@ -1,4 +1,4 @@ -import org.springframework.web.reactive.result.view.script.* +import org.springframework.web.servlet.view.script.* """${include("header") }

${i18n("hello")} $foo