Skip to content

Commit 0fd1c89

Browse files
committed
Polish
1 parent 9b72cc4 commit 0fd1c89

File tree

2 files changed

+12
-7
lines changed
  • spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind
  • spring-boot-system-tests/spring-boot-image-tests/src/systemTest/java/org/springframework/boot/image/assertions

2 files changed

+12
-7
lines changed

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/JavaBeanBinder.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -392,11 +392,9 @@ Supplier<Object> getValue(Supplier<?> instance) {
392392
}
393393

394394
private boolean isUninitializedKotlinProperty(Exception ex) {
395-
if (ex instanceof InvocationTargetException ite) {
396-
return "kotlin.UninitializedPropertyAccessException"
397-
.equals(ite.getTargetException().getClass().getName());
398-
}
399-
return false;
395+
return (ex instanceof InvocationTargetException invocationTargetException)
396+
&& "kotlin.UninitializedPropertyAccessException"
397+
.equals(invocationTargetException.getTargetException().getClass().getName());
400398
}
401399

402400
boolean isSettable() {

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package org.springframework.boot.image.assertions;
1818

19+
import java.util.Collection;
1920
import java.util.Collections;
2021
import java.util.List;
2122
import java.util.Map;
@@ -106,8 +107,14 @@ public AbstractListAssert<?, List<? extends String>, String, ObjectAssert<String
106107
return this.actual.extractingJsonPathArrayValue("$.processes[?(@.type=='%s')]", type)
107108
.singleElement()
108109
.extracting("command", "args")
109-
.flatMap((list) -> (list != null) ? ((List<?>) list).stream().map(Objects::toString).toList()
110-
: Collections.emptyList());
110+
.flatMap(this::getArgs);
111+
}
112+
113+
private Collection<String> getArgs(Object obj) {
114+
if (obj instanceof List<?> list) {
115+
return list.stream().map(Objects::toString).toList();
116+
}
117+
return Collections.emptyList();
111118
}
112119

113120
}

0 commit comments

Comments
 (0)