Skip to content

Commit 082c524

Browse files
jhoellerjhoeller
committed
Polishing
1 parent d3c0855 commit 082c524

File tree

7 files changed

+26
-34
lines changed

7 files changed

+26
-34
lines changed

‎spring-beans/src/main/java/org/springframework/beans/BeanUtils.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -122,11 +122,9 @@ public static <T> T instantiateClass(Class<T> clazz) throws BeanInstantiationExc
122122
return instantiateClass(clazz.getDeclaredConstructor());
123123
}
124124
catch (NoSuchMethodException ex) {
125-
if (KotlinDetector.isKotlinReflectPresent() && KotlinDetector.isKotlinType(clazz)) {
126-
Constructor<T> ctor = findPrimaryConstructor(clazz);
127-
if (ctor != null) {
128-
return instantiateClass(ctor);
129-
}
125+
Constructor<T> ctor = findPrimaryConstructor(clazz);
126+
if (ctor != null) {
127+
return instantiateClass(ctor);
130128
}
131129
throw new BeanInstantiationException(clazz, "No default constructor found", ex);
132130
}

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

Lines changed: 4 additions & 5 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

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

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1148,8 +1148,7 @@ protected BeanWrapper createBeanInstance(String beanName, RootBeanDefinition mbd
11481148

11491149
// Candidate constructors for autowiring?
11501150
Constructor<?>[] ctors = determineConstructorsFromBeanPostProcessors(beanClass, beanName);
1151-
if (ctors != null ||
1152-
mbd.getResolvedAutowireMode() == RootBeanDefinition.AUTOWIRE_CONSTRUCTOR ||
1151+
if (ctors != null || mbd.getResolvedAutowireMode() == AUTOWIRE_CONSTRUCTOR ||
11531152
mbd.hasConstructorArgumentValues() || !ObjectUtils.isEmpty(args)) {
11541153
return autowireConstructor(beanName, mbd, ctors, args);
11551154
}
@@ -1351,25 +1350,21 @@ protected void populateBean(String beanName, RootBeanDefinition mbd, @Nullable B
13511350

13521351
PropertyValues pvs = (mbd.hasPropertyValues() ? mbd.getPropertyValues() : null);
13531352

1354-
if (mbd.getResolvedAutowireMode() == RootBeanDefinition.AUTOWIRE_BY_NAME ||
1355-
mbd.getResolvedAutowireMode() == RootBeanDefinition.AUTOWIRE_BY_TYPE) {
1353+
if (mbd.getResolvedAutowireMode() == AUTOWIRE_BY_NAME || mbd.getResolvedAutowireMode() == AUTOWIRE_BY_TYPE) {
13561354
MutablePropertyValues newPvs = new MutablePropertyValues(pvs);
1357-
13581355
// Add property values based on autowire by name if applicable.
1359-
if (mbd.getResolvedAutowireMode() == RootBeanDefinition.AUTOWIRE_BY_NAME) {
1356+
if (mbd.getResolvedAutowireMode() == AUTOWIRE_BY_NAME) {
13601357
autowireByName(beanName, mbd, bw, newPvs);
13611358
}
1362-
13631359
// Add property values based on autowire by type if applicable.
1364-
if (mbd.getResolvedAutowireMode() == RootBeanDefinition.AUTOWIRE_BY_TYPE) {
1360+
if (mbd.getResolvedAutowireMode() == AUTOWIRE_BY_TYPE) {
13651361
autowireByType(beanName, mbd, bw, newPvs);
13661362
}
1367-
13681363
pvs = newPvs;
13691364
}
13701365

13711366
boolean hasInstAwareBpps = hasInstantiationAwareBeanPostProcessors();
1372-
boolean needsDepCheck = (mbd.getDependencyCheck() != RootBeanDefinition.DEPENDENCY_CHECK_NONE);
1367+
boolean needsDepCheck = (mbd.getDependencyCheck() != AbstractBeanDefinition.DEPENDENCY_CHECK_NONE);
13731368

13741369
PropertyDescriptor[] filteredPds = null;
13751370
if (hasInstAwareBpps) {
@@ -1582,9 +1577,9 @@ protected void checkDependencies(
15821577
for (PropertyDescriptor pd : pds) {
15831578
if (pd.getWriteMethod() != null && (pvs == null || !pvs.contains(pd.getName()))) {
15841579
boolean isSimple = BeanUtils.isSimpleProperty(pd.getPropertyType());
1585-
boolean unsatisfied = (dependencyCheck == RootBeanDefinition.DEPENDENCY_CHECK_ALL) ||
1586-
(isSimple && dependencyCheck == RootBeanDefinition.DEPENDENCY_CHECK_SIMPLE) ||
1587-
(!isSimple && dependencyCheck == RootBeanDefinition.DEPENDENCY_CHECK_OBJECTS);
1580+
boolean unsatisfied = (dependencyCheck == AbstractBeanDefinition.DEPENDENCY_CHECK_ALL) ||
1581+
(isSimple && dependencyCheck == AbstractBeanDefinition.DEPENDENCY_CHECK_SIMPLE) ||
1582+
(!isSimple && dependencyCheck == AbstractBeanDefinition.DEPENDENCY_CHECK_OBJECTS);
15881583
if (unsatisfied) {
15891584
throw new UnsatisfiedDependencyException(mbd.getResourceDescription(), beanName, pd.getName(),
15901585
"Set this property value or disable dependency checking for this bean.");

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -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);

‎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
@@ -47,6 +47,7 @@
4747
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
4848
import org.springframework.beans.factory.NoUniqueBeanDefinitionException;
4949
import org.springframework.beans.factory.UnsatisfiedDependencyException;
50+
import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
5051
import org.springframework.beans.factory.config.ConstructorArgumentValues;
5152
import org.springframework.beans.factory.config.ConstructorArgumentValues.ValueHolder;
5253
import org.springframework.beans.factory.config.DependencyDescriptor;
@@ -174,7 +175,7 @@ public BeanWrapper autowireConstructor(String beanName, RootBeanDefinition mbd,
174175

175176
// Need to resolve the constructor.
176177
boolean autowiring = (chosenCtors != null ||
177-
mbd.getResolvedAutowireMode() == RootBeanDefinition.AUTOWIRE_CONSTRUCTOR);
178+
mbd.getResolvedAutowireMode() == AutowireCapableBeanFactory.AUTOWIRE_CONSTRUCTOR);
178179
ConstructorArgumentValues resolvedValues = null;
179180

180181
int minNrOfArgs;
@@ -461,7 +462,7 @@ public BeanWrapper instantiateUsingFactoryMethod(
461462
AutowireUtils.sortFactoryMethods(candidates);
462463

463464
ConstructorArgumentValues resolvedValues = null;
464-
boolean autowiring = (mbd.getResolvedAutowireMode() == RootBeanDefinition.AUTOWIRE_CONSTRUCTOR);
465+
boolean autowiring = (mbd.getResolvedAutowireMode() == AutowireCapableBeanFactory.AUTOWIRE_CONSTRUCTOR);
465466
int minTypeDiffWeight = Integer.MAX_VALUE;
466467
Set<Method> ambiguousFactoryMethods = null;
467468

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import org.springframework.beans.factory.config.BeanDefinitionHolder;
3636
import org.springframework.beans.factory.groovy.GroovyBeanDefinitionReader;
3737
import org.springframework.beans.factory.parsing.SourceExtractor;
38+
import org.springframework.beans.factory.support.AbstractBeanDefinition;
3839
import org.springframework.beans.factory.support.AbstractBeanDefinitionReader;
3940
import org.springframework.beans.factory.support.BeanDefinitionReader;
4041
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
@@ -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(org.springframework.beans.factory.annotation.RequiredAnnotationBeanPostProcessor.
226227
SKIP_REQUIRED_CHECK_ATTRIBUTE, Boolean.TRUE);
227228

‎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)