From a2e740c896d3d9b834126e47c7ce4a9ff920f8b7 Mon Sep 17 00:00:00 2001
From: Sebastien Deleuze <sdeleuze@pivotal.io>
Date: Mon, 2 Sep 2019 16:37:42 +0200
Subject: [PATCH] Polishing

---
 .../test/web/reactive/server/WebTestClientExtensions.kt         | 2 --
 .../web/reactive/function/client/WebClientExtensions.kt         | 1 -
 .../web/reactive/function/server/ServerResponseExtensions.kt    | 1 -
 .../servlet/view/script/ScriptTemplateWithBindingsExtensions.kt | 2 +-
 .../springframework/web/servlet/view/script/kotlin/template.kts | 2 +-
 5 files changed, 2 insertions(+), 6 deletions(-)

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 b518fb1690..81a1cd5672 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 <reified T : Any, S : Publisher<T>> RequestBodySpec.body(publisher: S): RequestHeadersSpec<*>
 		= body(publisher, object : ParameterizedTypeReference<T>() {})
 
@@ -125,6 +124,5 @@ inline fun <reified E : Any> ResponseSpec.expectBodyList(): ListBodySpec<E> =
  * @author Sebastien Deleuze
  * @since 5.0
  */
-@Suppress("EXTENSION_SHADOWED_BY_MEMBER")
 inline fun <reified T : Any> ResponseSpec.returnResult(): FluxExchangeResult<T> =
 		returnResult(object : ParameterizedTypeReference<T>() {})
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 211363fb26..1700ebfd80 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 <reified T : Any, S : Publisher<T>> RequestBodySpec.body(publisher: S): RequestHeadersSpec<*> =
 		body(publisher, object : ParameterizedTypeReference<T>() {})
 
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 726986633a..951f387832 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 <reified T : Any> ServerResponse.BodyBuilder.body(publisher: Publisher<T>): Mono<ServerResponse> =
 		body(publisher, object : ParameterizedTypeReference<T>() {})
 
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 4dd36838af..683c782396 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 5f4a0d5629..f72c9414b8 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") }
 <p>${i18n("hello")} $foo</p>