Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing

Browse Source 
Issue: SPR-15673
This commit is contained in:
Juergen Hoeller
2017-07-20 13:16:50 +02:00
parent fa4d139684
commit 40df7b6eca
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-beans/src/main/java/org/springframework/beans/BeanUtils.java
View File

@@ -320,10 +320,10 @@ public abstract class BeanUtils {
/**
* Return the primary constructor of the provided class (single or default constructor
* for Java classes and primary constructor for Kotlin classes) if any.
* for Java classes and primary constructor for Kotlin classes), if any.
* @param clazz the {@link Class} of the Kotlin class
* @see <a href="http://kotlinlang.org/docs/reference/classes.html#constructors">http://kotlinlang.org/docs/reference/classes.html#constructors</a>
* @since 5.0
* @see <a href="http://kotlinlang.org/docs/reference/classes.html#constructors">Kotlin docs</a>
*/
@SuppressWarnings("unchecked")
@Nullable
@@ -331,22 +331,22 @@ public abstract class BeanUtils {
Assert.notNull(clazz, "Class must not be null");
Constructor<T> ctor = null;
if (kotlinPresent && isKotlinClass(clazz)) {
ctor = KotlinDelegate.findPrimaryConstructor(clazz);
return KotlinDelegate.findPrimaryConstructor(clazz);
}
else {
Constructor<T>[] ctors = (Constructor<T>[])clazz.getConstructors();
Constructor<T>[] ctors = (Constructor<T>[]) clazz.getConstructors();
if (ctors.length == 1) {
ctor = ctors[0];
return ctors[0];
}
else {
try {
ctor = clazz.getDeclaredConstructor();
return clazz.getDeclaredConstructor();
}
catch (NoSuchMethodException e) {
catch (NoSuchMethodException ex) {
return null;
}
}
}
return ctor;
}
/**