Skip to content

Commit f5e6c70

Browse files
jhoellerjhoeller
committed
Polishing
1 parent c0b0ee6 commit f5e6c70

File tree

12 files changed

+126
-150
lines changed

12 files changed

+126
-150
lines changed

‎spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionWrapper.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525
import org.springframework.beans.BeanWrapper;
2626
import org.springframework.beans.BeanWrapperImpl;
27-
import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
2827
import org.springframework.beans.factory.config.BeanDefinition;
2928
import org.springframework.beans.factory.config.BeanDefinitionHolder;
3029
import org.springframework.beans.factory.config.ConstructorArgumentValues;
@@ -182,16 +181,16 @@ public void setProperty(String property, Object newValue) {
182181
AbstractBeanDefinition bd = getBeanDefinition();
183182
if (AUTOWIRE.equals(property)) {
184183
if ("byName".equals(newValue)) {
185-
bd.setAutowireMode(AutowireCapableBeanFactory.AUTOWIRE_BY_NAME);
184+
bd.setAutowireMode(AbstractBeanDefinition.AUTOWIRE_BY_NAME);
186185
}
187186
else if ("byType".equals(newValue)) {
188-
bd.setAutowireMode(AutowireCapableBeanFactory.AUTOWIRE_BY_TYPE);
187+
bd.setAutowireMode(AbstractBeanDefinition.AUTOWIRE_BY_TYPE);
189188
}
190189
else if ("constructor".equals(newValue)) {
191-
bd.setAutowireMode(AutowireCapableBeanFactory.AUTOWIRE_CONSTRUCTOR);
190+
bd.setAutowireMode(AbstractBeanDefinition.AUTOWIRE_CONSTRUCTOR);
192191
}
193192
else if (Boolean.TRUE.equals(newValue)) {
194-
bd.setAutowireMode(AutowireCapableBeanFactory.AUTOWIRE_BY_NAME);
193+
bd.setAutowireMode(AbstractBeanDefinition.AUTOWIRE_BY_NAME);
195194
}
196195
}
197196
// constructorArgs
@@ -211,8 +210,9 @@ else if (FACTORY_BEAN.equals(property)) {
211210
}
212211
// factoryMethod
213212
else if (FACTORY_METHOD.equals(property)) {
214-
if (newValue != null)
213+
if (newValue != null) {
215214
bd.setFactoryMethodName(newValue.toString());
215+
}
216216
}
217217
// initMethod
218218
else if (INIT_METHOD.equals(property)) {

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

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -154,10 +154,10 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
154154
*/
155155
private final NamedThreadLocal<String> currentlyCreatedBean = new NamedThreadLocal<>("Currently created bean");
156156

157-
/** Cache of unfinished FactoryBean instances: FactoryBean name --> BeanWrapper */
157+
/** Cache of unfinished FactoryBean instances: FactoryBean name to BeanWrapper */
158158
private final ConcurrentMap<String, BeanWrapper> factoryBeanInstanceCache = new ConcurrentHashMap<>(16);
159159

160-
/** Cache of filtered PropertyDescriptors: bean Class -> PropertyDescriptor array */
160+
/** Cache of filtered PropertyDescriptors: bean Class to PropertyDescriptor array */
161161
private final ConcurrentMap<Class<?>, PropertyDescriptor[]> filteredPropertyDescriptorsCache =
162162
new ConcurrentHashMap<>(256);
163163

@@ -1116,10 +1116,9 @@ protected BeanWrapper createBeanInstance(String beanName, RootBeanDefinition mbd
11161116
}
11171117
}
11181118

1119-
// Need to determine the constructor...
1119+
// Candidate constructors for autowiring?
11201120
Constructor<?>[] ctors = determineConstructorsFromBeanPostProcessors(beanClass, beanName);
1121-
if (ctors != null ||
1122-
mbd.getResolvedAutowireMode() == RootBeanDefinition.AUTOWIRE_CONSTRUCTOR ||
1121+
if (ctors != null || mbd.getResolvedAutowireMode() == AUTOWIRE_CONSTRUCTOR ||
11231122
mbd.hasConstructorArgumentValues() || !ObjectUtils.isEmpty(args)) {
11241123
return autowireConstructor(beanName, mbd, ctors, args);
11251124
}
@@ -1309,25 +1308,21 @@ protected void populateBean(String beanName, RootBeanDefinition mbd, @Nullable B
13091308

13101309
PropertyValues pvs = (mbd.hasPropertyValues() ? mbd.getPropertyValues() : null);
13111310

1312-
if (mbd.getResolvedAutowireMode() == RootBeanDefinition.AUTOWIRE_BY_NAME ||
1313-
mbd.getResolvedAutowireMode() == RootBeanDefinition.AUTOWIRE_BY_TYPE) {
1311+
if (mbd.getResolvedAutowireMode() == AUTOWIRE_BY_NAME || mbd.getResolvedAutowireMode() == AUTOWIRE_BY_TYPE) {
13141312
MutablePropertyValues newPvs = new MutablePropertyValues(pvs);
1315-
13161313
// Add property values based on autowire by name if applicable.
1317-
if (mbd.getResolvedAutowireMode() == RootBeanDefinition.AUTOWIRE_BY_NAME) {
1314+
if (mbd.getResolvedAutowireMode() == AUTOWIRE_BY_NAME) {
13181315
autowireByName(beanName, mbd, bw, newPvs);
13191316
}
1320-
13211317
// Add property values based on autowire by type if applicable.
1322-
if (mbd.getResolvedAutowireMode() == RootBeanDefinition.AUTOWIRE_BY_TYPE) {
1318+
if (mbd.getResolvedAutowireMode() == AUTOWIRE_BY_TYPE) {
13231319
autowireByType(beanName, mbd, bw, newPvs);
13241320
}
1325-
13261321
pvs = newPvs;
13271322
}
13281323

13291324
boolean hasInstAwareBpps = hasInstantiationAwareBeanPostProcessors();
1330-
boolean needsDepCheck = (mbd.getDependencyCheck() != RootBeanDefinition.DEPENDENCY_CHECK_NONE);
1325+
boolean needsDepCheck = (mbd.getDependencyCheck() != AbstractBeanDefinition.DEPENDENCY_CHECK_NONE);
13311326

13321327
if (hasInstAwareBpps || needsDepCheck) {
13331328
if (pvs == null) {
@@ -1532,9 +1527,9 @@ protected void checkDependencies(
15321527
for (PropertyDescriptor pd : pds) {
15331528
if (pd.getWriteMethod() != null && !pvs.contains(pd.getName())) {
15341529
boolean isSimple = BeanUtils.isSimpleProperty(pd.getPropertyType());
1535-
boolean unsatisfied = (dependencyCheck == RootBeanDefinition.DEPENDENCY_CHECK_ALL) ||
1536-
(isSimple && dependencyCheck == RootBeanDefinition.DEPENDENCY_CHECK_SIMPLE) ||
1537-
(!isSimple && dependencyCheck == RootBeanDefinition.DEPENDENCY_CHECK_OBJECTS);
1530+
boolean unsatisfied = (dependencyCheck == AbstractBeanDefinition.DEPENDENCY_CHECK_ALL) ||
1531+
(isSimple && dependencyCheck == AbstractBeanDefinition.DEPENDENCY_CHECK_SIMPLE) ||
1532+
(!isSimple && dependencyCheck == AbstractBeanDefinition.DEPENDENCY_CHECK_OBJECTS);
15381533
if (unsatisfied) {
15391534
throw new UnsatisfiedDependencyException(mbd.getResourceDescription(), beanName, pd.getName(),
15401535
"Set this property value or disable dependency checking for this bean.");
@@ -1787,7 +1782,7 @@ protected void invokeCustomInitMethod(String beanName, final Object bean, RootBe
17871782

17881783
if (initMethod == null) {
17891784
if (mbd.isEnforceInitMethod()) {
1790-
throw new BeanDefinitionValidationException("Couldn't find an init method named '" +
1785+
throw new BeanDefinitionValidationException("Could not find an init method named '" +
17911786
initMethodName + "' on bean with name '" + beanName + "'");
17921787
}
17931788
else {

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2017 the original author or authors.
2+
* Copyright 2002-2018 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -69,9 +69,7 @@ public static BeanDefinitionBuilder genericBeanDefinition(Class<?> beanClass) {
6969
* @param instanceSupplier a callback for creating an instance of the bean
7070
* @since 5.0
7171
*/
72-
public static <T> BeanDefinitionBuilder genericBeanDefinition(
73-
@Nullable Class<T> beanClass, Supplier<T> instanceSupplier) {
74-
72+
public static <T> BeanDefinitionBuilder genericBeanDefinition(Class<T> beanClass, Supplier<T> instanceSupplier) {
7573
BeanDefinitionBuilder builder = new BeanDefinitionBuilder(new GenericBeanDefinition());
7674
builder.beanDefinition.setBeanClass(beanClass);
7775
builder.beanDefinition.setInstanceSupplier(instanceSupplier);
@@ -275,15 +273,15 @@ public BeanDefinitionBuilder setLazyInit(boolean lazy) {
275273
* Set the autowire mode for this definition.
276274
*/
277275
public BeanDefinitionBuilder setAutowireMode(int autowireMode) {
278-
beanDefinition.setAutowireMode(autowireMode);
276+
this.beanDefinition.setAutowireMode(autowireMode);
279277
return this;
280278
}
281279

282280
/**
283281
* Set the depency check mode for this definition.
284282
*/
285283
public BeanDefinitionBuilder setDependencyCheck(int dependencyCheck) {
286-
beanDefinition.setDependencyCheck(dependencyCheck);
284+
this.beanDefinition.setDependencyCheck(dependencyCheck);
287285
return this;
288286
}
289287

@@ -316,7 +314,7 @@ public BeanDefinitionBuilder setRole(int role) {
316314
*/
317315
public BeanDefinitionBuilder applyCustomizers(BeanDefinitionCustomizer... customizers) {
318316
for (BeanDefinitionCustomizer customizer : customizers) {
319-
customizer.customize(beanDefinition);
317+
customizer.customize(this.beanDefinition);
320318
}
321319
return this;
322320
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
import org.springframework.beans.factory.BeanDefinitionStoreException;
4545
import org.springframework.beans.factory.InjectionPoint;
4646
import org.springframework.beans.factory.UnsatisfiedDependencyException;
47+
import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
4748
import org.springframework.beans.factory.config.ConstructorArgumentValues;
4849
import org.springframework.beans.factory.config.ConstructorArgumentValues.ValueHolder;
4950
import org.springframework.beans.factory.config.DependencyDescriptor;
@@ -140,7 +141,7 @@ public BeanWrapper autowireConstructor(String beanName, RootBeanDefinition mbd,
140141
if (constructorToUse == null) {
141142
// Need to resolve the constructor.
142143
boolean autowiring = (chosenCtors != null ||
143-
mbd.getResolvedAutowireMode() == RootBeanDefinition.AUTOWIRE_CONSTRUCTOR);
144+
mbd.getResolvedAutowireMode() == AutowireCapableBeanFactory.AUTOWIRE_CONSTRUCTOR);
144145
ConstructorArgumentValues resolvedValues = null;
145146

146147
int minNrOfArgs;
@@ -427,7 +428,7 @@ public BeanWrapper instantiateUsingFactoryMethod(
427428
AutowireUtils.sortFactoryMethods(candidates);
428429

429430
ConstructorArgumentValues resolvedValues = null;
430-
boolean autowiring = (mbd.getResolvedAutowireMode() == RootBeanDefinition.AUTOWIRE_CONSTRUCTOR);
431+
boolean autowiring = (mbd.getResolvedAutowireMode() == AutowireCapableBeanFactory.AUTOWIRE_CONSTRUCTOR);
431432
int minTypeDiffWeight = Integer.MAX_VALUE;
432433
Set<Method> ambiguousFactoryMethods = null;
433434

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public DisposableBeanAdapter(Object bean, String beanName, RootBeanDefinition be
115115
this.destroyMethod = determineDestroyMethod(destroyMethodName);
116116
if (this.destroyMethod == null) {
117117
if (beanDefinition.isEnforceDestroyMethod()) {
118-
throw new BeanDefinitionValidationException("Couldn't find a destroy method named '" +
118+
throw new BeanDefinitionValidationException("Could not find a destroy method named '" +
119119
destroyMethodName + "' on bean with name '" + beanName + "'");
120120
}
121121
}

‎spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerFactoryBean.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -192,9 +192,6 @@ public static DataSource getConfigTimeNonTransactionalDataSource() {
192192
@Nullable
193193
private Map<String, ?> schedulerContextMap;
194194

195-
@Nullable
196-
private ApplicationContext applicationContext;
197-
198195
@Nullable
199196
private String applicationContextSchedulerContextKey;
200197

@@ -213,6 +210,9 @@ public static DataSource getConfigTimeNonTransactionalDataSource() {
213210

214211
private boolean waitForJobsToCompleteOnShutdown = false;
215212

213+
@Nullable
214+
private ApplicationContext applicationContext;
215+
216216
@Nullable
217217
private Scheduler scheduler;
218218

@@ -564,10 +564,10 @@ private void initSchedulerFactory(StdSchedulerFactory schedulerFactory) throws S
564564

565565
CollectionUtils.mergePropertiesIntoMap(this.quartzProperties, mergedProps);
566566
if (this.dataSource != null) {
567-
mergedProps.put(StdSchedulerFactory.PROP_JOB_STORE_CLASS, LocalDataSourceJobStore.class.getName());
567+
mergedProps.setProperty(StdSchedulerFactory.PROP_JOB_STORE_CLASS, LocalDataSourceJobStore.class.getName());
568568
}
569569
if (this.schedulerName != null) {
570-
mergedProps.put(StdSchedulerFactory.PROP_SCHED_INSTANCE_NAME, this.schedulerName);
570+
mergedProps.setProperty(StdSchedulerFactory.PROP_SCHED_INSTANCE_NAME, this.schedulerName);
571571
}
572572

573573
schedulerFactory.initialize(mergedProps);

‎spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2016 the original author or authors.
2+
* Copyright 2002-2018 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -292,10 +292,7 @@ public void schedulerWithSpringBeanJobFactoryAndJobSchedulingData() throws Excep
292292
bean.destroy();
293293
}
294294

295-
/**
296-
* Tests the creation of multiple schedulers (SPR-772)
297-
*/
298-
@Test
295+
@Test // SPR-772
299296
public void multipleSchedulers() throws Exception {
300297
ClassPathXmlApplicationContext ctx = context("multipleSchedulers.xml");
301298
try {
@@ -363,8 +360,8 @@ public void schedulerAutoStartsOnContextRefreshedEventByDefault() throws Excepti
363360
@SuppressWarnings("resource")
364361
public void schedulerAutoStartupFalse() throws Exception {
365362
StaticApplicationContext context = new StaticApplicationContext();
366-
BeanDefinition beanDefinition = BeanDefinitionBuilder.genericBeanDefinition(
367-
SchedulerFactoryBean.class).addPropertyValue("autoStartup", false).getBeanDefinition();
363+
BeanDefinition beanDefinition = BeanDefinitionBuilder.genericBeanDefinition(SchedulerFactoryBean.class)
364+
.addPropertyValue("autoStartup", false).getBeanDefinition();
368365
context.registerBeanDefinition("scheduler", beanDefinition);
369366
Scheduler bean = context.getBean("scheduler", Scheduler.class);
370367
assertFalse(bean.isStarted());

‎spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import org.springframework.beans.factory.config.BeanDefinitionHolder;
3737
import org.springframework.beans.factory.groovy.GroovyBeanDefinitionReader;
3838
import org.springframework.beans.factory.parsing.SourceExtractor;
39+
import org.springframework.beans.factory.support.AbstractBeanDefinition;
3940
import org.springframework.beans.factory.support.AbstractBeanDefinitionReader;
4041
import org.springframework.beans.factory.support.BeanDefinitionReader;
4142
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
@@ -90,8 +91,8 @@ class ConfigurationClassBeanDefinitionReader {
9091

9192

9293
/**
93-
* Create a new {@link ConfigurationClassBeanDefinitionReader} instance that will be used
94-
* to populate the given {@link BeanDefinitionRegistry}.
94+
* Create a new {@link ConfigurationClassBeanDefinitionReader} instance
95+
* that will be used to populate the given {@link BeanDefinitionRegistry}.
9596
*/
9697
ConfigurationClassBeanDefinitionReader(BeanDefinitionRegistry registry, SourceExtractor sourceExtractor,
9798
ResourceLoader resourceLoader, Environment environment, BeanNameGenerator importBeanNameGenerator,
@@ -221,7 +222,7 @@ private void loadBeanDefinitionsForBeanMethod(BeanMethod beanMethod) {
221222
beanDef.setFactoryBeanName(configClass.getBeanName());
222223
beanDef.setUniqueFactoryMethodName(methodName);
223224
}
224-
beanDef.setAutowireMode(RootBeanDefinition.AUTOWIRE_CONSTRUCTOR);
225+
beanDef.setAutowireMode(AbstractBeanDefinition.AUTOWIRE_CONSTRUCTOR);
225226
beanDef.setAttribute(RequiredAnnotationBeanPostProcessor.SKIP_REQUIRED_CHECK_ATTRIBUTE, Boolean.TRUE);
226227

227228
AnnotationConfigUtils.processCommonDefinitionAnnotations(beanDef, metadata);
@@ -264,7 +265,6 @@ private void loadBeanDefinitionsForBeanMethod(BeanMethod beanMethod) {
264265
logger.debug(String.format("Registering bean definition for @Bean method %s.%s()",
265266
configClass.getMetadata().getClassName(), beanName));
266267
}
267-
268268
this.registry.registerBeanDefinition(beanName, beanDefToRegister);
269269
}
270270

‎spring-context/src/main/java/org/springframework/context/support/GenericApplicationContext.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2017 the original author or authors.
2+
* Copyright 2002-2018 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -361,8 +361,8 @@ public boolean isAlias(String beanName) {
361361
* bean definition metadata (typically declared as a lambda expression
362362
* or method reference).
363363
* @param beanClass the class of the bean
364-
* @param customizers one or more callbacks for customizing the
365-
* factory's {@link BeanDefinition}, e.g. setting a lazy-init or primary flag
364+
* @param customizers one or more callbacks for customizing the factory's
365+
* {@link BeanDefinition}, e.g. setting a lazy-init or primary flag
366366
* @since 5.0
367367
* @see #registerBean(String, Class, Supplier, BeanDefinitionCustomizer...)
368368
*/
@@ -377,8 +377,8 @@ public final <T> void registerBean(Class<T> beanClass, BeanDefinitionCustomizer.
377377
* (again typically declared as a lambda expression or method reference).
378378
* @param beanName the name of the bean (may be {@code null})
379379
* @param beanClass the class of the bean
380-
* @param customizers one or more callbacks for customizing the
381-
* factory's {@link BeanDefinition}, e.g. setting a lazy-init or primary flag
380+
* @param customizers one or more callbacks for customizing the factory's
381+
* {@link BeanDefinition}, e.g. setting a lazy-init or primary flag
382382
* @since 5.0
383383
* @see #registerBean(String, Class, Supplier, BeanDefinitionCustomizer...)
384384
*/
@@ -393,8 +393,8 @@ public final <T> void registerBean(@Nullable String beanName, Class<T> beanClass
393393
* (again typically declared as a lambda expression or method reference).
394394
* @param beanClass the class of the bean
395395
* @param supplier a callback for creating an instance of the bean
396-
* @param customizers one or more callbacks for customizing the
397-
* factory's {@link BeanDefinition}, e.g. setting a lazy-init or primary flag
396+
* @param customizers one or more callbacks for customizing the factory's
397+
* {@link BeanDefinition}, e.g. setting a lazy-init or primary flag
398398
* @since 5.0
399399
* @see #registerBean(String, Class, Supplier, BeanDefinitionCustomizer...)
400400
*/
@@ -410,10 +410,10 @@ public final <T> void registerBean(Class<T> beanClass, Supplier<T> supplier, Bea
410410
* <p>This method can be overridden to adapt the registration mechanism for
411411
* all {@code registerBean} methods (since they all delegate to this one).
412412
* @param beanName the name of the bean (may be {@code null})
413-
* @param beanClass the class of the bean (may be {@code null} if a name is given)
413+
* @param beanClass the class of the bean
414414
* @param supplier a callback for creating an instance of the bean
415-
* @param customizers one or more callbacks for customizing the
416-
* factory's {@link BeanDefinition}, e.g. setting a lazy-init or primary flag
415+
* @param customizers one or more callbacks for customizing the factory's
416+
* {@link BeanDefinition}, e.g. setting a lazy-init or primary flag
417417
* @since 5.0
418418
*/
419419
public <T> void registerBean(@Nullable String beanName, Class<T> beanClass, @Nullable Supplier<T> supplier,

‎spring-context/src/main/java/org/springframework/scripting/config/ScriptBeanDefinitionParser.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2017 the original author or authors.
2+
* Copyright 2002-2018 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -134,11 +134,11 @@ protected AbstractBeanDefinition parseInternal(Element element, ParserContext pa
134134
String autowire = element.getAttribute(AUTOWIRE_ATTRIBUTE);
135135
int autowireMode = parserContext.getDelegate().getAutowireMode(autowire);
136136
// Only "byType" and "byName" supported, but maybe other default inherited...
137-
if (autowireMode == GenericBeanDefinition.AUTOWIRE_AUTODETECT) {
138-
autowireMode = GenericBeanDefinition.AUTOWIRE_BY_TYPE;
137+
if (autowireMode == AbstractBeanDefinition.AUTOWIRE_AUTODETECT) {
138+
autowireMode = AbstractBeanDefinition.AUTOWIRE_BY_TYPE;
139139
}
140-
else if (autowireMode == GenericBeanDefinition.AUTOWIRE_CONSTRUCTOR) {
141-
autowireMode = GenericBeanDefinition.AUTOWIRE_NO;
140+
else if (autowireMode == AbstractBeanDefinition.AUTOWIRE_CONSTRUCTOR) {
141+
autowireMode = AbstractBeanDefinition.AUTOWIRE_NO;
142142
}
143143
bd.setAutowireMode(autowireMode);
144144

0 commit comments

Comments
 (0)