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

Merge branch '2.1.x'

Browse Source 
Closes gh-18219
This commit is contained in:
Phillip Webb
2019-09-12 15:11:13 -07:00
parent c2023a8c90 23174eb484
commit eea5d15412
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -162,7 +162,7 @@ public final class Bindable<T> {
existingValue == null || this.type.isArray() || this.boxedType.resolve().isInstance(existingValue),
() -> "ExistingValue must be an instance of " + this.type);
Supplier<T> value = (existingValue != null) ? () -> existingValue : null;
return new Bindable<>(this.type, this.boxedType, value, NO_ANNOTATIONS);
return new Bindable<>(this.type, this.boxedType, value, this.annotations);
}
/**
@@ -171,7 +171,7 @@ public final class Bindable<T> {
* @return an updated {@link Bindable}
*/
public Bindable<T> withSuppliedValue(Supplier<T> suppliedValue) {
return new Bindable<>(this.type, this.boxedType, suppliedValue, NO_ANNOTATIONS);
return new Bindable<>(this.type, this.boxedType, suppliedValue, this.annotations);
}
/**

14
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/BindableTests.java
View File

@@ -160,6 +160,20 @@ class BindableTests {
assertThat(bindable1).isEqualTo(bindable3);
}
@Test // gh-18218
public void withExistingValueDoesNotForgetAnnotations() {
Annotation annotation = AnnotationUtils.synthesizeAnnotation(TestAnnotation.class);
Bindable<?> bindable = Bindable.of(String.class).withAnnotations(annotation).withExistingValue("");
assertThat(bindable.getAnnotations()).containsExactly(annotation);
}
@Test // gh-18218
public void withSuppliedValueValueDoesNotForgetAnnotations() {
Annotation annotation = AnnotationUtils.synthesizeAnnotation(TestAnnotation.class);
Bindable<?> bindable = Bindable.of(String.class).withAnnotations(annotation).withSuppliedValue(() -> "");
assertThat(bindable.getAnnotations()).containsExactly(annotation);
}
@Retention(RetentionPolicy.RUNTIME)
@interface TestAnnotation {