diff --git a/spring-beans/src/main/kotlin/org/springframework/beans/factory/BeanFactoryExtensions.kt b/spring-beans/src/main/kotlin/org/springframework/beans/factory/BeanFactoryExtensions.kt index 6e5014e992..608b11a50d 100644 --- a/spring-beans/src/main/kotlin/org/springframework/beans/factory/BeanFactoryExtensions.kt +++ b/spring-beans/src/main/kotlin/org/springframework/beans/factory/BeanFactoryExtensions.kt @@ -37,7 +37,6 @@ inline fun BeanFactory.getBean(): T = * @author Sebastien Deleuze * @since 5.0 */ -@Suppress("EXTENSION_SHADOWED_BY_MEMBER") inline fun BeanFactory.getBean(name: String): T = getBean(name, T::class.java) diff --git a/spring-context/src/main/kotlin/org/springframework/cache/CacheExtensions.kt b/spring-context/src/main/kotlin/org/springframework/cache/CacheExtensions.kt index 7fc7d8b19e..aff12f69f0 100644 --- a/spring-context/src/main/kotlin/org/springframework/cache/CacheExtensions.kt +++ b/spring-context/src/main/kotlin/org/springframework/cache/CacheExtensions.kt @@ -23,7 +23,6 @@ package org.springframework.cache * @author Mikhael Sokolov * @since 6.0 */ -@Suppress("EXTENSION_SHADOWED_BY_MEMBER") inline fun Cache.get(key: Any): T? = get(key, T::class.java) /** @@ -32,7 +31,6 @@ inline fun Cache.get(key: Any): T? = get(key, T::class.java) * @author Mikhael Sokolov * @since 6.0 */ -@Suppress("EXTENSION_SHADOWED_BY_MEMBER") operator fun Cache.get(key: Any): Cache.ValueWrapper? = get(key) /** diff --git a/spring-core/src/main/kotlin/org/springframework/core/env/PropertyResolverExtensions.kt b/spring-core/src/main/kotlin/org/springframework/core/env/PropertyResolverExtensions.kt index defbd030f3..19ed574be9 100644 --- a/spring-core/src/main/kotlin/org/springframework/core/env/PropertyResolverExtensions.kt +++ b/spring-core/src/main/kotlin/org/springframework/core/env/PropertyResolverExtensions.kt @@ -14,8 +14,6 @@ * limitations under the License. */ -@file:Suppress("EXTENSION_SHADOWED_BY_MEMBER") - package org.springframework.core.env /** diff --git a/spring-jdbc/src/main/kotlin/org/springframework/jdbc/core/JdbcOperationsExtensions.kt b/spring-jdbc/src/main/kotlin/org/springframework/jdbc/core/JdbcOperationsExtensions.kt index 7ed53cde07..dc2a597c88 100644 --- a/spring-jdbc/src/main/kotlin/org/springframework/jdbc/core/JdbcOperationsExtensions.kt +++ b/spring-jdbc/src/main/kotlin/org/springframework/jdbc/core/JdbcOperationsExtensions.kt @@ -63,7 +63,6 @@ inline fun JdbcOperations.queryForObject(sql: String, args: Array JdbcOperations.queryForList(sql: String): List = queryForList(sql, T::class.java) @@ -74,7 +73,6 @@ inline fun JdbcOperations.queryForList(sql: String): List = * @author Mario Arias * @since 5.0 */ -@Suppress("EXTENSION_SHADOWED_BY_MEMBER") inline fun JdbcOperations.queryForList(sql: String, args: Array, argTypes: IntArray): List = queryForList(sql, args, argTypes, T::class.java) diff --git a/spring-r2dbc/src/main/kotlin/org/springframework/r2dbc/core/DatabaseClientExtensions.kt b/spring-r2dbc/src/main/kotlin/org/springframework/r2dbc/core/DatabaseClientExtensions.kt index def5baf410..0054965c94 100644 --- a/spring-r2dbc/src/main/kotlin/org/springframework/r2dbc/core/DatabaseClientExtensions.kt +++ b/spring-r2dbc/src/main/kotlin/org/springframework/r2dbc/core/DatabaseClientExtensions.kt @@ -35,7 +35,6 @@ suspend fun DatabaseClient.GenericExecuteSpec.await() { * @author Mark Paluch * @author Ibanga Enoobong Ime */ -@Suppress("EXTENSION_SHADOWED_BY_MEMBER") inline fun DatabaseClient.GenericExecuteSpec.bind(index: Int, value: T?) = bind(index, if (value != null) Parameters.`in`(value) else Parameters.`in`(T::class.java)) /** @@ -44,5 +43,4 @@ inline fun DatabaseClient.GenericExecuteSpec.bind(index: Int, * @author Mark Paluch * @author Ibanga Enoobong Ime */ -@Suppress("EXTENSION_SHADOWED_BY_MEMBER") inline fun DatabaseClient.GenericExecuteSpec.bind(name: String, value: T?) = bind(name, if (value != null) Parameters.`in`(value) else Parameters.`in`(T::class.java)) 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 b24abc6fbd..8155d876eb 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 @@ -66,7 +66,6 @@ inline fun RequestBodySpec.body(flow: Flow): RequestHeaders * @author Arjen Poutsma * @since 5.0 */ -@Suppress("EXTENSION_SHADOWED_BY_MEMBER") inline fun ResponseSpec.expectBody(): BodySpec = expectBody(object : ParameterizedTypeReference() {})