Merge branch '3.0.x' into 3.1.x

Closes gh-35895
This commit is contained in:
Scott Frederick 2023-06-14 13:49:54 -05:00
commit 779ac09417

View File

@ -16,8 +16,10 @@
package org.springframework.boot.image.assertions;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.function.Consumer;
import com.github.dockerjava.api.model.ContainerConfig;
@ -100,13 +102,12 @@ public class ContainerConfigAssert extends AbstractAssert<ContainerConfigAssert,
return this.actual.extractingJsonPathArrayValue("$.buildpacks[*].id");
}
@SuppressWarnings("unchecked")
public AbstractListAssert<?, List<? extends String>, String, ObjectAssert<String>> processOfType(String type) {
return this.actual.extractingJsonPathArrayValue("$.processes[?(@.type=='%s')]", type)
.singleElement()
.extracting("command", "args")
.flatExtracting((list) -> (List<String>) list);
.flatMap((list) -> (list != null) ? ((List<?>) list).stream().map(Objects::toString).toList()
: Collections.emptyList());
}
}