Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use the accepted profiles in BeanDefinitionDsl

Browse Source 
Closes gh-22393
This commit is contained in:
Thomas Girard
2019-02-08 14:14:37 +01:00
committed by Sebastien Deleuze
parent ba95818b1d
commit 87c15ba9ad
2 changed files with 37 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-context/src/main/kotlin/org/springframework/context/support/BeanDefinitionDsl.kt
View File

@@ -23,6 +23,7 @@ import org.springframework.beans.factory.getBeanProvider
import org.springframework.beans.factory.support.BeanDefinitionReaderUtils
import org.springframework.context.ApplicationContextInitializer
import org.springframework.core.env.ConfigurableEnvironment
import org.springframework.core.env.Profiles
import java.util.function.Supplier
/**
@@ -1082,11 +1083,12 @@ open class BeanDefinitionDsl(private val init: BeanDefinitionDsl.() -> Unit,
}
/**
* Take in account bean definitions enclosed in the provided lambda only when the
* specified profile is active.
* Take in account bean definitions enclosed in the provided lambda when the
* profile is accepted.
* @see org.springframework.core.env.Profiles.of
*/
fun profile(profile: String, init: BeanDefinitionDsl.() -> Unit) {
val beans = BeanDefinitionDsl(init, { it.activeProfiles.contains(profile) })
val beans = BeanDefinitionDsl(init, { it.acceptsProfiles(Profiles.of(profile)) })
children.add(beans)
}

32
spring-context/src/test/kotlin/org/springframework/context/support/BeanDefinitionDslTests.kt
View File

@@ -170,6 +170,38 @@ class BeanDefinitionDslTests {
context.getBean<Baz>()
}
@Test
fun `Declare beans with accepted profiles`() {
val beans = beans {
profile("foo") { bean<Foo>() }
profile("!bar") { bean<Bar>() }
profile("bar | barbar") { bean<BarBar>() }
profile("baz & buz") { bean<Baz>() }
profile("baz & foo") { bean<FooFoo>() }
}
val context = GenericApplicationContext().apply {
environment.addActiveProfile("barbar")
environment.addActiveProfile("baz")
environment.addActiveProfile("buz")
beans.initialize(this)
refresh()
}
context.getBean<Baz>()
context.getBean<BarBar>()
context.getBean<Bar>()
try {
context.getBean<Foo>()
fail()
} catch (ignored: Exception) {
}
try {
context.getBean<FooFoo>()
fail()
} catch (ignored: Exception) {
}
}
}
class Foo