Fix support for target arrays
This commits makes sure that a bean that produces an array can be processed ahead of time. If the request target type is an array, its component type is used. Closes gh-31426
This commit is contained in:
@@ -83,7 +83,7 @@ class DefaultBeanRegistrationCodeFragments implements BeanRegistrationCodeFragme
|
|||||||
Assert.state(parent != null, "No parent available for inner bean");
|
Assert.state(parent != null, "No parent available for inner bean");
|
||||||
target = parent.getBeanClass();
|
target = parent.getBeanClass();
|
||||||
}
|
}
|
||||||
return ClassName.get(target);
|
return (target.isArray() ? ClassName.get(target.getComponentType()) : ClassName.get(target));
|
||||||
}
|
}
|
||||||
|
|
||||||
private Class<?> extractDeclaringClass(ResolvableType beanType, Executable executable) {
|
private Class<?> extractDeclaringClass(ResolvableType beanType, Executable executable) {
|
||||||
|
|||||||
@@ -36,6 +36,7 @@ import org.springframework.beans.testfixture.beans.factory.aot.MockBeanRegistrat
|
|||||||
import org.springframework.beans.testfixture.beans.factory.aot.MockBeanRegistrationsCode;
|
import org.springframework.beans.testfixture.beans.factory.aot.MockBeanRegistrationsCode;
|
||||||
import org.springframework.beans.testfixture.beans.factory.aot.NumberFactoryBean;
|
import org.springframework.beans.testfixture.beans.factory.aot.NumberFactoryBean;
|
||||||
import org.springframework.beans.testfixture.beans.factory.aot.SimpleBean;
|
import org.springframework.beans.testfixture.beans.factory.aot.SimpleBean;
|
||||||
|
import org.springframework.beans.testfixture.beans.factory.aot.SimpleBeanArrayFactoryBean;
|
||||||
import org.springframework.beans.testfixture.beans.factory.aot.SimpleBeanConfiguration;
|
import org.springframework.beans.testfixture.beans.factory.aot.SimpleBeanConfiguration;
|
||||||
import org.springframework.beans.testfixture.beans.factory.aot.SimpleBeanFactoryBean;
|
import org.springframework.beans.testfixture.beans.factory.aot.SimpleBeanFactoryBean;
|
||||||
import org.springframework.core.ResolvableType;
|
import org.springframework.core.ResolvableType;
|
||||||
@@ -76,6 +77,13 @@ class DefaultBeanRegistrationCodeFragmentsTests {
|
|||||||
assertTarget(createInstance(registeredBean).getTarget(registeredBean), SimpleBean.class);
|
assertTarget(createInstance(registeredBean).getTarget(registeredBean), SimpleBean.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void getTargetOnConstructorToPublicFactoryBeanProducingArray() {
|
||||||
|
RegisteredBean registeredBean = registerTestBean(SimpleBean[].class,
|
||||||
|
SimpleBeanArrayFactoryBean.class.getDeclaredConstructors()[0]);
|
||||||
|
assertTarget(createInstance(registeredBean).getTarget(registeredBean), SimpleBean.class);
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void getTargetOnConstructorToPublicGenericFactoryBeanExtractTargetFromFactoryBeanType() {
|
void getTargetOnConstructorToPublicGenericFactoryBeanExtractTargetFromFactoryBeanType() {
|
||||||
ResolvableType beanType = ResolvableType.forClassWithGenerics(
|
ResolvableType beanType = ResolvableType.forClassWithGenerics(
|
||||||
|
|||||||
@@ -0,0 +1,39 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2002-2023 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
|
||||||
|
*
|
||||||
|
* https://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.beans.testfixture.beans.factory.aot;
|
||||||
|
|
||||||
|
import org.springframework.beans.factory.FactoryBean;
|
||||||
|
import org.springframework.beans.factory.config.AbstractFactoryBean;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A public {@link FactoryBean} that produces an array of objects.
|
||||||
|
*
|
||||||
|
* @author Stephane Nicoll
|
||||||
|
*/
|
||||||
|
public class SimpleBeanArrayFactoryBean extends AbstractFactoryBean<SimpleBean[]> {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Class<?> getObjectType() {
|
||||||
|
return SimpleBean[].class;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected SimpleBean[] createInstance() throws Exception {
|
||||||
|
return new SimpleBean[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user