Skip to content

Commit 1461744

Browse files
jhoellerjhoeller
committed
Consistent use of Class<?> in core container method signatures
1 parent bc3e585 commit 1461744

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

‎spring-beans/src/main/java/org/springframework/beans/factory/config/AutowireCapableBeanFactory.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ public interface AutowireCapableBeanFactory extends BeanFactory {
185185
* @see #AUTOWIRE_BY_TYPE
186186
* @see #AUTOWIRE_CONSTRUCTOR
187187
*/
188-
Object createBean(Class beanClass, int autowireMode, boolean dependencyCheck) throws BeansException;
188+
Object createBean(Class<?> beanClass, int autowireMode, boolean dependencyCheck) throws BeansException;
189189

190190
/**
191191
* Instantiate a new bean instance of the given class with the specified autowire
@@ -213,7 +213,7 @@ public interface AutowireCapableBeanFactory extends BeanFactory {
213213
* @see #applyBeanPostProcessorsBeforeInitialization
214214
* @see #applyBeanPostProcessorsAfterInitialization
215215
*/
216-
Object autowire(Class beanClass, int autowireMode, boolean dependencyCheck) throws BeansException;
216+
Object autowire(Class<?> beanClass, int autowireMode, boolean dependencyCheck) throws BeansException;
217217

218218
/**
219219
* Autowire the bean properties of the given bean instance by name or type.

‎spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ public void setAllowRawInjectionDespiteWrapping(boolean allowRawInjectionDespite
243243
* Ignore the given dependency type for autowiring:
244244
* for example, String. Default is none.
245245
*/
246-
public void ignoreDependencyType(Class type) {
246+
public void ignoreDependencyType(Class<?> type) {
247247
this.ignoredDependencyTypes.add(type);
248248
}
249249

@@ -257,7 +257,7 @@ public void ignoreDependencyType(Class type) {
257257
* @see org.springframework.beans.factory.BeanFactoryAware
258258
* @see org.springframework.context.ApplicationContextAware
259259
*/
260-
public void ignoreDependencyInterface(Class ifc) {
260+
public void ignoreDependencyInterface(Class<?> ifc) {
261261
this.ignoredDependencyInterfaces.add(ifc);
262262
}
263263

@@ -334,15 +334,15 @@ public Object resolveDependency(DependencyDescriptor descriptor, String beanName
334334
//-------------------------------------------------------------------------
335335

336336
@Override
337-
public Object createBean(Class beanClass, int autowireMode, boolean dependencyCheck) throws BeansException {
337+
public Object createBean(Class<?> beanClass, int autowireMode, boolean dependencyCheck) throws BeansException {
338338
// Use non-singleton bean definition, to avoid registering bean as dependent bean.
339339
RootBeanDefinition bd = new RootBeanDefinition(beanClass, autowireMode, dependencyCheck);
340340
bd.setScope(BeanDefinition.SCOPE_PROTOTYPE);
341341
return createBean(beanClass.getName(), bd, null);
342342
}
343343

344344
@Override
345-
public Object autowire(Class beanClass, int autowireMode, boolean dependencyCheck) throws BeansException {
345+
public Object autowire(Class<?> beanClass, int autowireMode, boolean dependencyCheck) throws BeansException {
346346
// Use non-singleton bean definition, to avoid registering bean as dependent bean.
347347
final RootBeanDefinition bd = new RootBeanDefinition(beanClass, autowireMode, dependencyCheck);
348348
bd.setScope(BeanDefinition.SCOPE_PROTOTYPE);
@@ -507,7 +507,7 @@ protected Object doCreateBean(final String beanName, final RootBeanDefinition mb
507507
instanceWrapper = createBeanInstance(beanName, mbd, args);
508508
}
509509
final Object bean = (instanceWrapper != null ? instanceWrapper.getWrappedInstance() : null);
510-
Class beanType = (instanceWrapper != null ? instanceWrapper.getWrappedClass() : null);
510+
Class<?> beanType = (instanceWrapper != null ? instanceWrapper.getWrappedClass() : null);
511511

512512
// Allow post-processors to modify the merged bean definition.
513513
synchronized (mbd.postProcessingLock) {
@@ -605,7 +605,7 @@ protected Class<?> predictBeanType(String beanName, RootBeanDefinition mbd, Clas
605605
for (BeanPostProcessor bp : getBeanPostProcessors()) {
606606
if (bp instanceof SmartInstantiationAwareBeanPostProcessor) {
607607
SmartInstantiationAwareBeanPostProcessor ibp = (SmartInstantiationAwareBeanPostProcessor) bp;
608-
Class predicted = ibp.predictBeanType(targetType, beanName);
608+
Class<?> predicted = ibp.predictBeanType(targetType, beanName);
609609
if (predicted != null && (typesToMatch.length != 1 || !FactoryBean.class.equals(typesToMatch[0]) ||
610610
FactoryBean.class.isAssignableFrom(predicted))) {
611611
return predicted;
@@ -855,7 +855,7 @@ private FactoryBean getNonSingletonFactoryBeanForTypeCheck(String beanName, Root
855855
* @throws BeansException if any post-processing failed
856856
* @see MergedBeanDefinitionPostProcessor#postProcessMergedBeanDefinition
857857
*/
858-
protected void applyMergedBeanDefinitionPostProcessors(RootBeanDefinition mbd, Class beanType, String beanName)
858+
protected void applyMergedBeanDefinitionPostProcessors(RootBeanDefinition mbd, Class<?> beanType, String beanName)
859859
throws BeansException {
860860

861861
try {
@@ -906,7 +906,7 @@ protected Object resolveBeforeInstantiation(String beanName, RootBeanDefinition
906906
* @throws BeansException if any post-processing failed
907907
* @see InstantiationAwareBeanPostProcessor#postProcessBeforeInstantiation
908908
*/
909-
protected Object applyBeanPostProcessorsBeforeInstantiation(Class beanClass, String beanName)
909+
protected Object applyBeanPostProcessorsBeforeInstantiation(Class<?> beanClass, String beanName)
910910
throws BeansException {
911911

912912
for (BeanPostProcessor bp : getBeanPostProcessors()) {
@@ -935,7 +935,7 @@ protected Object applyBeanPostProcessorsBeforeInstantiation(Class beanClass, Str
935935
*/
936936
protected BeanWrapper createBeanInstance(String beanName, RootBeanDefinition mbd, Object[] args) {
937937
// Make sure bean class is actually resolved at this point.
938-
Class beanClass = resolveBeanClass(mbd, beanName);
938+
Class<?> beanClass = resolveBeanClass(mbd, beanName);
939939

940940
if (beanClass != null && !Modifier.isPublic(beanClass.getModifiers()) && !mbd.isNonPublicAccessAllowed()) {
941941
throw new BeanCreationException(mbd.getResourceDescription(), beanName,
@@ -987,7 +987,7 @@ protected BeanWrapper createBeanInstance(String beanName, RootBeanDefinition mbd
987987
* @throws org.springframework.beans.BeansException in case of errors
988988
* @see org.springframework.beans.factory.config.SmartInstantiationAwareBeanPostProcessor#determineCandidateConstructors
989989
*/
990-
protected Constructor[] determineConstructorsFromBeanPostProcessors(Class beanClass, String beanName)
990+
protected Constructor[] determineConstructorsFromBeanPostProcessors(Class<?> beanClass, String beanName)
991991
throws BeansException {
992992

993993
if (beanClass != null && hasInstantiationAwareBeanPostProcessors()) {

‎spring-beans/src/main/java/org/springframework/beans/factory/support/RootBeanDefinition.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public RootBeanDefinition() {
108108
* Create a new RootBeanDefinition for a singleton.
109109
* @param beanClass the class of the bean to instantiate
110110
*/
111-
public RootBeanDefinition(Class beanClass) {
111+
public RootBeanDefinition(Class<?> beanClass) {
112112
super();
113113
setBeanClass(beanClass);
114114
}
@@ -121,7 +121,7 @@ public RootBeanDefinition(Class beanClass) {
121121
* @param dependencyCheck whether to perform a dependency check for objects
122122
* (not applicable to autowiring a constructor, thus ignored there)
123123
*/
124-
public RootBeanDefinition(Class beanClass, int autowireMode, boolean dependencyCheck) {
124+
public RootBeanDefinition(Class<?> beanClass, int autowireMode, boolean dependencyCheck) {
125125
super();
126126
setBeanClass(beanClass);
127127
setAutowireMode(autowireMode);
@@ -137,7 +137,7 @@ public RootBeanDefinition(Class beanClass, int autowireMode, boolean dependencyC
137137
* @param cargs the constructor argument values to apply
138138
* @param pvs the property values to apply
139139
*/
140-
public RootBeanDefinition(Class beanClass, ConstructorArgumentValues cargs, MutablePropertyValues pvs) {
140+
public RootBeanDefinition(Class<?> beanClass, ConstructorArgumentValues cargs, MutablePropertyValues pvs) {
141141
super(cargs, pvs);
142142
setBeanClass(beanClass);
143143
}

0 commit comments

Comments
 (0)