Merge pull request #17005 from izeye

philwebb · philwebb · commit e05799d9634a · 2019-05-29T14:36:00.000-07:00
* pr/17005: Handle all getters first in JavaBeanBinder Closes gh-17005
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/JavaBeanBinder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/JavaBeanBinder.java
@@ -133,9 +133,9 @@ protected void addProperties(Method[] declaredMethods, Field[] declaredFields) {
 			}
 			for (Method method : declaredMethods) {
 				addMethodIfPossible(method, "get", 0, BeanProperty::addGetter);
+				addMethodIfPossible(method, "is", 0, BeanProperty::addGetter);
 			}
 			for (Method method : declaredMethods) {
-				addMethodIfPossible(method, "is", 0, BeanProperty::addGetter);
 				addMethodIfPossible(method, "set", 1, BeanProperty::addSetter);
 			}
 			for (Field field : declaredFields) {

Original file line number	Diff line number	Diff line change
`@@ -133,9 +133,9 @@ protected void addProperties(Method[] declaredMethods, Field[] declaredFields) {`
`133`	`133`	`}`
`134`	`134`	`for (Method method : declaredMethods) {`
`135`	`135`	`addMethodIfPossible(method, "get", 0, BeanProperty::addGetter);`
	`136`	`+ addMethodIfPossible(method, "is", 0, BeanProperty::addGetter);`
`136`	`137`	`}`
`137`	`138`	`for (Method method : declaredMethods) {`
`138`		`- addMethodIfPossible(method, "is", 0, BeanProperty::addGetter);`
`139`	`139`	`addMethodIfPossible(method, "set", 1, BeanProperty::addSetter);`
`140`	`140`	`}`
`141`	`141`	`for (Field field : declaredFields) {`