From f7839675f6e6097144fb2d4125c8bbc85fd11cc3 Mon Sep 17 00:00:00 2001 From: Sebastien Deleuze Date: Wed, 19 Sep 2018 23:44:16 +0200 Subject: [PATCH] Don't set role in Kotlin bean DSL unless specified Issue: SPR-17275 --- .../springframework/context/support/BeanDefinitionDsl.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-context/src/main/kotlin/org/springframework/context/support/BeanDefinitionDsl.kt b/spring-context/src/main/kotlin/org/springframework/context/support/BeanDefinitionDsl.kt index 15326d9cea..fe7826e424 100644 --- a/spring-context/src/main/kotlin/org/springframework/context/support/BeanDefinitionDsl.kt +++ b/spring-context/src/main/kotlin/org/springframework/context/support/BeanDefinitionDsl.kt @@ -172,7 +172,7 @@ open class BeanDefinitionDsl(private val init: BeanDefinitionDsl.() -> Unit, initMethodName: String? = null, destroyMethodName: String? = null, description: String? = null, - role: Role = Role.APPLICATION) { + role: Role? = null) { val customizer = BeanDefinitionCustomizer { bd -> scope?.let { bd.scope = scope.name.toLowerCase() } @@ -182,7 +182,7 @@ open class BeanDefinitionDsl(private val init: BeanDefinitionDsl.() -> Unit, initMethodName?.let { bd.initMethodName = initMethodName } destroyMethodName?.let { bd.destroyMethodName = destroyMethodName } description?.let { bd.description = description } - bd.role = role.ordinal + role?. let { bd.role = role.ordinal } } val beanName = name ?: BeanDefinitionReaderUtils.uniqueBeanName(T::class.java.name, context); @@ -214,7 +214,7 @@ open class BeanDefinitionDsl(private val init: BeanDefinitionDsl.() -> Unit, initMethodName: String? = null, destroyMethodName: String? = null, description: String? = null, - role: Role = Role.APPLICATION, + role: Role? = null, crossinline function: () -> T) { val customizer = BeanDefinitionCustomizer { bd -> @@ -225,7 +225,7 @@ open class BeanDefinitionDsl(private val init: BeanDefinitionDsl.() -> Unit, initMethodName?.let { bd.initMethodName = initMethodName } destroyMethodName?.let { bd.destroyMethodName = destroyMethodName } description?.let { bd.description = description } - bd.role = role.ordinal + role?. let { bd.role = role.ordinal } }