From 9cb4c5565a54f06fb46254f646b7e85b74ed89a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Deleuze?= Date: Fri, 24 Feb 2023 10:46:27 +0100 Subject: [PATCH] Fix proxy hint Kotlin extensions Closes gh-30025 --- .../org/springframework/aot/hint/JdkProxyHintExtensions.kt | 2 +- .../kotlin/org/springframework/aot/hint/ProxyHintsExtensions.kt | 2 +- .../org/springframework/aot/hint/JdkProxyHintExtensionsTests.kt | 2 +- .../org/springframework/aot/hint/ProxyHintsExtensionsTests.kt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-core/src/main/kotlin/org/springframework/aot/hint/JdkProxyHintExtensions.kt b/spring-core/src/main/kotlin/org/springframework/aot/hint/JdkProxyHintExtensions.kt index 670349d1b5e..2d23588cc73 100644 --- a/spring-core/src/main/kotlin/org/springframework/aot/hint/JdkProxyHintExtensions.kt +++ b/spring-core/src/main/kotlin/org/springframework/aot/hint/JdkProxyHintExtensions.kt @@ -25,4 +25,4 @@ import kotlin.reflect.KClass * @since 6.0.5 */ fun JdkProxyHint.Builder.proxiedInterfaces(vararg proxiedInterfaces: KClass<*>) = - proxiedInterfaces(*proxiedInterfaces.map { it::class.java }.toTypedArray()) + proxiedInterfaces(*proxiedInterfaces.map { it.java }.toTypedArray()) diff --git a/spring-core/src/main/kotlin/org/springframework/aot/hint/ProxyHintsExtensions.kt b/spring-core/src/main/kotlin/org/springframework/aot/hint/ProxyHintsExtensions.kt index e74e54f185f..65650b52499 100644 --- a/spring-core/src/main/kotlin/org/springframework/aot/hint/ProxyHintsExtensions.kt +++ b/spring-core/src/main/kotlin/org/springframework/aot/hint/ProxyHintsExtensions.kt @@ -25,4 +25,4 @@ import kotlin.reflect.KClass * @since 6.0.5 */ fun ProxyHints.registerJdkProxy(vararg proxiedInterfaces: KClass<*>) = - registerJdkProxy(*proxiedInterfaces.map { it::class.java }.toTypedArray()) + registerJdkProxy(*proxiedInterfaces.map { it.java }.toTypedArray()) diff --git a/spring-core/src/test/kotlin/org/springframework/aot/hint/JdkProxyHintExtensionsTests.kt b/spring-core/src/test/kotlin/org/springframework/aot/hint/JdkProxyHintExtensionsTests.kt index 3fc49733be4..575054063d0 100644 --- a/spring-core/src/test/kotlin/org/springframework/aot/hint/JdkProxyHintExtensionsTests.kt +++ b/spring-core/src/test/kotlin/org/springframework/aot/hint/JdkProxyHintExtensionsTests.kt @@ -34,7 +34,7 @@ class JdkProxyHintExtensionsTests { fun `proxiedInterfaces builder extension`() { every { builder.proxiedInterfaces(*anyVararg>()) } returns builder builder.proxiedInterfaces(String::class, Int::class) - verify { builder.proxiedInterfaces(*anyVararg>()) } + verify { builder.proxiedInterfaces(String::class.java, Int::class.java) } } } diff --git a/spring-core/src/test/kotlin/org/springframework/aot/hint/ProxyHintsExtensionsTests.kt b/spring-core/src/test/kotlin/org/springframework/aot/hint/ProxyHintsExtensionsTests.kt index e1c7768bfd6..f95c22f4ad8 100644 --- a/spring-core/src/test/kotlin/org/springframework/aot/hint/ProxyHintsExtensionsTests.kt +++ b/spring-core/src/test/kotlin/org/springframework/aot/hint/ProxyHintsExtensionsTests.kt @@ -34,7 +34,7 @@ class ProxyHintsExtensionsTests { fun `registerJdkProxy extension`() { every { proxyHints.registerJdkProxy(*anyVararg>()) } returns proxyHints proxyHints.registerJdkProxy(String::class, Int::class) - verify { proxyHints.registerJdkProxy(*anyVararg>()) } + verify { proxyHints.registerJdkProxy(String::class.java, Int::class.java) } } }