Improve null-safety of core/spring-boot-docker-compose

See gh-46926

Author: mhalbritter

core/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/core/DockerCliInspectResponse.java

@@ -33,7 +33,7 @@
  * @author Phillip Webb
  */
 record DockerCliInspectResponse(String id, DockerCliInspectResponse.Config config,
-		DockerCliInspectResponse.NetworkSettings networkSettings,
+		DockerCliInspectResponse.@Nullable NetworkSettings networkSettings,
 		DockerCliInspectResponse.@Nullable HostConfig hostConfig) {
 
 	/**

core/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/core/DockerEnv.java

@@ -40,11 +40,11 @@ class DockerEnv {
 	 * Create a new {@link DockerEnv} instance.
 	 * @param env a list of env entries in the form {@code name=value} or {@code name}.
 	 */
-	DockerEnv(List<String> env) {
+	DockerEnv(@Nullable List<String> env) {
 		this.map = parse(env);
 	}
 
-	private Map<String, @Nullable String> parse(List<String> env) {
+	private Map<String, @Nullable String> parse(@Nullable List<String> env) {
 		if (CollectionUtils.isEmpty(env)) {
 			return Collections.emptyMap();
 		}

core/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/core/DockerHost.java

@@ -83,7 +83,7 @@ static DockerHost get(@Nullable String host, Supplier<List<DockerCliContextRespo
 	 * {@link DockerCliContextResponse}
 	 * @return a new docker host instance
 	 */
-	static DockerHost get(@Nullable String host, Function<String, String> systemEnv,
+	static DockerHost get(@Nullable String host, Function<String, @Nullable String> systemEnv,
 			Supplier<List<DockerCliContextResponse>> contextsSupplier) {
 		host = (StringUtils.hasText(host)) ? host : fromServicesHostEnv(systemEnv);
 		host = (StringUtils.hasText(host)) ? host : fromDockerHostEnv(systemEnv);
@@ -92,11 +92,11 @@ static DockerHost get(@Nullable String host, Function<String, String> systemEnv,
 		return new DockerHost(host);
 	}
 
-	private static String fromServicesHostEnv(Function<String, String> systemEnv) {
+	private static @Nullable String fromServicesHostEnv(Function<String, @Nullable String> systemEnv) {
 		return systemEnv.apply("SERVICES_HOST");
 	}
 
-	private static @Nullable String fromDockerHostEnv(Function<String, String> systemEnv) {
+	private static @Nullable String fromDockerHostEnv(Function<String, @Nullable String> systemEnv) {
 		return fromEndpoint(systemEnv.apply("DOCKER_HOST"));
 	}
 

core/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/lifecycle/DockerComposeLifecycleManager.java

@@ -27,7 +27,6 @@
 
 import org.springframework.aot.AotDetector;
 import org.springframework.boot.SpringApplicationShutdownHandlers;
-import org.springframework.boot.context.properties.bind.Binder;
 import org.springframework.boot.docker.compose.core.DockerCompose;
 import org.springframework.boot.docker.compose.core.DockerComposeFile;
 import org.springframework.boot.docker.compose.core.RunningService;
@@ -74,14 +73,14 @@ class DockerComposeLifecycleManager {
 
 	private final ServiceReadinessChecks serviceReadinessChecks;
 
-	DockerComposeLifecycleManager(ApplicationContext applicationContext, Binder binder,
+	DockerComposeLifecycleManager(ApplicationContext applicationContext,
 			SpringApplicationShutdownHandlers shutdownHandlers, DockerComposeProperties properties,
 			Set<ApplicationListener<?>> eventListeners) {
-		this(null, applicationContext, binder, shutdownHandlers, properties, eventListeners,
-				new DockerComposeSkipCheck(), null);
+		this(null, applicationContext, shutdownHandlers, properties, eventListeners, new DockerComposeSkipCheck(),
+				null);
 	}
 
-	DockerComposeLifecycleManager(@Nullable File workingDirectory, ApplicationContext applicationContext, Binder binder,
+	DockerComposeLifecycleManager(@Nullable File workingDirectory, ApplicationContext applicationContext,
 			SpringApplicationShutdownHandlers shutdownHandlers, DockerComposeProperties properties,
 			Set<ApplicationListener<?>> eventListeners, DockerComposeSkipCheck skipCheck,
 			@Nullable ServiceReadinessChecks serviceReadinessChecks) {

core/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/lifecycle/DockerComposeListener.java

@@ -56,8 +56,7 @@ public void onApplicationEvent(ApplicationPreparedEvent event) {
 	protected DockerComposeLifecycleManager createDockerComposeLifecycleManager(
 			ConfigurableApplicationContext applicationContext, Binder binder, DockerComposeProperties properties,
 			Set<ApplicationListener<?>> eventListeners) {
-		return new DockerComposeLifecycleManager(applicationContext, binder, this.shutdownHandlers, properties,
-				eventListeners);
+		return new DockerComposeLifecycleManager(applicationContext, this.shutdownHandlers, properties, eventListeners);
 	}
 
 }

core/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/lifecycle/DockerComposeLifecycleManagerTests.java

@@ -109,7 +109,7 @@ void setup() throws IOException {
 		this.eventListeners = new LinkedHashSet<>();
 		this.skipCheck = mock(DockerComposeSkipCheck.class);
 		this.serviceReadinessChecks = mock(ServiceReadinessChecks.class);
-		this.lifecycleManager = new TestDockerComposeLifecycleManager(workingDirectory, this.applicationContext, binder,
+		this.lifecycleManager = new TestDockerComposeLifecycleManager(workingDirectory, this.applicationContext,
 				this.shutdownHandlers, this.properties, this.eventListeners, this.skipCheck,
 				this.serviceReadinessChecks);
 	}
@@ -152,15 +152,15 @@ void startWhenUsingAotArtifactsDoesNotStart() {
 	@Test
 	void startWhenComposeFileNotFoundThrowsException() {
 		DockerComposeLifecycleManager manager = new DockerComposeLifecycleManager(new File("."),
-				this.applicationContext, null, this.shutdownHandlers, this.properties, this.eventListeners,
-				this.skipCheck, this.serviceReadinessChecks);
+				this.applicationContext, this.shutdownHandlers, this.properties, this.eventListeners, this.skipCheck,
+				this.serviceReadinessChecks);
 		assertThatIllegalStateException().isThrownBy(manager::start)
 			.withMessageContaining(Paths.get(".").toAbsolutePath().toString());
 	}
 
 	@Test
 	void startWhenComposeFileNotFoundAndWorkingDirectoryNullThrowsException() {
-		DockerComposeLifecycleManager manager = new DockerComposeLifecycleManager(null, this.applicationContext, null,
+		DockerComposeLifecycleManager manager = new DockerComposeLifecycleManager(null, this.applicationContext,
 				this.shutdownHandlers, this.properties, this.eventListeners, this.skipCheck,
 				this.serviceReadinessChecks);
 		assertThatIllegalStateException().isThrownBy(manager::start)
@@ -516,11 +516,11 @@ DockerComposeServicesReadyEvent getEvent() {
 	 */
 	class TestDockerComposeLifecycleManager extends DockerComposeLifecycleManager {
 
-		TestDockerComposeLifecycleManager(File workingDirectory, ApplicationContext applicationContext, Binder binder,
+		TestDockerComposeLifecycleManager(File workingDirectory, ApplicationContext applicationContext,
 				SpringApplicationShutdownHandlers shutdownHandlers, DockerComposeProperties properties,
 				Set<ApplicationListener<?>> eventListeners, DockerComposeSkipCheck skipCheck,
 				ServiceReadinessChecks serviceReadinessChecks) {
-			super(workingDirectory, applicationContext, binder, shutdownHandlers, properties, eventListeners, skipCheck,
+			super(workingDirectory, applicationContext, shutdownHandlers, properties, eventListeners, skipCheck,
 					serviceReadinessChecks);
 		}