[0.6.1-SNAPSHOT]

Alias & Image empty value fixed
GoodforGod · Aug 25, 2023 · 8e2b935 · 8e2b935
1 parent 53118da
commit 8e2b935
Show file tree

Hide file tree

Showing 31 changed files with 66 additions and 59 deletions.
diff --git a/cassandra/README.md b/cassandra/README.md
@@ -63,7 +63,7 @@ testImplementation "com.datastax.oss:java-driver-core:4.17.0"
 `@TestcontainersCassandra` - allow **automatically start container** with specified image in different modes without the need to configure it.
 
 Available containers modes:
-- `PER_RUN` - start container one time per *test execution*. (Containers should have same image to be reused between test classes)
+- `PER_RUN` - start container one time per *test execution*. (Containers must have same `image` and `network` to be reused between test classes)
 - `PER_CLASS` - start new container each *test class*.
 - `PER_METHOD` - start new container each *test method*.
 

diff --git a/...ra/src/main/java/io/goodforgod/testcontainers/extensions/cassandra/CassandraMetadata.java b/...ra/src/main/java/io/goodforgod/testcontainers/extensions/cassandra/CassandraMetadata.java
@@ -16,7 +16,7 @@ final class CassandraMetadata extends AbstractContainerMetadata {
     }
 
     @Override
-    protected @NotNull String networkAliasDefault() {
+    public @NotNull String networkAliasDefault() {
         return "cassandra-" + System.currentTimeMillis();
     }
 

diff --git a/...a/io/goodforgod/testcontainers/extensions/cassandra/TestcontainersCassandraExtension.java b/...a/io/goodforgod/testcontainers/extensions/cassandra/TestcontainersCassandraExtension.java
@@ -46,8 +46,8 @@ protected CassandraContainer<?> getContainerDefault(CassandraMetadata metadata)
         var container = new CassandraContainer<>(dockerImage)
                 .withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger(CassandraContainer.class))
                         .withMdc("image", metadata.image())
-                        .withMdc("alias", metadata.networkAlias()))
-                .withNetworkAliases(metadata.networkAlias())
+                        .withMdc("alias", metadata.networkAliasOrDefault()))
+                .withNetworkAliases(metadata.networkAliasOrDefault())
                 .waitingFor(Wait.forListeningPort())
                 .withStartupTimeout(Duration.ofMinutes(5));
 
@@ -85,7 +85,7 @@ protected Optional<CassandraMetadata> findMetadata(@NotNull ExtensionContext con
     @NotNull
     protected CassandraConnection getConnectionForContainer(CassandraMetadata metadata,
                                                             @NotNull CassandraContainer<?> container) {
-        final String alias = Optional.ofNullable(metadata.networkAlias())
+        final String alias = Optional.ofNullable(metadata.networkAliasOrDefault())
                 .filter(a -> !a.isBlank())
                 .or(() -> (container.getNetworkAliases().isEmpty())
                         ? Optional.empty()

diff --git a/cockroachdb/README.md b/cockroachdb/README.md
@@ -62,7 +62,7 @@ testRuntimeOnly "org.postgresql:postgresql:42.6.0"
 `@TestcontainersCockroachdb` - allow **automatically start container** with specified image in different modes without the need to configure it.
 
 Available containers modes:
-- `PER_RUN` - start container one time per *test execution*. (Containers should have same image to be reused between test classes)
+- `PER_RUN` - start container one time per *test execution*. (Containers must have same `image` and `network` to be reused between test classes)
 - `PER_CLASS` - start new container each *test class*.
 - `PER_METHOD` - start new container each *test method*.
 

diff --git a/...roachdb/src/main/java/io/goodforgod/testcontainers/extensions/jdbc/CockroachMetadata.java b/...roachdb/src/main/java/io/goodforgod/testcontainers/extensions/jdbc/CockroachMetadata.java
@@ -12,7 +12,7 @@ final class CockroachMetadata extends JdbcMetadata {
     }
 
     @Override
-    protected @NotNull String networkAliasDefault() {
+    public @NotNull String networkAliasDefault() {
         return "cockroachdb-" + System.currentTimeMillis();
     }
 }
diff --git a/...java/io/goodforgod/testcontainers/extensions/jdbc/TestcontainersCockroachdbExtension.java b/...java/io/goodforgod/testcontainers/extensions/jdbc/TestcontainersCockroachdbExtension.java
@@ -50,8 +50,8 @@ protected CockroachContainer getContainerDefault(CockroachMetadata metadata) {
         var container = new CockroachContainer(dockerImage)
                 .withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger(CockroachContainer.class))
                         .withMdc("image", metadata.image())
-                        .withMdc("alias", metadata.networkAlias()))
-                .withNetworkAliases(metadata.networkAlias())
+                        .withMdc("alias", metadata.networkAliasOrDefault()))
+                .withNetworkAliases(metadata.networkAliasOrDefault())
                 .withStartupTimeout(Duration.ofMinutes(5));
 
         if (metadata.networkShared()) {
@@ -74,7 +74,7 @@ protected Optional<CockroachMetadata> findMetadata(@NotNull ExtensionContext con
 
     @NotNull
     protected JdbcConnection getConnectionForContainer(CockroachMetadata metadata, @NotNull CockroachContainer container) {
-        final String alias = Optional.ofNullable(metadata.networkAlias())
+        final String alias = Optional.ofNullable(metadata.networkAliasOrDefault())
                 .filter(a -> !a.isBlank())
                 .or(() -> (container.getNetworkAliases().isEmpty())
                         ? Optional.empty()

diff --git a/common/src/main/java/io/goodforgod/testcontainers/extensions/AbstractContainerMetadata.java b/common/src/main/java/io/goodforgod/testcontainers/extensions/AbstractContainerMetadata.java
@@ -10,6 +10,7 @@ public abstract class AbstractContainerMetadata implements ContainerMetadata {
 
     private final boolean network;
     private final String alias;
+    private final String aliasOrDefault;
     private final String image;
     private final ContainerMode runMode;
 
@@ -18,7 +19,8 @@ protected AbstractContainerMetadata(boolean network, String alias, String image,
         this.runMode = runMode;
         this.alias = Optional.ofNullable(getEnvValue("Alias", alias))
                 .filter(a -> !a.isBlank())
-                .orElse(networkAliasDefault());
+                .orElse(null);
+        this.aliasOrDefault = Optional.ofNullable(this.alias).orElse(networkAliasDefault());
         this.image = Optional.ofNullable(getEnvValue("Image", image))
                 .filter(a -> !a.isBlank())
                 .orElseThrow(() -> new IllegalArgumentException(
@@ -54,9 +56,6 @@ private static String getEnvValue(String name, String envOrValue) {
         }
     }
 
-    @NotNull
-    protected abstract String networkAliasDefault();
-
     @Override
     public boolean networkShared() {
         return network;
@@ -67,6 +66,11 @@ public boolean networkShared() {
         return alias;
     }
 
+    @Override
+    public @NotNull String networkAliasOrDefault() {
+        return aliasOrDefault;
+    }
+
     @Override
     public @NotNull String image() {
         return image;

diff --git a/...rc/main/java/io/goodforgod/testcontainers/extensions/AbstractTestcontainersExtension.java b/...rc/main/java/io/goodforgod/testcontainers/extensions/AbstractTestcontainersExtension.java
@@ -260,18 +260,12 @@ private void setupBeforeAll(ExtensionContext context) {
                             .map(c -> c.getNetwork() == Network.SHARED)
                             .orElse(metadata.networkShared());
 
-                    var networkAlias = containerFromField.map(c -> c.getNetworkAliases())
-                            .filter(a -> !a.isEmpty())
-                            .map(a -> a.stream()
-                                    .filter(alias -> alias.equals(metadata.networkAlias()))
-                                    .findFirst()
-                                    .orElse(a.get(0)))
-                            .orElse(metadata.networkAlias());
+                    var networkAlias = metadata.networkAlias();
+                    var sharedKey = new SharedKey(imageShared, networkShared, networkAlias);
 
                     var sharedContainerMap = CLASS_TO_SHARED_CONTAINERS.computeIfAbsent(getClass().getCanonicalName(),
                             k -> new ConcurrentHashMap<>());
 
-                    var sharedKey = new SharedKey(imageShared, networkShared, networkAlias);
                     var extensionContainer = sharedContainerMap.computeIfAbsent(sharedKey, k -> {
                         var container = containerFromField.orElseGet(() -> {
                             logger.debug("Getting default container for image: {}", metadata.image());

diff --git a/common/src/main/java/io/goodforgod/testcontainers/extensions/ContainerMetadata.java b/common/src/main/java/io/goodforgod/testcontainers/extensions/ContainerMetadata.java
@@ -18,6 +18,15 @@ public interface ContainerMetadata {
     @Nullable
     String networkAlias();
 
+    @NotNull
+    String networkAliasDefault();
+
+    /**
+     * @see Network
+     */
+    @NotNull
+    String networkAliasOrDefault();
+
     @NotNull
     String image();
 

diff --git a/common/src/test/java/io/goodforgod/testcontainers/extensions/example/RedisMetadata.java b/common/src/test/java/io/goodforgod/testcontainers/extensions/example/RedisMetadata.java
@@ -11,7 +11,7 @@ final class RedisMetadata extends AbstractContainerMetadata {
     }
 
     @Override
-    protected @NotNull String networkAliasDefault() {
+    public @NotNull String networkAliasDefault() {
         return "redis-" + System.currentTimeMillis();
     }
 }
diff --git a/...st/java/io/goodforgod/testcontainers/extensions/example/TestcontainersRedisExtension.java b/...st/java/io/goodforgod/testcontainers/extensions/example/TestcontainersRedisExtension.java
@@ -42,8 +42,8 @@ protected RedisContainer getContainerDefault(RedisMetadata metadata) {
         var container = new RedisContainer(dockerImage)
                 .withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger(RedisContainer.class))
                         .withMdc("image", metadata.image())
-                        .withMdc("alias", metadata.networkAlias()))
-                .withNetworkAliases(metadata.networkAlias())
+                        .withMdc("alias", metadata.networkAliasOrDefault()))
+                .withNetworkAliases(metadata.networkAliasOrDefault())
                 .waitingFor(Wait.forListeningPort())
                 .withStartupTimeout(Duration.ofMinutes(5));
 
@@ -67,7 +67,7 @@ protected Optional<RedisMetadata> findMetadata(@NotNull ExtensionContext context
 
     @NotNull
     protected RedisConnection getConnectionForContainer(@NotNull RedisMetadata metadata, @NotNull RedisContainer container) {
-        final String alias = Optional.ofNullable(metadata.networkAlias())
+        final String alias = Optional.ofNullable(metadata.networkAliasOrDefault())
                 .filter(a -> !a.isBlank())
                 .or(() -> container.getNetworkAliases().stream()
                         .filter(a -> a.startsWith("redis"))

diff --git a/...java/io/goodforgod/testcontainers/extensions/jdbc/ExampleTestcontainersJdbcExtension.java b/...java/io/goodforgod/testcontainers/extensions/jdbc/ExampleTestcontainersJdbcExtension.java
@@ -50,8 +50,8 @@ protected PostgreSQLContainer<?> getContainerDefault(PostgresJdbcMetadata metada
                 .withPassword("postgres")
                 .withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger(PostgreSQLContainer.class))
                         .withMdc("image", metadata.image())
-                        .withMdc("alias", metadata.networkAlias()))
-                .withNetworkAliases(metadata.networkAlias());
+                        .withMdc("alias", metadata.networkAliasOrDefault()))
+                .withNetworkAliases(metadata.networkAliasOrDefault());
     }
 
     @NotNull

diff --git a/jdbc/src/test/java/io/goodforgod/testcontainers/extensions/jdbc/PostgresJdbcMetadata.java b/jdbc/src/test/java/io/goodforgod/testcontainers/extensions/jdbc/PostgresJdbcMetadata.java
@@ -10,7 +10,7 @@ final class PostgresJdbcMetadata extends JdbcMetadata {
     }
 
     @Override
-    protected @NotNull String networkAliasDefault() {
+    public @NotNull String networkAliasDefault() {
         return "postgres-" + System.currentTimeMillis();
     }
 }
diff --git a/kafka/README.md b/kafka/README.md
@@ -65,7 +65,7 @@ testRuntimeOnly "org.apache.kafka:kafka-clients:3.5.1"
 `@TestcontainersKafka` - allow **automatically start container** with specified image in different modes without the need to configure it.
 
 Available containers modes:
-- `PER_RUN` - start container one time per *test execution*. (Containers should have same image to be reused between test classes)
+- `PER_RUN` - start container one time per *test execution*. (Containers must have same `image` and `network` to be reused between test classes)
 - `PER_CLASS` - start new container each *test class*.
 - `PER_METHOD` - start new container each *test method*.
 

diff --git a/kafka/src/main/java/io/goodforgod/testcontainers/extensions/kafka/KafkaMetadata.java b/kafka/src/main/java/io/goodforgod/testcontainers/extensions/kafka/KafkaMetadata.java
@@ -19,7 +19,7 @@ final class KafkaMetadata extends AbstractContainerMetadata {
     }
 
     @Override
-    protected @NotNull String networkAliasDefault() {
+    public @NotNull String networkAliasDefault() {
         return "kafka-" + System.currentTimeMillis();
     }
 

diff --git a/...main/java/io/goodforgod/testcontainers/extensions/kafka/TestcontainersKafkaExtension.java b/...main/java/io/goodforgod/testcontainers/extensions/kafka/TestcontainersKafkaExtension.java
@@ -90,11 +90,11 @@ protected KafkaContainer getContainerDefault(KafkaMetadata metadata) {
         var container = new KafkaContainer(dockerImage)
                 .withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger(KafkaContainer.class))
                         .withMdc("image", metadata.image())
-                        .withMdc("alias", metadata.networkAlias()))
+                        .withMdc("alias", metadata.networkAliasOrDefault()))
                 .withEnv("KAFKA_CONFLUENT_SUPPORT_METRICS_ENABLE", "false")
                 .withEnv("AUTO_CREATE_TOPICS", "true")
                 .withEmbeddedZookeeper()
-                .withNetworkAliases(metadata.networkAlias())
+                .withNetworkAliases(metadata.networkAliasOrDefault())
                 .waitingFor(Wait.forListeningPort())
                 .withStartupTimeout(Duration.ofMinutes(5));
 
@@ -110,7 +110,7 @@ protected KafkaConnection getConnectionForContainer(KafkaMetadata metadata, Kafk
         final Properties properties = new Properties();
         properties.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, container.getBootstrapServers());
 
-        final Properties networkProperties = Optional.ofNullable(metadata.networkAlias())
+        final Properties networkProperties = Optional.ofNullable(metadata.networkAliasOrDefault())
                 .filter(a -> !a.isBlank())
                 .or(() -> (container.getNetworkAliases().isEmpty())
                         ? Optional.empty()

diff --git a/mariadb/README.md b/mariadb/README.md
@@ -62,7 +62,7 @@ testRuntimeOnly "org.mariadb.jdbc:mariadb-java-client:3.1.4"
 `@TestcontainersMariadb` - allow **automatically start container** with specified image in different modes without the need to configure it.
 
 Available containers modes:
-- `PER_RUN` - start container one time per *test execution*. (Containers should have same image to be reused between test classes)
+- `PER_RUN` - start container one time per *test execution*. (Containers must have same `image` and `network` to be reused between test classes)
 - `PER_CLASS` - start new container each *test class*.
 - `PER_METHOD` - start new container each *test method*.
 

diff --git a/mariadb/src/main/java/io/goodforgod/testcontainers/extensions/jdbc/MariadbMetadata.java b/mariadb/src/main/java/io/goodforgod/testcontainers/extensions/jdbc/MariadbMetadata.java
@@ -12,7 +12,7 @@ public MariadbMetadata(boolean network, String alias, String image, ContainerMod
     }
 
     @Override
-    protected @NotNull String networkAliasDefault() {
+    public @NotNull String networkAliasDefault() {
         return "mariadb-" + System.currentTimeMillis();
     }
 }
diff --git a/...ain/java/io/goodforgod/testcontainers/extensions/jdbc/TestcontainersMariadbExtension.java b/...ain/java/io/goodforgod/testcontainers/extensions/jdbc/TestcontainersMariadbExtension.java
@@ -55,8 +55,8 @@ protected MariaDBContainer<?> getContainerDefault(MariadbMetadata metadata) {
                 .withPassword("mariadb")
                 .withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger(MariaDBContainer.class))
                         .withMdc("image", metadata.image())
-                        .withMdc("alias", metadata.networkAlias()))
-                .withNetworkAliases(metadata.networkAlias())
+                        .withMdc("alias", metadata.networkAliasOrDefault()))
+                .withNetworkAliases(metadata.networkAliasOrDefault())
                 .waitingFor(Wait.forListeningPort())
                 .withStartupTimeout(Duration.ofMinutes(5));
 
@@ -80,7 +80,7 @@ protected Optional<MariadbMetadata> findMetadata(@NotNull ExtensionContext conte
 
     @NotNull
     protected JdbcConnection getConnectionForContainer(MariadbMetadata metadata, @NotNull MariaDBContainer<?> container) {
-        final String alias = Optional.ofNullable(metadata.networkAlias())
+        final String alias = Optional.ofNullable(metadata.networkAliasOrDefault())
                 .or(() -> (container.getNetworkAliases().isEmpty())
                         ? Optional.empty()
                         : Optional.of(container.getNetworkAliases().get(container.getNetworkAliases().size() - 1)))

diff --git a/mysql/README.md b/mysql/README.md
@@ -62,7 +62,7 @@ testRuntimeOnly "mysql:mysql-connector-java:8.0.33"
 `@TestcontainersMysql` - allow **automatically start container** with specified image in different modes without the need to configure it.
 
 Available containers modes:
-- `PER_RUN` - start container one time per *test execution*. (Containers should have same image to be reused between test classes)
+- `PER_RUN` - start container one time per *test execution*. (Containers must have same `image` and `network` to be reused between test classes)
 - `PER_CLASS` - start new container each *test class*.
 - `PER_METHOD` - start new container each *test method*.
 

diff --git a/mysql/src/main/java/io/goodforgod/testcontainers/extensions/jdbc/MysqlMetadata.java b/mysql/src/main/java/io/goodforgod/testcontainers/extensions/jdbc/MysqlMetadata.java
@@ -12,7 +12,7 @@ public MysqlMetadata(boolean network, String alias, String image, ContainerMode
     }
 
     @Override
-    protected @NotNull String networkAliasDefault() {
+    public @NotNull String networkAliasDefault() {
         return "mysql-" + System.currentTimeMillis();
     }
 }
diff --git a/.../main/java/io/goodforgod/testcontainers/extensions/jdbc/TestcontainersMysqlExtension.java b/.../main/java/io/goodforgod/testcontainers/extensions/jdbc/TestcontainersMysqlExtension.java
@@ -54,8 +54,8 @@ protected MySQLContainer<?> getContainerDefault(MysqlMetadata metadata) {
                 .withPassword("mysql")
                 .withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger(MySQLContainer.class))
                         .withMdc("image", metadata.image())
-                        .withMdc("alias", metadata.networkAlias()))
-                .withNetworkAliases(metadata.networkAlias())
+                        .withMdc("alias", metadata.networkAliasOrDefault()))
+                .withNetworkAliases(metadata.networkAliasOrDefault())
                 .waitingFor(Wait.forListeningPort())
                 .withStartupTimeout(Duration.ofMinutes(5));
 
@@ -79,7 +79,7 @@ protected Optional<MysqlMetadata> findMetadata(@NotNull ExtensionContext context
 
     @NotNull
     protected JdbcConnection getConnectionForContainer(MysqlMetadata metadata, @NotNull MySQLContainer<?> container) {
-        final String alias = Optional.ofNullable(metadata.networkAlias())
+        final String alias = Optional.ofNullable(metadata.networkAliasOrDefault())
                 .or(() -> (container.getNetworkAliases().isEmpty())
                         ? Optional.empty()
                         : Optional.of(container.getNetworkAliases().get(container.getNetworkAliases().size() - 1)))

diff --git a/oracle/README.md b/oracle/README.md
@@ -65,7 +65,7 @@ Extension tested against image `gvenzl/oracle-xe:18.4.0-faststart` and driver `c
 `@TestcontainersOracle` - allow **automatically start container** with specified image in different modes without the need to configure it.
 
 Available containers modes:
-- `PER_RUN` - start container one time per *test execution*. (Containers should have same image to be reused between test classes)
+- `PER_RUN` - start container one time per *test execution*. (Containers must have same `image` and `network` to be reused between test classes)
 - `PER_CLASS` - start new container each *test class*.
 - `PER_METHOD` - start new container each *test method*.
 

diff --git a/oracle/src/main/java/io/goodforgod/testcontainers/extensions/jdbc/OracleMetadata.java b/oracle/src/main/java/io/goodforgod/testcontainers/extensions/jdbc/OracleMetadata.java
@@ -12,7 +12,7 @@ public OracleMetadata(boolean network, String alias, String image, ContainerMode
     }
 
     @Override
-    protected @NotNull String networkAliasDefault() {
+    public @NotNull String networkAliasDefault() {
         return "oracle-" + System.currentTimeMillis();
     }
 }
diff --git a/...main/java/io/goodforgod/testcontainers/extensions/jdbc/TestcontainersOracleExtension.java b/...main/java/io/goodforgod/testcontainers/extensions/jdbc/TestcontainersOracleExtension.java
@@ -51,8 +51,8 @@ protected OracleContainer getContainerDefault(OracleMetadata metadata) {
                 .withDatabaseName("oracle")
                 .withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger(OracleContainer.class))
                         .withMdc("image", metadata.image())
-                        .withMdc("alias", metadata.networkAlias()))
-                .withNetworkAliases(metadata.networkAlias())
+                        .withMdc("alias", metadata.networkAliasOrDefault()))
+                .withNetworkAliases(metadata.networkAliasOrDefault())
                 .withStartupTimeout(Duration.ofMinutes(5));
 
         if (metadata.networkShared()) {
@@ -75,7 +75,7 @@ protected Optional<OracleMetadata> findMetadata(@NotNull ExtensionContext contex
 
     @NotNull
     protected JdbcConnection getConnectionForContainer(OracleMetadata metadata, @NotNull OracleContainer container) {
-        final String alias = Optional.ofNullable(metadata.networkAlias())
+        final String alias = Optional.ofNullable(metadata.networkAliasOrDefault())
                 .or(() -> (container.getNetworkAliases().isEmpty())
                         ? Optional.empty()
                         : Optional.of(container.getNetworkAliases().get(container.getNetworkAliases().size() - 1)))

diff --git a/postgres/README.md b/postgres/README.md
@@ -62,7 +62,7 @@ testRuntimeOnly "org.postgresql:postgresql:42.6.0"
 `@TestcontainersPostgres` - allow **automatically start container** with specified image in different modes without the need to configure it.
 
 Available containers modes:
-- `PER_RUN` - start container one time per *test execution*. (Containers should have same image to be reused between test classes)
+- `PER_RUN` - start container one time per *test execution*. (Containers must have same `image` and `network` to be reused between test classes)
 - `PER_CLASS` - start new container each *test class*.
 - `PER_METHOD` - start new container each *test method*.
 

diff --git a/postgres/src/main/java/io/goodforgod/testcontainers/extensions/jdbc/PostgresMetadata.java b/postgres/src/main/java/io/goodforgod/testcontainers/extensions/jdbc/PostgresMetadata.java
@@ -12,7 +12,7 @@ public PostgresMetadata(boolean network, String alias, String image, ContainerMo
     }
 
     @Override
-    protected @NotNull String networkAliasDefault() {
+    public @NotNull String networkAliasDefault() {
         return "postgres-" + System.currentTimeMillis();
     }
 }