From 14617447a6bf70a526a95a3c92b3284a57dc203d Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 14 May 2013 17:44:06 +0200 Subject: [PATCH] Consistent use of Class in core container method signatures --- .../config/AutowireCapableBeanFactory.java | 4 ++-- .../AbstractAutowireCapableBeanFactory.java | 20 +++++++++---------- .../factory/support/RootBeanDefinition.java | 6 +++--- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/AutowireCapableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/AutowireCapableBeanFactory.java index 003ab7e2ce..ffa8849a25 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/AutowireCapableBeanFactory.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/AutowireCapableBeanFactory.java @@ -185,7 +185,7 @@ public interface AutowireCapableBeanFactory extends BeanFactory { * @see #AUTOWIRE_BY_TYPE * @see #AUTOWIRE_CONSTRUCTOR */ - Object createBean(Class beanClass, int autowireMode, boolean dependencyCheck) throws BeansException; + Object createBean(Class beanClass, int autowireMode, boolean dependencyCheck) throws BeansException; /** * Instantiate a new bean instance of the given class with the specified autowire @@ -213,7 +213,7 @@ public interface AutowireCapableBeanFactory extends BeanFactory { * @see #applyBeanPostProcessorsBeforeInitialization * @see #applyBeanPostProcessorsAfterInitialization */ - Object autowire(Class beanClass, int autowireMode, boolean dependencyCheck) throws BeansException; + Object autowire(Class beanClass, int autowireMode, boolean dependencyCheck) throws BeansException; /** * Autowire the bean properties of the given bean instance by name or type. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java index 4e5e6da511..a5badd7c54 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java @@ -243,7 +243,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac * Ignore the given dependency type for autowiring: * for example, String. Default is none. */ - public void ignoreDependencyType(Class type) { + public void ignoreDependencyType(Class type) { this.ignoredDependencyTypes.add(type); } @@ -257,7 +257,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac * @see org.springframework.beans.factory.BeanFactoryAware * @see org.springframework.context.ApplicationContextAware */ - public void ignoreDependencyInterface(Class ifc) { + public void ignoreDependencyInterface(Class ifc) { this.ignoredDependencyInterfaces.add(ifc); } @@ -334,7 +334,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac //------------------------------------------------------------------------- @Override - public Object createBean(Class beanClass, int autowireMode, boolean dependencyCheck) throws BeansException { + public Object createBean(Class beanClass, int autowireMode, boolean dependencyCheck) throws BeansException { // Use non-singleton bean definition, to avoid registering bean as dependent bean. RootBeanDefinition bd = new RootBeanDefinition(beanClass, autowireMode, dependencyCheck); bd.setScope(BeanDefinition.SCOPE_PROTOTYPE); @@ -342,7 +342,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac } @Override - public Object autowire(Class beanClass, int autowireMode, boolean dependencyCheck) throws BeansException { + public Object autowire(Class beanClass, int autowireMode, boolean dependencyCheck) throws BeansException { // Use non-singleton bean definition, to avoid registering bean as dependent bean. final RootBeanDefinition bd = new RootBeanDefinition(beanClass, autowireMode, dependencyCheck); bd.setScope(BeanDefinition.SCOPE_PROTOTYPE); @@ -507,7 +507,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac instanceWrapper = createBeanInstance(beanName, mbd, args); } final Object bean = (instanceWrapper != null ? instanceWrapper.getWrappedInstance() : null); - Class beanType = (instanceWrapper != null ? instanceWrapper.getWrappedClass() : null); + Class beanType = (instanceWrapper != null ? instanceWrapper.getWrappedClass() : null); // Allow post-processors to modify the merged bean definition. synchronized (mbd.postProcessingLock) { @@ -605,7 +605,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac for (BeanPostProcessor bp : getBeanPostProcessors()) { if (bp instanceof SmartInstantiationAwareBeanPostProcessor) { SmartInstantiationAwareBeanPostProcessor ibp = (SmartInstantiationAwareBeanPostProcessor) bp; - Class predicted = ibp.predictBeanType(targetType, beanName); + Class predicted = ibp.predictBeanType(targetType, beanName); if (predicted != null && (typesToMatch.length != 1 || !FactoryBean.class.equals(typesToMatch[0]) || FactoryBean.class.isAssignableFrom(predicted))) { return predicted; @@ -855,7 +855,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac * @throws BeansException if any post-processing failed * @see MergedBeanDefinitionPostProcessor#postProcessMergedBeanDefinition */ - protected void applyMergedBeanDefinitionPostProcessors(RootBeanDefinition mbd, Class beanType, String beanName) + protected void applyMergedBeanDefinitionPostProcessors(RootBeanDefinition mbd, Class beanType, String beanName) throws BeansException { try { @@ -906,7 +906,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac * @throws BeansException if any post-processing failed * @see InstantiationAwareBeanPostProcessor#postProcessBeforeInstantiation */ - protected Object applyBeanPostProcessorsBeforeInstantiation(Class beanClass, String beanName) + protected Object applyBeanPostProcessorsBeforeInstantiation(Class beanClass, String beanName) throws BeansException { for (BeanPostProcessor bp : getBeanPostProcessors()) { @@ -935,7 +935,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac */ protected BeanWrapper createBeanInstance(String beanName, RootBeanDefinition mbd, Object[] args) { // Make sure bean class is actually resolved at this point. - Class beanClass = resolveBeanClass(mbd, beanName); + Class beanClass = resolveBeanClass(mbd, beanName); if (beanClass != null && !Modifier.isPublic(beanClass.getModifiers()) && !mbd.isNonPublicAccessAllowed()) { throw new BeanCreationException(mbd.getResourceDescription(), beanName, @@ -987,7 +987,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac * @throws org.springframework.beans.BeansException in case of errors * @see org.springframework.beans.factory.config.SmartInstantiationAwareBeanPostProcessor#determineCandidateConstructors */ - protected Constructor[] determineConstructorsFromBeanPostProcessors(Class beanClass, String beanName) + protected Constructor[] determineConstructorsFromBeanPostProcessors(Class beanClass, String beanName) throws BeansException { if (beanClass != null && hasInstantiationAwareBeanPostProcessors()) { diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/RootBeanDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/RootBeanDefinition.java index 7bfb84bc1b..e187e5c728 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/RootBeanDefinition.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/RootBeanDefinition.java @@ -108,7 +108,7 @@ public class RootBeanDefinition extends AbstractBeanDefinition { * Create a new RootBeanDefinition for a singleton. * @param beanClass the class of the bean to instantiate */ - public RootBeanDefinition(Class beanClass) { + public RootBeanDefinition(Class beanClass) { super(); setBeanClass(beanClass); } @@ -121,7 +121,7 @@ public class RootBeanDefinition extends AbstractBeanDefinition { * @param dependencyCheck whether to perform a dependency check for objects * (not applicable to autowiring a constructor, thus ignored there) */ - public RootBeanDefinition(Class beanClass, int autowireMode, boolean dependencyCheck) { + public RootBeanDefinition(Class beanClass, int autowireMode, boolean dependencyCheck) { super(); setBeanClass(beanClass); setAutowireMode(autowireMode); @@ -137,7 +137,7 @@ public class RootBeanDefinition extends AbstractBeanDefinition { * @param cargs the constructor argument values to apply * @param pvs the property values to apply */ - public RootBeanDefinition(Class beanClass, ConstructorArgumentValues cargs, MutablePropertyValues pvs) { + public RootBeanDefinition(Class beanClass, ConstructorArgumentValues cargs, MutablePropertyValues pvs) { super(cargs, pvs); setBeanClass(beanClass); }