Polish

Author: eddumelendez

modules/cratedb/src/main/java/org/testcontainers/cratedb/CrateDBContainer.java

@@ -47,7 +47,7 @@ public CrateDBContainer(final DockerImageName dockerImageName) {
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
         withCommand("crate -C discovery.type=single-node");
 
-        this.waitStrategy = Wait.forHttp("/").forPort(CRATEDB_HTTP_PORT).forStatusCode(200);
+        waitingFor(Wait.forHttp("/").forPort(CRATEDB_HTTP_PORT).forStatusCode(200));
 
         addExposedPort(CRATEDB_PG_PORT);
         addExposedPort(CRATEDB_HTTP_PORT);

modules/neo4j/src/main/java/org/testcontainers/neo4j/Neo4jContainer.java

@@ -104,11 +104,12 @@ public Neo4jContainer(final DockerImageName dockerImageName) {
 
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
-        this.waitStrategy =
+        waitingFor(
             new WaitAllStrategy()
                 .withStrategy(WAIT_FOR_BOLT)
                 .withStrategy(WAIT_FOR_HTTP)
-                .withStartupTimeout(Duration.ofMinutes(2));
+                .withStartupTimeout(Duration.ofMinutes(2))
+        );
 
         addExposedPorts(DEFAULT_BOLT_PORT, DEFAULT_HTTP_PORT, DEFAULT_HTTPS_PORT);
     }
@@ -168,11 +169,9 @@ private void configureWaitStrategy() {
         boolean onlyHttpExposed = !boltExposed && httpExposed;
 
         if (onlyBoltExposed) {
-            this.waitStrategy =
-                new WaitAllStrategy().withStrategy(WAIT_FOR_BOLT).withStartupTimeout(Duration.ofMinutes(2));
+            waitingFor(new WaitAllStrategy().withStrategy(WAIT_FOR_BOLT).withStartupTimeout(Duration.ofMinutes(2)));
         } else if (onlyHttpExposed) {
-            this.waitStrategy =
-                new WaitAllStrategy().withStrategy(WAIT_FOR_HTTP).withStartupTimeout(Duration.ofMinutes(2));
+            waitingFor(new WaitAllStrategy().withStrategy(WAIT_FOR_HTTP).withStartupTimeout(Duration.ofMinutes(2)));
         }
     }
 

modules/postgresql/src/main/java/org/testcontainers/postgresql/PostgreSQLContainer.java

@@ -2,7 +2,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.testcontainers.containers.JdbcDatabaseContainer;
-import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.utility.DockerImageName;
 
 import java.time.Duration;
@@ -50,12 +50,12 @@ public PostgreSQLContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, PGVECTOR_IMAGE_NAME);
 
-        this.waitStrategy =
-            new LogMessageWaitStrategy()
-                .withRegEx(".*database system is ready to accept connections.*\\s")
-                .withTimes(2)
-                .withStartupTimeout(Duration.of(60, ChronoUnit.SECONDS));
-        this.setCommand("postgres", "-c", FSYNC_OFF_OPTION);
+        waitingFor(
+            Wait
+                .forLogMessage(".*database system is ready to accept connections.*\\s", 2)
+                .withStartupTimeout(Duration.of(60, ChronoUnit.SECONDS))
+        );
+        setCommand("postgres", "-c", FSYNC_OFF_OPTION);
 
         addExposedPort(POSTGRESQL_PORT);
     }

modules/presto/src/main/java/org/testcontainers/containers/PrestoContainer.java

@@ -2,7 +2,7 @@
 
 import com.google.common.base.Strings;
 import org.jetbrains.annotations.NotNull;
-import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
+import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.utility.DockerImageName;
 
 import java.sql.Connection;
@@ -47,10 +47,11 @@ public PrestoContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
-        this.waitStrategy =
-            new LogMessageWaitStrategy()
-                .withRegEx(".*======== SERVER STARTED ========.*")
-                .withStartupTimeout(Duration.of(60, ChronoUnit.SECONDS));
+        waitingFor(
+            Wait
+                .forLogMessage(".*======== SERVER STARTED ========.*", 1)
+                .withStartupTimeout(Duration.of(60, ChronoUnit.SECONDS))
+        );
 
         addExposedPort(PRESTO_PORT);
     }

modules/solace/src/main/java/org/testcontainers/solace/SolaceContainer.java

@@ -79,7 +79,7 @@ public SolaceContainer(DockerImageName dockerImageName) {
                 .withShmSize(SHM_SIZE)
                 .withUlimits(new Ulimit[] { new Ulimit("nofile", 2448L, 1048576L) });
         });
-        this.waitStrategy = Wait.forLogMessage(SOLACE_READY_MESSAGE, 1).withStartupTimeout(Duration.ofSeconds(60));
+        waitingFor(Wait.forLogMessage(SOLACE_READY_MESSAGE, 1).withStartupTimeout(Duration.ofSeconds(60)));
         withExposedPorts(8080);
         withEnv("username_admin_globalaccesslevel", "admin");
         withEnv("username_admin_password", "admin");