Oracle Client Rule: do not start container in static block

This make it possible to use the rule without starting the shared instance.

Signed-off-by: Thomas Segismont <tsegismont@gmail.com>

Author: tsegismont

vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/OraclePoolTest.java

@@ -10,7 +10,6 @@
  */
 package io.vertx.oracleclient.test;
 
-import io.vertx.oracleclient.OracleConnectOptions;
 import io.vertx.oracleclient.OraclePool;
 import io.vertx.oracleclient.test.junit.OracleRule;
 import io.vertx.sqlclient.*;
@@ -22,7 +21,7 @@
 public class OraclePoolTest extends OracleTestBase {
 
   @Rule
-  public OracleRule oracle;
+  public OracleRule oracle = OracleRule.SHARED_INSTANCE;
 
   static final String DROP_TABLE = "DROP TABLE fruits";
   static final String CREATE_TABLE = "CREATE TABLE fruits (" +
@@ -33,12 +32,7 @@ public class OraclePoolTest extends OracleTestBase {
 
   @Test
   public void test() {
-    OraclePool pool = OraclePool.pool(vertx, new OracleConnectOptions()
-        .setHost(OracleRule.getDatabaseHost())
-        .setPort(OracleRule.getDatabasePort())
-        .setUser(OracleRule.getUser())
-        .setPassword(OracleRule.getPassword())
-        .setDatabase(OracleRule.getDatabase()),
+    OraclePool pool = OraclePool.pool(vertx, oracle.options(),
       new PoolOptions().setMaxSize(1)
     );
 

vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/junit/OracleRule.java

@@ -16,25 +16,45 @@
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
 
+import java.io.IOException;
 import java.time.Duration;
 
 public class OracleRule extends ExternalResource {
 
+  public static final OracleRule SHARED_INSTANCE = new OracleRule();
+
   static final String IMAGE = "gvenzl/oracle-xe";
   static final String PASSWORD = "vertx";
   static final int PORT = 1521;
 
-  static final GenericContainer<?> ORACLE_DB;
+  private GenericContainer<?> server;
+  private OracleConnectOptions options;
 
-  static {
-    String containerVersion = System.getProperty("oracle-container.version");
-    if (containerVersion == null || containerVersion.isEmpty()) {
-      containerVersion = "18-slim";
+  @Override
+  protected void before() throws IOException {
+    if (server == null) {
+      options = startOracle();
+    }
+  }
+
+  private boolean isNullOrEmpty(String s) {
+    return s == null || s.isEmpty();
+  }
+
+  @Override
+  protected void after() {
+    if (this != SHARED_INSTANCE) {
+      stopOracle();
     }
+  }
+
+  private OracleConnectOptions startOracle() throws IOException {
+    String containerVersion = System.getProperty("oracle-container.version");
+    containerVersion = isNullOrEmpty(containerVersion) ? "18-slim" : containerVersion;
 
     String image = IMAGE + ":" + containerVersion;
 
-    ORACLE_DB = new GenericContainer<>(image)
+    server = new GenericContainer<>(image)
       .withEnv("ORACLE_PASSWORD", PASSWORD)
       .withExposedPorts(PORT)
       .withClasspathResourceMapping("tck/import.sql", "/container-entrypoint-initdb.d/import.sql", BindMode.READ_ONLY)
@@ -44,53 +64,27 @@ public class OracleRule extends ExternalResource {
       )
       .withStartupTimeout(Duration.ofMinutes(15));
 
-    ORACLE_DB.start();
-  }
-
-  public static String getPassword() {
-    return PASSWORD;
-  }
-
-  public static String getUser() {
-    return "sys as sysdba";
-  }
+    server.start();
 
-  public static String getDatabaseHost() {
-    return ORACLE_DB.getHost();
-  }
-
-  public static int getDatabasePort() {
-    return ORACLE_DB.getMappedPort(1521);
-  }
-
-  public static String getDatabase() {
-    return "xe";
+    return new OracleConnectOptions()
+      .setHost(server.getContainerIpAddress())
+      .setPort(server.getMappedPort(PORT))
+      .setUser("sys as sysdba")
+      .setPassword(PASSWORD)
+      .setDatabase("xe");
   }
 
-  private OracleConnectOptions options;
-
-  public static final OracleRule SHARED_INSTANCE = new OracleRule();
-
-  public synchronized OracleConnectOptions getOptions() throws Exception {
-    return new OracleConnectOptions()
-      .setPort(getDatabasePort())
-      .setHost(getDatabaseHost())
-      .setUser(getUser())
-      .setPassword(getPassword())
-      .setDatabase(getDatabase());
+  private void stopOracle() {
+    if (server != null) {
+      try {
+        server.stop();
+      } finally {
+        server = null;
+      }
+    }
   }
 
   public OracleConnectOptions options() {
     return new OracleConnectOptions(options);
   }
-
-  @Override
-  protected void before() throws Throwable {
-    options = getOptions();
-  }
-
-  @Override
-  protected void after() {
-
-  }
 }