Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-05 00:56:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Polish

Browse Source
This commit is contained in:
Phillip Webb 2023-06-16 13:53:33 -07:00
parent 9b72cc41ab
commit 0fd1c89889
2 changed files with 12 additions and 7 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/JavaBeanBinder.java
View File

@ -392,11 +392,9 @@ class JavaBeanBinder implements DataObjectBinder {
} }
private boolean isUninitializedKotlinProperty(Exception ex) { private boolean isUninitializedKotlinProperty(Exception ex) {
if (ex instanceof InvocationTargetException ite) { return (ex instanceof InvocationTargetException invocationTargetException)
return "kotlin.UninitializedPropertyAccessException" && "kotlin.UninitializedPropertyAccessException"
.equals(ite.getTargetException().getClass().getName()); .equals(invocationTargetException.getTargetException().getClass().getName());
}
return false;
} }
boolean isSettable() { boolean isSettable() {

11
spring-boot-system-tests/spring-boot-image-tests/src/systemTest/java/org/springframework/boot/image/assertions/ContainerConfigAssert.java
View File

@ -16,6 +16,7 @@
package org.springframework.boot.image.assertions; package org.springframework.boot.image.assertions;
import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -106,8 +107,14 @@ public class ContainerConfigAssert extends AbstractAssert<ContainerConfigAssert,
return this.actual.extractingJsonPathArrayValue("$.processes[?(@.type=='%s')]", type) return this.actual.extractingJsonPathArrayValue("$.processes[?(@.type=='%s')]", type)
.singleElement() .singleElement()
.extracting("command", "args") .extracting("command", "args")
.flatMap((list) -> (list != null) ? ((List<?>) list).stream().map(Objects::toString).toList() .flatMap(this::getArgs);
: Collections.emptyList()); }
private Collection<String> getArgs(Object obj) {
if (obj instanceof List<?> list) {
return list.stream().map(Objects::toString).toList();
}
return Collections.emptyList();
} }
} }