From 3276a4131ca6feb6e0380d0a3981de1f0382ac13 Mon Sep 17 00:00:00 2001
From: Yanming Zhou <zhouyanming@gmail.com>
Date: Tue, 26 May 2026 16:19:41 +0800
Subject: [PATCH] Polish BeanFactoryExtensions to use API introduced since 7.0

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
---
 .../beans/factory/BeanFactoryExtensions.kt         |  3 ++-
 .../beans/factory/BeanFactoryExtensionsTests.kt    | 14 +++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

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 3bd4d67bb2ea..b939118105a6 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
@@ -58,8 +58,9 @@ inline fun <reified T : Any> BeanFactory.getBean(vararg args:Any): T =
  *
  * @see BeanFactory.getBeanProvider(ResolvableType)
  * @author Sebastien Deleuze
+ * @author Yanming Zhou
  * @since 5.1
  */
 inline fun <reified T : Any> BeanFactory.getBeanProvider(): ObjectProvider<T> =
-		getBeanProvider(ResolvableType.forType((object : ParameterizedTypeReference<T>() {}).type))
+		getBeanProvider(object : ParameterizedTypeReference<T>() {})
 
diff --git a/spring-beans/src/test/kotlin/org/springframework/beans/factory/BeanFactoryExtensionsTests.kt b/spring-beans/src/test/kotlin/org/springframework/beans/factory/BeanFactoryExtensionsTests.kt
index 750fc095efda..af28018037b6 100644
--- a/spring-beans/src/test/kotlin/org/springframework/beans/factory/BeanFactoryExtensionsTests.kt
+++ b/spring-beans/src/test/kotlin/org/springframework/beans/factory/BeanFactoryExtensionsTests.kt
@@ -37,17 +37,17 @@ class BeanFactoryExtensionsTests {
 	@Test
 	fun `getBean with reified type parameters`() {
 		val foo = Foo()
-		every { bf.getBeanProvider<Foo>(ofType<ResolvableType>()).getObject() } returns foo
+		every { bf.getBeanProvider(object : ParameterizedTypeReference<Foo>() {}).getObject() } returns foo
 		assertThat(bf.getBean<Foo>()).isSameAs(foo)
-		verify { bf.getBeanProvider<ObjectProvider<Foo>>(ofType<ResolvableType>()).getObject() }
+		verify { bf.getBeanProvider(object : ParameterizedTypeReference<Foo>() {}).getObject() }
 	}
 
 	@Test
 	fun `getBean with reified generic type parameters`() {
 		val foo = listOf(Foo())
-		every { bf.getBeanProvider<List<Foo>>(ofType<ResolvableType>()).getObject() } returns foo
+		every { bf.getBeanProvider(object : ParameterizedTypeReference<List<Foo>>() {}).getObject() } returns foo
 		assertThat(bf.getBean<List<Foo>>()).isSameAs(foo)
-		verify { bf.getBeanProvider<ObjectProvider<List<Foo>>>(ofType<ResolvableType>()).getObject() }
+		verify { bf.getBeanProvider(object : ParameterizedTypeReference<List<Foo>>() {}).getObject() }
 	}
 
 	@Test
@@ -71,15 +71,15 @@ class BeanFactoryExtensionsTests {
 		val arg1 = "arg1"
 		val arg2 = "arg2"
 		val bar = Bar(arg1, arg2)
-		every { bf.getBeanProvider<Bar>(ofType<ResolvableType>()).getObject(arg1, arg2) } returns bar
+		every { bf.getBeanProvider(object : ParameterizedTypeReference<Bar>() {}).getObject(arg1, arg2) } returns bar
 		assertThat(bf.getBean<Bar>(arg1, arg2)).isSameAs(bar)
-		verify { bf.getBeanProvider<Bar>(ofType<ResolvableType>()).getObject(arg1, arg2) }
+		verify { bf.getBeanProvider(object : ParameterizedTypeReference<Bar>() {}).getObject(arg1, arg2) }
 	}
 
 	@Test
 	fun `getBeanProvider with reified type parameters`() {
 		bf.getBeanProvider<Foo>()
-		verify { bf.getBeanProvider<ObjectProvider<Foo>>(ofType<ResolvableType>()) }
+		verify { bf.getBeanProvider(object : ParameterizedTypeReference<Foo>() {}) }
 	}
 
 	class Foo