root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Support @Name meta-annotations with Kotlin binding 

Update `ValueObjectBinder` Kotlin support to meta-annotations of
`@Named`.

See gh-24379
This commit is contained in:
Phillip Webb 2020-12-10 10:44:15 -08:00
parent 32e1289bbc
commit 14816a6b6c
1 changed files with 5 additions and 3 deletions
Show Stats 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/ValueObjectBinder.java
View File

@ -190,6 +190,8 @@ class ValueObjectBinder implements DataObjectBinder {
*/ */
private static final class KotlinValueObject<T> extends ValueObject<T> { private static final class KotlinValueObject<T> extends ValueObject<T> {
private static final Annotation[] ANNOTATION_ARRAY = new Annotation[0];
private final List<ConstructorParameter> constructorParameters; private final List<ConstructorParameter> constructorParameters;
private KotlinValueObject(Constructor<T> primaryConstructor, KFunction<T> kotlinConstructor, private KotlinValueObject(Constructor<T> primaryConstructor, KFunction<T> kotlinConstructor,
@ -206,15 +208,15 @@ class ValueObjectBinder implements DataObjectBinder {
String name = getParameterName(parameter); String name = getParameterName(parameter);
ResolvableType parameterType = ResolvableType ResolvableType parameterType = ResolvableType
.forType(ReflectJvmMapping.getJavaType(parameter.getType()), type); .forType(ReflectJvmMapping.getJavaType(parameter.getType()), type);
Annotation[] annotations = parameter.getAnnotations().toArray(new Annotation[0]); Annotation[] annotations = parameter.getAnnotations().toArray(ANNOTATION_ARRAY);
result.add(new ConstructorParameter(name, parameterType, annotations)); result.add(new ConstructorParameter(name, parameterType, annotations));
} }
return Collections.unmodifiableList(result); return Collections.unmodifiableList(result);
} }
private String getParameterName(KParameter parameter) { private String getParameterName(KParameter parameter) {
return parameter.getAnnotations().stream().filter(Name.class::isInstance).findFirst().map(Name.class::cast) return MergedAnnotations.from(parameter, parameter.getAnnotations().toArray(ANNOTATION_ARRAY))
.map(Name::value).orElse(parameter.getName()); .get(Name.class).getValue(MergedAnnotation.VALUE, String.class).orElseGet(parameter::getName);
} }
@Override @Override