Skip to content

Improve ListableBeanFactoryExtensions to support getting bean names for generic type #36837

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
quaff wants to merge 1 commit into
base: main
Choose a base branch
from
+21 −5
Open

Improve ListableBeanFactoryExtensions to support getting bean names for generic type #36837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions ...-beans/src/main/kotlin/org/springframework/beans/factory/ListableBeanFactoryExtensions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,21 @@

package org.springframework.beans.factory

import org.springframework.core.ParameterizedTypeReference
import org.springframework.core.ResolvableType

/**
* Extension for [ListableBeanFactory.getBeanNamesForType] providing a
* `getBeanNamesForType<Foo>()` variant.
* `getBeanNamesForType<Foo>()` or `getBeanNamesForType<List<Foo>>()` variant.
*
* @author Sebastien Deleuze
* @author Yanming Zhou
* @since 5.0
*/
inline fun <reified T : Any> ListableBeanFactory.getBeanNamesForType(includeNonSingletons: Boolean = true,
allowEagerInit: Boolean = true): Array<out String> =
getBeanNamesForType(T::class.java, includeNonSingletons, allowEagerInit)
getBeanNamesForType(ResolvableType.forType(object : ParameterizedTypeReference<T>() {}),
includeNonSingletons, allowEagerInit)

/**
* Extension for [ListableBeanFactory.getBeansOfType] providing a `getBeansOfType<Foo>()` variant.
Expand Down
17 changes: 14 additions & 3 deletions ...s/src/test/kotlin/org/springframework/beans/factory/ListableBeanFactoryExtensionsTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,15 @@ import io.mockk.every
import io.mockk.mockk
import io.mockk.verify
import org.junit.jupiter.api.Test
import org.springframework.core.ParameterizedTypeReference
import org.springframework.core.ResolvableType
import kotlin.reflect.full.createInstance

/**
* Mock object based tests for ListableBeanFactory Kotlin extensions
*
* @author Sebastien Deleuze
* @author Yanming Zhou
*/
class ListableBeanFactoryExtensionsTests {

Expand All @@ -34,19 +37,27 @@ class ListableBeanFactoryExtensionsTests {
@Test
fun `getBeanNamesForType with reified type parameters`() {
lbf.getBeanNamesForType<Foo>()
verify { lbf.getBeanNamesForType(Foo::class.java, true , true) }
verify { lbf.getBeanNamesForType(ResolvableType.forClass(Foo::class.java), true , true) }
}

@Test
fun `getBeanNamesForType with reified generic type parameters`() {
val foo = listOf(Foo())
lbf.getBeanNamesForType<List<Foo>>()
verify { lbf.getBeanNamesForType(ResolvableType.forType(object : ParameterizedTypeReference<List<Foo>>() {}),
true , true) }
}

@Test
fun `getBeanNamesForType with reified type parameters and Boolean`() {
lbf.getBeanNamesForType<Foo>(false)
verify { lbf.getBeanNamesForType(Foo::class.java, false , true) }
verify { lbf.getBeanNamesForType(ResolvableType.forClass(Foo::class.java), false , true) }
}

@Test
fun `getBeanNamesForType with reified type parameters, Boolean and Boolean`() {
lbf.getBeanNamesForType<Foo>(false, false)
verify { lbf.getBeanNamesForType(Foo::class.java, false , false) }
verify { lbf.getBeanNamesForType(ResolvableType.forClass(Foo::class.java), false , false) }
}

@Test
Expand Down