Don't set role in Kotlin bean DSL unless specified

sdeleuze · sdeleuze · commit f7839675f6e6 · 2018-09-20T00:21:38.000+02:00
Issue: SPR-17275
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
@@ -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 }
 		}
 
 
