Avoid implicit autowiring with Kotlin secondary ctors

Autowiring implicitely Kotlin primary constructors
when there are secondary constructors has side effects
on ConstructorResolver. It seems reasonable to
require explicit @Autowired annotation in such case.

With this commit, implicit autowiring of Kotlin
primary constructors is only performed when there
is a primary constructor defined alone or with
a default constructor (define explicitly or
generated via the kotlin-noarg compiler plugin
or via optional constructor parameters with default
values).

Issue: SPR-16022
This commit is contained in:
sdeleuze
2017-11-13 12:04:39 +01:00
parent 536e72c8df
commit edf8232555
4 changed files with 151 additions and 12 deletions

View File

@@ -0,0 +1,59 @@
/*
* Copyright 2002-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.context.annotation
import org.junit.Assert.assertEquals
import org.junit.Test
import org.springframework.beans.factory.BeanFactory
import org.springframework.beans.factory.getBean
import org.springframework.context.support.ClassPathXmlApplicationContext
/**
* @author Sebastien Deleuze
*/
class Spr16022Tests {
@Test
fun `Register beans with multiple constructors with AnnotationConfigApplicationContext`() {
assert(AnnotationConfigApplicationContext(Config::class.java))
}
@Test
fun `Register beans with multiple constructors with ClassPathXmlApplicationContext`() {
assert(ClassPathXmlApplicationContext(CONTEXT))
}
private fun assert(context: BeanFactory) {
val bean1 = context.getBean<MultipleConstructorsTestBean>("bean1")
assertEquals(0, bean1.foo)
val bean2 = context.getBean<MultipleConstructorsTestBean>("bean2")
assertEquals(1, bean2.foo)
val bean3 = context.getBean<MultipleConstructorsTestBean>("bean3")
assertEquals(3, bean3.foo)
}
@Suppress("unused")
class MultipleConstructorsTestBean(val foo: Int) {
constructor(bar: String) : this(bar.length)
constructor(foo: Int, bar: String) : this(foo + bar.length)
}
@Configuration @ImportResource(CONTEXT)
open class Config
}
private const val CONTEXT = "org/springframework/context/annotation/multipleConstructors.xml"