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

Merge branch '3.0.x' into 3.1.x

Browse Source
This commit is contained in:
Phillip Webb
2023-06-16 13:54:01 -07:00
parent c652a3028a 0fd1c89889
commit baddf4c857
13 changed files with 351 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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