Merge branch 'gh-35544'

Closes gh-35544

Author: philwebb

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

@@ -31,7 +31,6 @@
 import org.springframework.boot.docker.compose.core.RunningService;
 import org.springframework.boot.docker.compose.lifecycle.DockerComposeProperties.Start;
 import org.springframework.boot.docker.compose.lifecycle.DockerComposeProperties.Stop;
-import org.springframework.boot.docker.compose.readiness.ServiceReadinessChecks;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.SimpleApplicationEventMulticaster;
@@ -88,7 +87,7 @@ class DockerComposeLifecycleManager {
 		this.eventListeners = eventListeners;
 		this.skipCheck = skipCheck;
 		this.serviceReadinessChecks = (serviceReadinessChecks != null) ? serviceReadinessChecks
-				: new ServiceReadinessChecks(this.classLoader, applicationContext.getEnvironment(), binder);
+				: new ServiceReadinessChecks(properties.getReadiness());
 	}
 
 	void start() {

spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/lifecycle/DockerComposeProperties.java

@@ -75,6 +75,8 @@ public class DockerComposeProperties {
 
 	private final Skip skip = new Skip();
 
+	private final Readiness readiness = new Readiness();
+
 	public boolean isEnabled() {
 		return this.enabled;
 	}
@@ -123,6 +125,10 @@ public Skip getSkip() {
 		return this.skip;
 	}
 
+	public Readiness getReadiness() {
+		return this.readiness;
+	}
+
 	static DockerComposeProperties get(Binder binder) {
 		return binder.bind(NAME, DockerComposeProperties.class).orElseGet(DockerComposeProperties::new);
 	}
@@ -233,4 +239,66 @@ public void setInTests(boolean inTests) {
 
 	}
 
+	/**
+	 * Readiness properties.
+	 */
+	public static class Readiness {
+
+		/**
+		 * Timeout of the readiness checks.
+		 */
+		private Duration timeout = Duration.ofMinutes(2);
+
+		/**
+		 * TCP properties.
+		 */
+		private final Tcp tcp = new Tcp();
+
+		public Duration getTimeout() {
+			return this.timeout;
+		}
+
+		public void setTimeout(Duration timeout) {
+			this.timeout = timeout;
+		}
+
+		public Tcp getTcp() {
+			return this.tcp;
+		}
+
+		/**
+		 * TCP properties.
+		 */
+		public static class Tcp {
+
+			/**
+			 * Timeout for connections.
+			 */
+			private Duration connectTimeout = Duration.ofMillis(200);
+
+			/**
+			 * Timeout for reads.
+			 */
+			private Duration readTimeout = Duration.ofMillis(200);
+
+			public Duration getConnectTimeout() {
+				return this.connectTimeout;
+			}
+
+			public void setConnectTimeout(Duration connectTimeout) {
+				this.connectTimeout = connectTimeout;
+			}
+
+			public Duration getReadTimeout() {
+				return this.readTimeout;
+			}
+
+			public void setReadTimeout(Duration readTimeout) {
+				this.readTimeout = readTimeout;
+			}
+
+		}
+
+	}
+
 }

spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/readiness/ReadinessTimeoutException.java renamed to spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/lifecycle/ReadinessTimeoutException.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.docker.compose.readiness;
+package org.springframework.boot.docker.compose.lifecycle;
 
 import java.time.Duration;
 import java.util.List;
@@ -23,9 +23,7 @@
 import org.springframework.boot.docker.compose.core.RunningService;
 
 /**
- * Exception thrown if readiness checking has timed out. Related
- * {@link ServiceNotReadyException ServiceNotReadyExceptions} are available from
- * {@link #getSuppressed()}.
+ * Exception thrown if readiness checking has timed out.
  *
  * @author Moritz Halbritter
  * @author Andy Wilkinson

spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/readiness/ServiceNotReadyException.java renamed to spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/lifecycle/ServiceNotReadyException.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.docker.compose.readiness;
+package org.springframework.boot.docker.compose.lifecycle;
 
 import org.springframework.boot.docker.compose.core.RunningService;
 
@@ -24,10 +24,8 @@
  * @author Moritz Halbritter
  * @author Andy Wilkinson
  * @author Phillip Webb
- * @since 3.1.0
- * @see ServiceReadinessCheck
  */
-public class ServiceNotReadyException extends RuntimeException {
+class ServiceNotReadyException extends RuntimeException {
 
 	private final RunningService service;
 
@@ -40,11 +38,7 @@ public class ServiceNotReadyException extends RuntimeException {
 		this.service = service;
 	}
 
-	/**
-	 * Return the service that was not ready.
-	 * @return the non-ready service
-	 */
-	public RunningService getService() {
+	RunningService getService() {
 		return this.service;
 	}
 

spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/readiness/ServiceReadinessChecks.java renamed to spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/lifecycle/ServiceReadinessChecks.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.docker.compose.readiness;
+package org.springframework.boot.docker.compose.lifecycle;
 
 import java.time.Clock;
 import java.time.Duration;
@@ -23,28 +23,21 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.function.Consumer;
-import java.util.function.Function;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.springframework.boot.context.properties.bind.Binder;
 import org.springframework.boot.docker.compose.core.RunningService;
-import org.springframework.core.env.Environment;
-import org.springframework.core.io.support.SpringFactoriesLoader;
-import org.springframework.core.io.support.SpringFactoriesLoader.ArgumentResolver;
 import org.springframework.core.log.LogMessage;
 
 /**
- * A collection of {@link ServiceReadinessCheck} instances that can be used to
- * {@link #wait() wait} for {@link RunningService services} to be ready.
+ * Utility used to {@link #wait() wait} for {@link RunningService services} to be ready.
  *
  * @author Moritz Halbritter
  * @author Andy Wilkinson
  * @author Phillip Webb
- * @since 3.1.0
  */
-public class ServiceReadinessChecks {
+class ServiceReadinessChecks {
 
 	private static final Log logger = LogFactory.getLog(ServiceReadinessChecks.class);
 
@@ -56,34 +49,28 @@ public class ServiceReadinessChecks {
 
 	private final Consumer<Duration> sleep;
 
-	private final ReadinessProperties properties;
+	private final DockerComposeProperties.Readiness properties;
 
-	private final List<ServiceReadinessCheck> checks;
+	private final TcpConnectServiceReadinessCheck check;
 
-	public ServiceReadinessChecks(ClassLoader classLoader, Environment environment, Binder binder) {
-		this(Clock.systemUTC(), ServiceReadinessChecks::sleep,
-				SpringFactoriesLoader.forDefaultResourceLocation(classLoader), classLoader, environment, binder,
-				TcpConnectServiceReadinessCheck::new);
+	ServiceReadinessChecks(DockerComposeProperties.Readiness properties) {
+		this(properties, Clock.systemUTC(), ServiceReadinessChecks::sleep,
+				new TcpConnectServiceReadinessCheck(properties.getTcp()));
 	}
 
-	ServiceReadinessChecks(Clock clock, Consumer<Duration> sleep, SpringFactoriesLoader loader, ClassLoader classLoader,
-			Environment environment, Binder binder,
-			Function<ReadinessProperties.Tcp, ServiceReadinessCheck> tcpCheckFactory) {
-		ArgumentResolver argumentResolver = ArgumentResolver.of(ClassLoader.class, classLoader)
-			.and(Environment.class, environment)
-			.and(Binder.class, binder);
+	ServiceReadinessChecks(DockerComposeProperties.Readiness properties, Clock clock, Consumer<Duration> sleep,
+			TcpConnectServiceReadinessCheck check) {
 		this.clock = clock;
 		this.sleep = sleep;
-		this.properties = ReadinessProperties.get(binder);
-		this.checks = new ArrayList<>(loader.load(ServiceReadinessCheck.class, argumentResolver));
-		this.checks.add(tcpCheckFactory.apply(this.properties.getTcp()));
+		this.properties = properties;
+		this.check = check;
 	}
 
 	/**
 	 * Wait for the given services to be ready.
 	 * @param runningServices the services to wait for
 	 */
-	public void waitUntilReady(List<RunningService> runningServices) {
+	void waitUntilReady(List<RunningService> runningServices) {
 		Duration timeout = this.properties.getTimeout();
 		Instant start = this.clock.instant();
 		while (true) {
@@ -106,16 +93,14 @@ private List<ServiceNotReadyException> check(List<RunningService> runningService
 				continue;
 			}
 			logger.trace(LogMessage.format("Checking readiness of service '%s'", service));
-			for (ServiceReadinessCheck check : this.checks) {
-				try {
-					check.check(service);
-					logger.trace(LogMessage.format("Service '%s' is ready", service));
-				}
-				catch (ServiceNotReadyException ex) {
-					logger.trace(LogMessage.format("Service '%s' is not ready", service), ex);
-					exceptions = (exceptions != null) ? exceptions : new ArrayList<>();
-					exceptions.add(ex);
-				}
+			try {
+				this.check.check(service);
+				logger.trace(LogMessage.format("Service '%s' is ready", service));
+			}
+			catch (ServiceNotReadyException ex) {
+				logger.trace(LogMessage.format("Service '%s' is not ready", service), ex);
+				exceptions = (exceptions != null) ? exceptions : new ArrayList<>();
+				exceptions.add(ex);
 			}
 		}
 		return (exceptions != null) ? exceptions : Collections.emptyList();

spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/readiness/TcpConnectServiceReadinessCheck.java renamed to spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/lifecycle/TcpConnectServiceReadinessCheck.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.docker.compose.readiness;
+package org.springframework.boot.docker.compose.lifecycle;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -24,25 +24,23 @@
 import org.springframework.boot.docker.compose.core.RunningService;
 
 /**
- * Default {@link ServiceReadinessCheck} that checks readiness by connecting to the
- * exposed TCP ports.
+ * Checks readiness by connecting to the exposed TCP ports.
  *
  * @author Moritz Halbritter
  * @author Andy Wilkinson
  * @author Phillip Webb
  */
-class TcpConnectServiceReadinessCheck implements ServiceReadinessCheck {
+class TcpConnectServiceReadinessCheck {
 
 	private static final String DISABLE_LABEL = "org.springframework.boot.readiness-check.tcp.disable";
 
-	private final ReadinessProperties.Tcp properties;
+	private final DockerComposeProperties.Readiness.Tcp properties;
 
-	TcpConnectServiceReadinessCheck(ReadinessProperties.Tcp properties) {
+	TcpConnectServiceReadinessCheck(DockerComposeProperties.Readiness.Tcp properties) {
 		this.properties = properties;
 	}
 
-	@Override
-	public void check(RunningService service) {
+	void check(RunningService service) {
 		if (service.labels().containsKey(DISABLE_LABEL)) {
 			return;
 		}