Skip to content

Commit 13ca275

Browse files
jhoellerjhoeller
committed
Consistent use of Class<?> in core container method signatures
(cherry picked from commit 1461744)
1 parent ef363b0 commit 13ca275

File tree

3 files changed

+15
-16
lines changed

3 files changed

+15
-16
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 & 11 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

@@ -329,14 +329,14 @@ public Object resolveDependency(DependencyDescriptor descriptor, String beanName
329329
// Specialized methods for fine-grained control over the bean lifecycle
330330
//-------------------------------------------------------------------------
331331

332-
public Object createBean(Class beanClass, int autowireMode, boolean dependencyCheck) throws BeansException {
332+
public Object createBean(Class<?> beanClass, int autowireMode, boolean dependencyCheck) throws BeansException {
333333
// Use non-singleton bean definition, to avoid registering bean as dependent bean.
334334
RootBeanDefinition bd = new RootBeanDefinition(beanClass, autowireMode, dependencyCheck);
335335
bd.setScope(BeanDefinition.SCOPE_PROTOTYPE);
336336
return createBean(beanClass.getName(), bd, null);
337337
}
338338

339-
public Object autowire(Class beanClass, int autowireMode, boolean dependencyCheck) throws BeansException {
339+
public Object autowire(Class<?> beanClass, int autowireMode, boolean dependencyCheck) throws BeansException {
340340
// Use non-singleton bean definition, to avoid registering bean as dependent bean.
341341
final RootBeanDefinition bd = new RootBeanDefinition(beanClass, autowireMode, dependencyCheck);
342342
bd.setScope(BeanDefinition.SCOPE_PROTOTYPE);
@@ -349,7 +349,6 @@ public Object autowire(Class beanClass, int autowireMode, boolean dependencyChec
349349

350350
if (System.getSecurityManager() != null) {
351351
bean = AccessController.doPrivileged(new PrivilegedAction<Object>() {
352-
353352
public Object run() {
354353
return getInstantiationStrategy().instantiate(bd, null, parent);
355354
}
@@ -490,7 +489,7 @@ protected Object doCreateBean(final String beanName, final RootBeanDefinition mb
490489
instanceWrapper = createBeanInstance(beanName, mbd, args);
491490
}
492491
final Object bean = (instanceWrapper != null ? instanceWrapper.getWrappedInstance() : null);
493-
Class beanType = (instanceWrapper != null ? instanceWrapper.getWrappedClass() : null);
492+
Class<?> beanType = (instanceWrapper != null ? instanceWrapper.getWrappedClass() : null);
494493

495494
// Allow post-processors to modify the merged bean definition.
496495
synchronized (mbd.postProcessingLock) {
@@ -587,7 +586,7 @@ protected Class<?> predictBeanType(String beanName, RootBeanDefinition mbd, Clas
587586
for (BeanPostProcessor bp : getBeanPostProcessors()) {
588587
if (bp instanceof SmartInstantiationAwareBeanPostProcessor) {
589588
SmartInstantiationAwareBeanPostProcessor ibp = (SmartInstantiationAwareBeanPostProcessor) bp;
590-
Class predicted = ibp.predictBeanType(targetType, beanName);
589+
Class<?> predicted = ibp.predictBeanType(targetType, beanName);
591590
if (predicted != null && (typesToMatch.length != 1 || !FactoryBean.class.equals(typesToMatch[0]) ||
592591
FactoryBean.class.isAssignableFrom(predicted))) {
593592
return predicted;
@@ -836,7 +835,7 @@ private FactoryBean getNonSingletonFactoryBeanForTypeCheck(String beanName, Root
836835
* @throws BeansException if any post-processing failed
837836
* @see MergedBeanDefinitionPostProcessor#postProcessMergedBeanDefinition
838837
*/
839-
protected void applyMergedBeanDefinitionPostProcessors(RootBeanDefinition mbd, Class beanType, String beanName)
838+
protected void applyMergedBeanDefinitionPostProcessors(RootBeanDefinition mbd, Class<?> beanType, String beanName)
840839
throws BeansException {
841840

842841
try {
@@ -887,7 +886,7 @@ protected Object resolveBeforeInstantiation(String beanName, RootBeanDefinition
887886
* @throws BeansException if any post-processing failed
888887
* @see InstantiationAwareBeanPostProcessor#postProcessBeforeInstantiation
889888
*/
890-
protected Object applyBeanPostProcessorsBeforeInstantiation(Class beanClass, String beanName)
889+
protected Object applyBeanPostProcessorsBeforeInstantiation(Class<?> beanClass, String beanName)
891890
throws BeansException {
892891

893892
for (BeanPostProcessor bp : getBeanPostProcessors()) {
@@ -916,7 +915,7 @@ protected Object applyBeanPostProcessorsBeforeInstantiation(Class beanClass, Str
916915
*/
917916
protected BeanWrapper createBeanInstance(String beanName, RootBeanDefinition mbd, Object[] args) {
918917
// Make sure bean class is actually resolved at this point.
919-
Class beanClass = resolveBeanClass(mbd, beanName);
918+
Class<?> beanClass = resolveBeanClass(mbd, beanName);
920919

921920
if (beanClass != null && !Modifier.isPublic(beanClass.getModifiers()) && !mbd.isNonPublicAccessAllowed()) {
922921
throw new BeanCreationException(mbd.getResourceDescription(), beanName,
@@ -968,7 +967,7 @@ protected BeanWrapper createBeanInstance(String beanName, RootBeanDefinition mbd
968967
* @throws org.springframework.beans.BeansException in case of errors
969968
* @see org.springframework.beans.factory.config.SmartInstantiationAwareBeanPostProcessor#determineCandidateConstructors
970969
*/
971-
protected Constructor[] determineConstructorsFromBeanPostProcessors(Class beanClass, String beanName)
970+
protected Constructor[] determineConstructorsFromBeanPostProcessors(Class<?> beanClass, String beanName)
972971
throws BeansException {
973972

974973
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
@@ -107,7 +107,7 @@ public RootBeanDefinition() {
107107
* Create a new RootBeanDefinition for a singleton.
108108
* @param beanClass the class of the bean to instantiate
109109
*/
110-
public RootBeanDefinition(Class beanClass) {
110+
public RootBeanDefinition(Class<?> beanClass) {
111111
super();
112112
setBeanClass(beanClass);
113113
}
@@ -147,7 +147,7 @@ public RootBeanDefinition(Class beanClass, int autowireMode) {
147147
* @param dependencyCheck whether to perform a dependency check for objects
148148
* (not applicable to autowiring a constructor, thus ignored there)
149149
*/
150-
public RootBeanDefinition(Class beanClass, int autowireMode, boolean dependencyCheck) {
150+
public RootBeanDefinition(Class<?> beanClass, int autowireMode, boolean dependencyCheck) {
151151
super();
152152
setBeanClass(beanClass);
153153
setAutowireMode(autowireMode);
@@ -191,7 +191,7 @@ public RootBeanDefinition(Class beanClass, MutablePropertyValues pvs, boolean si
191191
* @param cargs the constructor argument values to apply
192192
* @param pvs the property values to apply
193193
*/
194-
public RootBeanDefinition(Class beanClass, ConstructorArgumentValues cargs, MutablePropertyValues pvs) {
194+
public RootBeanDefinition(Class<?> beanClass, ConstructorArgumentValues cargs, MutablePropertyValues pvs) {
195195
super(cargs, pvs);
196196
setBeanClass(beanClass);
197197
}

0 commit comments

Comments
 (0)