Fixes testcontainers#543 JdbcDatabaseContainer now accepts Future as …

…image name

modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java

@@ -1,5 +1,7 @@
 package org.testcontainers.containers;
 
+import java.util.concurrent.Future;
+import lombok.NonNull;
 import org.jetbrains.annotations.NotNull;
 import org.rnorth.ducttape.ratelimits.RateLimiter;
 import org.rnorth.ducttape.ratelimits.RateLimiterBuilder;
@@ -31,7 +33,11 @@ public abstract class JdbcDatabaseContainer<SELF extends JdbcDatabaseContainer<S
             .withConstantThroughput()
             .build();
 
-    public JdbcDatabaseContainer(String dockerImageName) {
+    public JdbcDatabaseContainer(@NonNull Future<String> image) {
+        super(image);
+    }
+
+    public JdbcDatabaseContainer(@NonNull String dockerImageName) {
         super(dockerImageName);
     }
 
@@ -45,6 +51,13 @@ public JdbcDatabaseContainer(String dockerImageName) {
      */
     public abstract String getJdbcUrl();
 
+    /**
+     * @return the database name
+     */
+    public String getDatabaseName() {
+        throw new UnsupportedOperationException();
+    }
+
     /**
      * @return the standard database username that should be used for connections
      */
@@ -64,7 +77,7 @@ public SELF withUsername(String username) {
         throw new UnsupportedOperationException();
     }
 
-    public SELF withPassword(String password){
+    public SELF withPassword(String password) {
         throw new UnsupportedOperationException();
     }
 
@@ -120,16 +133,17 @@ public Driver getJdbcDriverInstance() {
     /**
      * Creates a connection to the underlying containerized database instance.
      *
-     * @param queryString any special query string parameters that should be appended to the JDBC connection URL. The
-     *                    '?' character must be included
+     * @param queryString
+     *          query string parameters that should be appended to the JDBC connection URL.
+     *          The '?' character must be included
      * @return a Connection
      * @throws SQLException if there is a repeated failure to create the connection
      */
     public Connection createConnection(String queryString) throws SQLException {
         final Properties info = new Properties();
         info.put("user", this.getUsername());
         info.put("password", this.getPassword());
-        final String url = this.getJdbcUrl() + queryString;
+        final String url = constructUrlForConnection(queryString);
 
         final Driver jdbcDriverInstance = getJdbcDriverInstance();
 
@@ -140,6 +154,20 @@ public Connection createConnection(String queryString) throws SQLException {
         }
     }
 
+    /**
+     * Template method for constructing the JDBC URL to be used for creating {@link Connection}s.
+     * This should be overridden if the JDBC URL and query string concatenation or URL string
+     * construction needs to be different to normal.
+     *
+     * @param queryString
+     *          query string parameters that should be appended to the JDBC connection URL.
+     *          The '?' character must be included
+     * @return a full JDBC URL including queryString
+     */
+    protected String constructUrlForConnection(String queryString) {
+        return getJdbcUrl() + queryString;
+    }
+
     protected void optionallyMapResourceParameterAsVolume(@NotNull String paramName, @NotNull String pathNameInContainer, @NotNull String defaultResource) {
         String resourceName = parameters.getOrDefault(paramName, defaultResource);
 
@@ -149,9 +177,6 @@ protected void optionallyMapResourceParameterAsVolume(@NotNull String paramName,
         }
     }
 
-    @Override
-    protected abstract Integer getLivenessCheckPort();
-
     public void setParameters(Map<String, String> parameters) {
         this.parameters = parameters;
     }