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

Merge branch '2.1.x' 

Closes gh-17006
This commit is contained in:
Andy Wilkinson 2019-05-29 14:19:57 +01:00
parent 960c03dee5 0b5bb6eb9d
commit e481eccd57
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -513,6 +513,7 @@ public class JavaBeanBinderTests {
assertThat(bean.getBooleans().get("b").getValue()).isEqualTo(true); assertThat(bean.getBooleans().get("b").getValue()).isEqualTo(true);
} }
@Test
public void bindToClassWithOverloadedSetterShouldUseSetterThatMatchesField() { public void bindToClassWithOverloadedSetterShouldUseSetterThatMatchesField() {
// gh-16206 // gh-16206
MockConfigurationPropertySource source = new MockConfigurationPropertySource(); MockConfigurationPropertySource source = new MockConfigurationPropertySource();
@ -524,9 +525,8 @@ public class JavaBeanBinderTests {
} }
@Test @Test
public void beanProperiesPreferMatchingType() { public void beanPropertiesPreferMatchingType() {
// gh-16206 // gh-16206
ResolvableType type = ResolvableType.forClass(PropertyWithOverloadedSetter.class); ResolvableType type = ResolvableType.forClass(PropertyWithOverloadedSetter.class);
Bean<PropertyWithOverloadedSetter> bean = new Bean<PropertyWithOverloadedSetter>( Bean<PropertyWithOverloadedSetter> bean = new Bean<PropertyWithOverloadedSetter>(
type, type.resolve()) { type, type.resolve()) {