Avoid package cycle between beans.factory.annotation and b.f.support
See gh-2060
This commit is contained in:
Juergen Hoeller
@@ -0,0 +1,171 @@
|
||||
/*
|
||||
* Copyright 2002-2019 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.beans.factory.annotation;
|
||||
|
||||
import java.lang.reflect.Constructor;
|
||||
import java.lang.reflect.Executable;
|
||||
import java.lang.reflect.Method;
|
||||
import java.lang.reflect.Parameter;
|
||||
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.rules.ExpectedException;
|
||||
|
||||
import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
|
||||
import org.springframework.beans.factory.config.DependencyDescriptor;
|
||||
import org.springframework.util.ClassUtils;
|
||||
|
||||
import static org.junit.Assert.*;
|
||||
import static org.mockito.Mockito.*;
|
||||
|
||||
/**
|
||||
* Unit tests for {@link ParameterResolutionDelegate}.
|
||||
*
|
||||
* @author Sam Brannen
|
||||
* @author Juergen Hoeller
|
||||
* @author Loïc Ledoyen
|
||||
*/
|
||||
public class ParameterResolutionTests {
|
||||
|
||||
@Rule
|
||||
public final ExpectedException exception = ExpectedException.none();
|
||||
|
||||
|
||||
@Test
|
||||
public void isAutowirablePreconditions() {
|
||||
exception.expect(IllegalArgumentException.class);
|
||||
exception.expectMessage("Parameter must not be null");
|
||||
ParameterResolutionDelegate.isAutowirable(null, 0);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void annotatedParametersInMethodAreCandidatesForAutowiring() throws Exception {
|
||||
Method method = getClass().getDeclaredMethod("autowirableMethod", String.class, String.class, String.class, String.class);
|
||||
assertAutowirableParameters(method);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void annotatedParametersInTopLevelClassConstructorAreCandidatesForAutowiring() throws Exception {
|
||||
Constructor<?> constructor = AutowirableClass.class.getConstructor(String.class, String.class, String.class, String.class);
|
||||
assertAutowirableParameters(constructor);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void annotatedParametersInInnerClassConstructorAreCandidatesForAutowiring() throws Exception {
|
||||
Class<?> innerClass = AutowirableClass.InnerAutowirableClass.class;
|
||||
assertTrue(ClassUtils.isInnerClass(innerClass));
|
||||
Constructor<?> constructor = innerClass.getConstructor(AutowirableClass.class, String.class, String.class);
|
||||
assertAutowirableParameters(constructor);
|
||||
}
|
||||
|
||||
private void assertAutowirableParameters(Executable executable) {
|
||||
int startIndex = (executable instanceof Constructor)
|
||||
&& ClassUtils.isInnerClass(executable.getDeclaringClass()) ? 1 : 0;
|
||||
Parameter[] parameters = executable.getParameters();
|
||||
for (int parameterIndex = startIndex; parameterIndex < parameters.length; parameterIndex++) {
|
||||
Parameter parameter = parameters[parameterIndex];
|
||||
assertTrue("Parameter " + parameter + " must be autowirable",
|
||||
ParameterResolutionDelegate.isAutowirable(parameter, parameterIndex));
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
public void nonAnnotatedParametersInTopLevelClassConstructorAreNotCandidatesForAutowiring() throws Exception {
|
||||
Constructor<?> notAutowirableConstructor = AutowirableClass.class.getConstructor(String.class);
|
||||
|
||||
Parameter[] parameters = notAutowirableConstructor.getParameters();
|
||||
for (int parameterIndex = 0; parameterIndex < parameters.length; parameterIndex++) {
|
||||
Parameter parameter = parameters[parameterIndex];
|
||||
assertFalse("Parameter " + parameter + " must not be autowirable",
|
||||
ParameterResolutionDelegate.isAutowirable(parameter, parameterIndex));
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
public void resolveDependencyPreconditionsForParameter() {
|
||||
exception.expect(IllegalArgumentException.class);
|
||||
exception.expectMessage("Parameter must not be null");
|
||||
ParameterResolutionDelegate.resolveDependency(null, 0, null, mock(AutowireCapableBeanFactory.class));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void resolveDependencyPreconditionsForContainingClass() throws Exception {
|
||||
exception.expect(IllegalArgumentException.class);
|
||||
exception.expectMessage("Containing class must not be null");
|
||||
ParameterResolutionDelegate.resolveDependency(getParameter(), 0, null, null);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void resolveDependencyPreconditionsForBeanFactory() throws Exception {
|
||||
exception.expect(IllegalArgumentException.class);
|
||||
exception.expectMessage("AutowireCapableBeanFactory must not be null");
|
||||
ParameterResolutionDelegate.resolveDependency(getParameter(), 0, getClass(), null);
|
||||
}
|
||||
|
||||
private Parameter getParameter() throws NoSuchMethodException {
|
||||
Method method = getClass().getDeclaredMethod("autowirableMethod", String.class, String.class, String.class, String.class);
|
||||
return method.getParameters()[0];
|
||||
}
|
||||
|
||||
@Test
|
||||
public void resolveDependencyForAnnotatedParametersInTopLevelClassConstructor() throws Exception {
|
||||
Constructor<?> constructor = AutowirableClass.class.getConstructor(String.class, String.class, String.class, String.class);
|
||||
|
||||
AutowireCapableBeanFactory beanFactory = mock(AutowireCapableBeanFactory.class);
|
||||
// Configure the mocked BeanFactory to return the DependencyDescriptor for convenience and
|
||||
// to avoid using an ArgumentCaptor.
|
||||
when(beanFactory.resolveDependency(any(), isNull())).thenAnswer(invocation -> invocation.getArgument(0));
|
||||
|
||||
Parameter[] parameters = constructor.getParameters();
|
||||
for (int parameterIndex = 0; parameterIndex < parameters.length; parameterIndex++) {
|
||||
Parameter parameter = parameters[parameterIndex];
|
||||
DependencyDescriptor intermediateDependencyDescriptor = (DependencyDescriptor) ParameterResolutionDelegate.resolveDependency(
|
||||
parameter, parameterIndex, AutowirableClass.class, beanFactory);
|
||||
assertEquals(constructor, intermediateDependencyDescriptor.getAnnotatedElement());
|
||||
assertEquals(parameter, intermediateDependencyDescriptor.getMethodParameter().getParameter());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void autowirableMethod(
|
||||
@Autowired String firstParameter,
|
||||
@Qualifier("someQualifier") String secondParameter,
|
||||
@Value("${someValue}") String thirdParameter,
|
||||
@Autowired(required = false) String fourthParameter) {
|
||||
}
|
||||
|
||||
|
||||
public static class AutowirableClass {
|
||||
|
||||
public AutowirableClass(@Autowired String firstParameter,
|
||||
@Qualifier("someQualifier") String secondParameter,
|
||||
@Value("${someValue}") String thirdParameter,
|
||||
@Autowired(required = false) String fourthParameter) {
|
||||
}
|
||||
|
||||
public AutowirableClass(String notAutowirableParameter) {
|
||||
}
|
||||
|
||||
public class InnerAutowirableClass {
|
||||
|
||||
public InnerAutowirableClass(@Autowired String firstParameter,
|
||||
@Qualifier("someQualifier") String secondParameter) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -16,28 +16,15 @@
|
||||
|
||||
package org.springframework.beans.factory.support;
|
||||
|
||||
import java.lang.reflect.Constructor;
|
||||
import java.lang.reflect.Executable;
|
||||
import java.lang.reflect.Method;
|
||||
import java.lang.reflect.Parameter;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.rules.ExpectedException;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.beans.factory.annotation.Qualifier;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
|
||||
import org.springframework.beans.factory.config.DependencyDescriptor;
|
||||
import org.springframework.util.ClassUtils;
|
||||
import org.springframework.util.ReflectionUtils;
|
||||
|
||||
import static org.junit.Assert.*;
|
||||
import static org.mockito.ArgumentMatchers.*;
|
||||
import static org.mockito.Mockito.*;
|
||||
|
||||
/**
|
||||
* Unit tests for {@link AutowireUtils}.
|
||||
@@ -47,52 +34,49 @@ import static org.mockito.Mockito.*;
|
||||
* @author Loïc Ledoyen
|
||||
*/
|
||||
public class AutowireUtilsTests {
|
||||
|
||||
@Rule
|
||||
public final ExpectedException exception = ExpectedException.none();
|
||||
|
||||
@Test
|
||||
public void genericMethodReturnTypes() {
|
||||
Method notParameterized = ReflectionUtils.findMethod(MyTypeWithMethods.class, "notParameterized");
|
||||
assertEquals(String.class,
|
||||
AutowireUtils.resolveReturnTypeForFactoryMethod(notParameterized, new Object[]{}, getClass().getClassLoader()));
|
||||
AutowireUtils.resolveReturnTypeForFactoryMethod(notParameterized, new Object[0], getClass().getClassLoader()));
|
||||
|
||||
Method notParameterizedWithArguments = ReflectionUtils.findMethod(MyTypeWithMethods.class, "notParameterizedWithArguments", Integer.class, Boolean.class);
|
||||
assertEquals(String.class,
|
||||
AutowireUtils.resolveReturnTypeForFactoryMethod(notParameterizedWithArguments, new Object[]{99, true}, getClass().getClassLoader()));
|
||||
AutowireUtils.resolveReturnTypeForFactoryMethod(notParameterizedWithArguments, new Object[] {99, true}, getClass().getClassLoader()));
|
||||
|
||||
Method createProxy = ReflectionUtils.findMethod(MyTypeWithMethods.class, "createProxy", Object.class);
|
||||
assertEquals(String.class,
|
||||
AutowireUtils.resolveReturnTypeForFactoryMethod(createProxy, new Object[]{"foo"}, getClass().getClassLoader()));
|
||||
AutowireUtils.resolveReturnTypeForFactoryMethod(createProxy, new Object[] {"foo"}, getClass().getClassLoader()));
|
||||
|
||||
Method createNamedProxyWithDifferentTypes = ReflectionUtils.findMethod(MyTypeWithMethods.class, "createNamedProxy", String.class, Object.class);
|
||||
assertEquals(Long.class,
|
||||
AutowireUtils.resolveReturnTypeForFactoryMethod(createNamedProxyWithDifferentTypes, new Object[]{"enigma", 99L}, getClass().getClassLoader()));
|
||||
AutowireUtils.resolveReturnTypeForFactoryMethod(createNamedProxyWithDifferentTypes, new Object[] {"enigma", 99L}, getClass().getClassLoader()));
|
||||
|
||||
Method createNamedProxyWithDuplicateTypes = ReflectionUtils.findMethod(MyTypeWithMethods.class, "createNamedProxy", String.class, Object.class);
|
||||
assertEquals(String.class,
|
||||
AutowireUtils.resolveReturnTypeForFactoryMethod(createNamedProxyWithDuplicateTypes, new Object[]{"enigma", "foo"}, getClass().getClassLoader()));
|
||||
AutowireUtils.resolveReturnTypeForFactoryMethod(createNamedProxyWithDuplicateTypes, new Object[] {"enigma", "foo"}, getClass().getClassLoader()));
|
||||
|
||||
Method createMock = ReflectionUtils.findMethod(MyTypeWithMethods.class, "createMock", Class.class);
|
||||
assertEquals(Runnable.class,
|
||||
AutowireUtils.resolveReturnTypeForFactoryMethod(createMock, new Object[]{Runnable.class}, getClass().getClassLoader()));
|
||||
AutowireUtils.resolveReturnTypeForFactoryMethod(createMock, new Object[] {Runnable.class}, getClass().getClassLoader()));
|
||||
assertEquals(Runnable.class,
|
||||
AutowireUtils.resolveReturnTypeForFactoryMethod(createMock, new Object[]{Runnable.class.getName()}, getClass().getClassLoader()));
|
||||
AutowireUtils.resolveReturnTypeForFactoryMethod(createMock, new Object[] {Runnable.class.getName()}, getClass().getClassLoader()));
|
||||
|
||||
Method createNamedMock = ReflectionUtils.findMethod(MyTypeWithMethods.class, "createNamedMock", String.class, Class.class);
|
||||
assertEquals(Runnable.class,
|
||||
AutowireUtils.resolveReturnTypeForFactoryMethod(createNamedMock, new Object[]{"foo", Runnable.class}, getClass().getClassLoader()));
|
||||
AutowireUtils.resolveReturnTypeForFactoryMethod(createNamedMock, new Object[] {"foo", Runnable.class}, getClass().getClassLoader()));
|
||||
|
||||
Method createVMock = ReflectionUtils.findMethod(MyTypeWithMethods.class, "createVMock", Object.class, Class.class);
|
||||
assertEquals(Runnable.class,
|
||||
AutowireUtils.resolveReturnTypeForFactoryMethod(createVMock, new Object[]{"foo", Runnable.class}, getClass().getClassLoader()));
|
||||
AutowireUtils.resolveReturnTypeForFactoryMethod(createVMock, new Object[] {"foo", Runnable.class}, getClass().getClassLoader()));
|
||||
|
||||
// Ideally we would expect String.class instead of Object.class, but
|
||||
// resolveReturnTypeForFactoryMethod() does not currently support this form of
|
||||
// look-up.
|
||||
Method extractValueFrom = ReflectionUtils.findMethod(MyTypeWithMethods.class, "extractValueFrom", MyInterfaceType.class);
|
||||
assertEquals(Object.class,
|
||||
AutowireUtils.resolveReturnTypeForFactoryMethod(extractValueFrom, new Object[]{new MySimpleInterfaceType()}, getClass().getClassLoader()));
|
||||
AutowireUtils.resolveReturnTypeForFactoryMethod(extractValueFrom, new Object[] {new MySimpleInterfaceType()}, getClass().getClassLoader()));
|
||||
|
||||
// Ideally we would expect Boolean.class instead of Object.class, but this
|
||||
// information is not available at run-time due to type erasure.
|
||||
@@ -100,100 +84,7 @@ public class AutowireUtilsTests {
|
||||
map.put(0, false);
|
||||
map.put(1, true);
|
||||
Method extractMagicValue = ReflectionUtils.findMethod(MyTypeWithMethods.class, "extractMagicValue", Map.class);
|
||||
assertEquals(Object.class, AutowireUtils.resolveReturnTypeForFactoryMethod(extractMagicValue, new Object[]{map}, getClass().getClassLoader()));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void isAutowirablePreconditions() {
|
||||
exception.expect(IllegalArgumentException.class);
|
||||
exception.expectMessage("Parameter must not be null");
|
||||
AutowireUtils.isAutowirable(null, 0);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void annotatedParametersInMethodAreCandidatesForAutowiring() throws Exception {
|
||||
Method method = getClass().getDeclaredMethod("autowirableMethod", String.class, String.class, String.class, String.class);
|
||||
assertAutowirableParameters(method);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void annotatedParametersInTopLevelClassConstructorAreCandidatesForAutowiring() throws Exception {
|
||||
Constructor<?> constructor = AutowirableClass.class.getConstructor(String.class, String.class, String.class, String.class);
|
||||
assertAutowirableParameters(constructor);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void annotatedParametersInInnerClassConstructorAreCandidatesForAutowiring() throws Exception {
|
||||
Class<?> innerClass = AutowirableClass.InnerAutowirableClass.class;
|
||||
assertTrue(ClassUtils.isInnerClass(innerClass));
|
||||
Constructor<?> constructor = innerClass.getConstructor(AutowirableClass.class, String.class, String.class);
|
||||
assertAutowirableParameters(constructor);
|
||||
}
|
||||
|
||||
private void assertAutowirableParameters(Executable executable) {
|
||||
int startIndex = (executable instanceof Constructor)
|
||||
&& ClassUtils.isInnerClass(executable.getDeclaringClass()) ? 1 : 0;
|
||||
Parameter[] parameters = executable.getParameters();
|
||||
for (int parameterIndex = startIndex; parameterIndex < parameters.length; parameterIndex++) {
|
||||
Parameter parameter = parameters[parameterIndex];
|
||||
assertTrue("Parameter " + parameter + " must be autowirable", AutowireUtils.isAutowirable(parameter, parameterIndex));
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
public void nonAnnotatedParametersInTopLevelClassConstructorAreNotCandidatesForAutowiring() throws Exception {
|
||||
Constructor<?> notAutowirableConstructor = AutowirableClass.class.getConstructor(String.class);
|
||||
|
||||
Parameter[] parameters = notAutowirableConstructor.getParameters();
|
||||
for (int parameterIndex = 0; parameterIndex < parameters.length; parameterIndex++) {
|
||||
Parameter parameter = parameters[parameterIndex];
|
||||
assertFalse("Parameter " + parameter + " must not be autowirable", AutowireUtils.isAutowirable(parameter, parameterIndex));
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
public void resolveDependencyPreconditionsForParameter() {
|
||||
exception.expect(IllegalArgumentException.class);
|
||||
exception.expectMessage("Parameter must not be null");
|
||||
AutowireUtils.resolveDependency(null, 0, null, mock(AutowireCapableBeanFactory.class));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void resolveDependencyPreconditionsForContainingClass() throws Exception {
|
||||
exception.expect(IllegalArgumentException.class);
|
||||
exception.expectMessage("Containing class must not be null");
|
||||
AutowireUtils.resolveDependency(getParameter(), 0, null, null);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void resolveDependencyPreconditionsForBeanFactory() throws Exception {
|
||||
exception.expect(IllegalArgumentException.class);
|
||||
exception.expectMessage("AutowireCapableBeanFactory must not be null");
|
||||
AutowireUtils.resolveDependency(getParameter(), 0, getClass(), null);
|
||||
}
|
||||
|
||||
private Parameter getParameter() throws NoSuchMethodException {
|
||||
Method method = getClass().getDeclaredMethod("autowirableMethod", String.class, String.class, String.class, String.class);
|
||||
return method.getParameters()[0];
|
||||
}
|
||||
|
||||
@Test
|
||||
public void resolveDependencyForAnnotatedParametersInTopLevelClassConstructor() throws Exception {
|
||||
Constructor<?> constructor = AutowirableClass.class.getConstructor(String.class, String.class, String.class, String.class);
|
||||
|
||||
AutowireCapableBeanFactory beanFactory = mock(AutowireCapableBeanFactory.class);
|
||||
// Configure the mocked BeanFactory to return the DependencyDescriptor for convenience and
|
||||
// to avoid using an ArgumentCaptor.
|
||||
when(beanFactory.resolveDependency(any(), isNull())).thenAnswer(invocation -> invocation.getArgument(0));
|
||||
|
||||
Parameter[] parameters = constructor.getParameters();
|
||||
for (int parameterIndex = 0; parameterIndex < parameters.length; parameterIndex++) {
|
||||
Parameter parameter = parameters[parameterIndex];
|
||||
DependencyDescriptor intermediateDependencyDescriptor = (DependencyDescriptor) AutowireUtils.resolveDependency(
|
||||
parameter, parameterIndex, AutowirableClass.class, beanFactory);
|
||||
assertEquals(constructor, intermediateDependencyDescriptor.getAnnotatedElement());
|
||||
assertEquals(parameter, intermediateDependencyDescriptor.getMethodParameter().getParameter());
|
||||
}
|
||||
assertEquals(Object.class, AutowireUtils.resolveReturnTypeForFactoryMethod(extractMagicValue, new Object[] {map}, getClass().getClassLoader()));
|
||||
}
|
||||
|
||||
|
||||
@@ -295,30 +186,4 @@ public class AutowireUtilsTests {
|
||||
}
|
||||
}
|
||||
|
||||
void autowirableMethod(
|
||||
@Autowired String firstParameter,
|
||||
@Qualifier("someQualifier") String secondParameter,
|
||||
@Value("${someValue}") String thirdParameter,
|
||||
@Autowired(required = false) String fourthParameter) {
|
||||
}
|
||||
|
||||
public static class AutowirableClass {
|
||||
|
||||
public AutowirableClass(@Autowired String firstParameter,
|
||||
@Qualifier("someQualifier") String secondParameter,
|
||||
@Value("${someValue}") String thirdParameter,
|
||||
@Autowired(required = false) String fourthParameter) {
|
||||
}
|
||||
|
||||
public AutowirableClass(String notAutowirableParameter) {
|
||||
}
|
||||
|
||||
public class InnerAutowirableClass {
|
||||
|
||||
public InnerAutowirableClass(@Autowired String firstParameter,
|
||||
@Qualifier("someQualifier") String secondParameter) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user