Polish oracle-free

Author: eddumelendez

modules/oracle-free/src/main/java/org/testcontainers/oracle/OracleContainer.java

@@ -3,11 +3,10 @@
 import org.apache.commons.lang3.StringUtils;
 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;
-import java.time.temporal.ChronoUnit;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -68,11 +67,11 @@ public OracleContainer(String dockerImageName) {
     public OracleContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
         dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
-        this.waitStrategy =
-            new LogMessageWaitStrategy()
-                .withRegEx(".*DATABASE IS READY TO USE!.*\\s")
-                .withTimes(1)
-                .withStartupTimeout(Duration.of(DEFAULT_STARTUP_TIMEOUT_SECONDS, ChronoUnit.SECONDS));
+        waitingFor(
+            Wait
+                .forLogMessage(".*DATABASE IS READY TO USE!.*\\s", 1)
+                .withStartupTimeout(Duration.ofSeconds(DEFAULT_STARTUP_TIMEOUT_SECONDS))
+        );
         withConnectTimeoutSeconds(DEFAULT_CONNECT_TIMEOUT_SECONDS);
         addExposedPorts(ORACLE_PORT);
     }

modules/oracle-free/src/test/java/org/testcontainers/junit/oracle/SimpleOracleTest.java

@@ -33,7 +33,7 @@ private void runTest(OracleContainer container, String databaseName, String user
 
     @Test
     public void testDefaultSettings() throws SQLException {
-        try (OracleContainer oracle = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME);) {
+        try (OracleContainer oracle = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME)) {
             runTest(oracle, "freepdb1", "test", "test");
 
             // Match against the last '/'
@@ -76,7 +76,7 @@ public void testCustomUser() throws SQLException {
 
     @Test
     public void testSID() throws SQLException {
-        try (OracleContainer oracle = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME).usingSid();) {
+        try (OracleContainer oracle = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME).usingSid()) {
             runTest(oracle, "freepdb1", "system", "test");
 
             // Match against the last ':'
@@ -90,7 +90,7 @@ public void testSIDAndCustomPassword() throws SQLException {
         try (
             OracleContainer oracle = new OracleContainer(ORACLE_DOCKER_IMAGE_NAME)
                 .usingSid()
-                .withPassword("testPassword");
+                .withPassword("testPassword")
         ) {
             runTest(oracle, "freepdb1", "system", "testPassword");
         }