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

Merge branch '3.0.x'

Browse Source 
Closes gh-34611
This commit is contained in:
Phillip Webb
2023-03-14 18:04:39 -07:00
parent 65cbcb95b6 5d21c3616f
commit 837ea04cd1
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/DefaultBindConstructorProvider.java
View File

@@ -21,8 +21,6 @@ import java.lang.reflect.Modifier;
import java.util.Arrays; import java.util.Arrays;
import java.util.stream.Stream; import java.util.stream.Stream;
import kotlin.jvm.JvmClassMappingKt;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.KotlinDetector; import org.springframework.core.KotlinDetector;
@@ -106,7 +104,7 @@ class DefaultBindConstructorProvider implements BindConstructorProvider {
MergedAnnotations[] candidateAnnotations = getAnnotations(candidates); MergedAnnotations[] candidateAnnotations = getAnnotations(candidates);
boolean kotlinType = isKotlinType(type); boolean kotlinType = isKotlinType(type);
boolean deducedBindConstructor = false; boolean deducedBindConstructor = false;
boolean immutableType = type.isRecord() || isKotlinDataClass(type); boolean immutableType = type.isRecord();
Constructor<?> bind = getConstructorBindingAnnotated(type, candidates, candidateAnnotations); Constructor<?> bind = getConstructorBindingAnnotated(type, candidates, candidateAnnotations);
if (bind == null && !hasAutowiredConstructor) { if (bind == null && !hasAutowiredConstructor) {
bind = deduceBindConstructor(type, candidates); bind = deduceBindConstructor(type, candidates);
@@ -198,10 +196,6 @@ class DefaultBindConstructorProvider implements BindConstructorProvider {
return (result != null && result.getParameterCount() > 0) ? result : null; return (result != null && result.getParameterCount() > 0) ? result : null;
} }
private static boolean isKotlinDataClass(Class<?> type) {
return isKotlinType(type) && JvmClassMappingKt.getKotlinClass(type).isData();
}
private static boolean isKotlinType(Class<?> type) { private static boolean isKotlinType(Class<?> type) {
return KotlinDetector.isKotlinPresent() && KotlinDetector.isKotlinType(type); return KotlinDetector.isKotlinPresent() && KotlinDetector.isKotlinType(type);
} }