Polish "Add failure analysis for invalid Docker environments"

See spring-projectsgh-47797

Author: snicoll

core/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/diagnostics/package-info.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.testcontainers.diagnostics;
+package org.springframework.boot.testcontainers.lifecycle;
 
 import org.jspecify.annotations.Nullable;
 
@@ -23,9 +23,11 @@
 import org.springframework.util.StringUtils;
 
 /**
- * Failure analyzer for the Docker environment wasn't found.
+ * A {@code FailureAnalyzer} that performs analysis of failures caused by Testcontainers
+ * not finding a valid Docker environment.
  *
  * @author Dmytro Nosan
+ * @author Stephane Nicoll
  */
 class DockerEnvironmentNotFoundFailureAnalyzer extends AbstractFailureAnalyzer<IllegalStateException> {
 
@@ -41,14 +43,10 @@ class DockerEnvironmentNotFoundFailureAnalyzer extends AbstractFailureAnalyzer<I
 
 	@Override
 	protected @Nullable FailureAnalysis analyze(Throwable rootFailure, IllegalStateException cause) {
-		if (isDockerEnvironmentNotFoundError(cause)) {
+		if (StringUtils.hasText(cause.getMessage()) && cause.getMessage().contains(EXPECTED_MESSAGE)) {
 			return new FailureAnalysis(DESCRIPTION, ACTION, cause);
 		}
 		return null;
 	}
 
-	private boolean isDockerEnvironmentNotFoundError(IllegalStateException cause) {
-		return StringUtils.hasText(cause.getMessage()) && cause.getMessage().contains(EXPECTED_MESSAGE);
-	}
-
 }

core/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/diagnostics/DockerEnvironmentNotFoundFailureAnalyzer.java renamed to core/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/lifecycle/DockerEnvironmentNotFoundFailureAnalyzer.java

@@ -8,4 +8,4 @@ org.springframework.boot.testcontainers.service.connection.ServiceConnectionCont
 
 # Failure Analyzers
 org.springframework.boot.diagnostics.FailureAnalyzer=\
-org.springframework.boot.testcontainers.diagnostics.DockerEnvironmentNotFoundFailureAnalyzer
+org.springframework.boot.testcontainers.lifecycle.DockerEnvironmentNotFoundFailureAnalyzer

core/spring-boot-testcontainers/src/main/resources/META-INF/spring.factories

@@ -14,13 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.testcontainers.diagnostics;
+package org.springframework.boot.testcontainers.lifecycle;
 
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.diagnostics.FailureAnalysis;
-import org.springframework.boot.diagnostics.FailureAnalyzer;
-import org.springframework.core.io.support.SpringFactoriesLoader;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -59,11 +57,4 @@ void shouldReturnNullWhenMessageIsNull() {
 		assertThat(analysis).isNull();
 	}
 
-	@Test
-	void shouldBeRegisteredInSpringFactories() {
-		assertThat(SpringFactoriesLoader.forDefaultResourceLocation(getClass().getClassLoader())
-			.load(FailureAnalyzer.class, (factoryType, factoryImplementationName, failure) -> {
-			})).anyMatch(DockerEnvironmentNotFoundFailureAnalyzer.class::isInstance);
-	}
-
 }