[0.6.2-SNAPSHOT]

Cleanup

cassandra/src/main/java/io/goodforgod/testcontainers/extensions/cassandra/CassandraConnection.java

@@ -3,12 +3,13 @@
 import com.datastax.oss.driver.api.core.CqlSession;
 import com.datastax.oss.driver.api.core.cql.ResultSet;
 import com.datastax.oss.driver.api.core.cql.Row;
-import java.util.List;
-import java.util.Optional;
 import org.intellij.lang.annotations.Language;
 import org.jetbrains.annotations.NotNull;
 import org.testcontainers.containers.CassandraContainer;
 
+import java.util.List;
+import java.util.Optional;
+
 /**
  * Describes active Cassandra connection of currently running {@link CassandraContainer}
  */

cassandra/src/main/java/io/goodforgod/testcontainers/extensions/cassandra/CassandraConnectionImpl.java

@@ -7,18 +7,19 @@
 import com.datastax.oss.driver.api.core.cql.Row;
 import com.datastax.oss.driver.internal.core.config.typesafe.DefaultProgrammaticDriverConfigLoaderBuilder;
 import com.datastax.oss.driver.internal.core.type.codec.registry.DefaultCodecRegistry;
-import java.net.InetSocketAddress;
-import java.nio.charset.StandardCharsets;
-import java.time.Duration;
-import java.util.*;
-import java.util.stream.Collectors;
 import org.intellij.lang.annotations.Language;
 import org.jetbrains.annotations.ApiStatus.Internal;
 import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.Assertions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.net.InetSocketAddress;
+import java.nio.charset.StandardCharsets;
+import java.time.Duration;
+import java.util.*;
+import java.util.stream.Collectors;
+
 @Internal
 final class CassandraConnectionImpl implements CassandraConnection {
 

cassandra/src/main/java/io/goodforgod/testcontainers/extensions/cassandra/ContainerCassandra.java

@@ -1,8 +1,9 @@
 package io.goodforgod.testcontainers.extensions.cassandra;
 
-import java.lang.annotation.*;
 import org.testcontainers.containers.CassandraContainer;
 
+import java.lang.annotation.*;
+
 /**
  * Indicates that annotated field containers {@link CassandraContainer} instance
  * that should be used by {@link TestcontainersCassandra} rather than creating default container

cassandra/src/main/java/io/goodforgod/testcontainers/extensions/cassandra/TestcontainersCassandra.java

@@ -2,11 +2,12 @@
 
 import io.goodforgod.testcontainers.extensions.ContainerMode;
 import io.goodforgod.testcontainers.extensions.Network;
-import java.lang.annotation.*;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.testcontainers.containers.CassandraContainer;
 
+import java.lang.annotation.*;
+
 /**
  * Extension that is running {@link CassandraContainer} for tests in different modes with database
  * schema migration support between test executions

cassandra/src/main/java/io/goodforgod/testcontainers/extensions/cassandra/TestcontainersCassandraExtension.java

@@ -1,15 +1,6 @@
 package io.goodforgod.testcontainers.extensions.cassandra;
 
 import io.goodforgod.testcontainers.extensions.AbstractTestcontainersExtension;
-import java.io.File;
-import java.io.IOException;
-import java.lang.annotation.Annotation;
-import java.net.URL;
-import java.nio.file.Files;
-import java.time.Duration;
-import java.util.*;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 import org.jetbrains.annotations.ApiStatus.Internal;
 import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.extension.ExtensionContext;
@@ -20,6 +11,16 @@
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.utility.DockerImageName;
 
+import java.io.File;
+import java.io.IOException;
+import java.lang.annotation.Annotation;
+import java.net.URL;
+import java.nio.file.Files;
+import java.time.Duration;
+import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
 @Internal
 class TestcontainersCassandraExtension extends
         AbstractTestcontainersExtension<CassandraConnection, CassandraContainer<?>, CassandraMetadata> {

cassandra/src/test/java/io/goodforgod/testcontainers/extensions/cassandra/CassandraConnectionAssertsTests.java

@@ -1,11 +1,11 @@
 package io.goodforgod.testcontainers.extensions.cassandra;
 
-import static org.junit.jupiter.api.Assertions.*;
-
 import io.goodforgod.testcontainers.extensions.ContainerMode;
 import org.junit.jupiter.api.Test;
 import org.opentest4j.AssertionFailedError;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 @TestcontainersCassandra(mode = ContainerMode.PER_CLASS,
         image = "cassandra:4.1",
         migration = @Migration(

cassandra/src/test/java/io/goodforgod/testcontainers/extensions/cassandra/CassandraSimplePerClassMigrationTests.java

@@ -1,9 +1,12 @@
 package io.goodforgod.testcontainers.extensions.cassandra;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 import io.goodforgod.testcontainers.extensions.ContainerMode;
-import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 @TestcontainersCassandra(mode = ContainerMode.PER_CLASS,
         image = "cassandra:4.1",

cassandra/src/test/java/io/goodforgod/testcontainers/extensions/cassandra/CassandraSimplePerMethodMigrationTests.java

@@ -1,9 +1,12 @@
 package io.goodforgod.testcontainers.extensions.cassandra;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 import io.goodforgod.testcontainers.extensions.ContainerMode;
-import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @TestcontainersCassandra(mode = ContainerMode.PER_CLASS,
         image = "cassandra:4.1",

cockroachdb/src/main/java/io/goodforgod/testcontainers/extensions/jdbc/ContainerCockroachdb.java

@@ -1,8 +1,9 @@
 package io.goodforgod.testcontainers.extensions.jdbc;
 
-import java.lang.annotation.*;
 import org.testcontainers.containers.CockroachContainer;
 
+import java.lang.annotation.*;
+
 /**
  * Indicates that annotated field containers {@link CockroachContainer} instance
  * that should be used by {@link TestcontainersCockroachdb} rather than creating default container

cockroachdb/src/main/java/io/goodforgod/testcontainers/extensions/jdbc/TestcontainersCockroachdb.java

@@ -2,11 +2,12 @@
 
 import io.goodforgod.testcontainers.extensions.ContainerMode;
 import io.goodforgod.testcontainers.extensions.Network;
-import java.lang.annotation.*;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.testcontainers.containers.CockroachContainer;
 
+import java.lang.annotation.*;
+
 /**
  * Extension that is running {@link CockroachContainer} for tests in different modes with database
  * schema migration support between test executions

cockroachdb/src/main/java/io/goodforgod/testcontainers/extensions/jdbc/TestcontainersCockroachdbExtension.java

@@ -1,10 +1,5 @@
 package io.goodforgod.testcontainers.extensions.jdbc;
 
-import java.lang.annotation.Annotation;
-import java.time.Duration;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
 import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.slf4j.LoggerFactory;
@@ -13,6 +8,12 @@
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.utility.DockerImageName;
 
+import java.lang.annotation.Annotation;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
 final class TestcontainersCockroachdbExtension extends
         AbstractTestcontainersJdbcExtension<CockroachContainer, CockroachMetadata> {
 

cockroachdb/src/test/java/io/goodforgod/testcontainers/extensions/jdbc/CockroachdbFlywayPerMethodMigrationTests.java

@@ -1,9 +1,12 @@
 package io.goodforgod.testcontainers.extensions.jdbc;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 import io.goodforgod.testcontainers.extensions.ContainerMode;
-import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @TestcontainersCockroachdb(mode = ContainerMode.PER_CLASS,
         image = "cockroachdb/cockroach:latest-v23.1",

cockroachdb/src/test/java/io/goodforgod/testcontainers/extensions/jdbc/CockroachdbLiquibaseMigrationPerMethodTests.java

@@ -1,9 +1,12 @@
 package io.goodforgod.testcontainers.extensions.jdbc;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 import io.goodforgod.testcontainers.extensions.ContainerMode;
-import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @TestcontainersCockroachdb(mode = ContainerMode.PER_CLASS,
         image = "cockroachdb/cockroach:latest-v23.1",

common/src/main/java/io/goodforgod/testcontainers/extensions/AbstractContainerMetadata.java

@@ -1,10 +1,11 @@
 package io.goodforgod.testcontainers.extensions;
 
-import java.util.Optional;
 import org.jetbrains.annotations.ApiStatus.Internal;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Optional;
+
 @Internal
 public abstract class AbstractContainerMetadata implements ContainerMetadata {
 

common/src/test/java/io/goodforgod/testcontainers/extensions/ContainerFromAnnotationTests.java

@@ -1,14 +1,14 @@
 package io.goodforgod.testcontainers.extensions;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 import io.goodforgod.testcontainers.extensions.example.*;
 import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 @TestcontainersRedis(mode = ContainerMode.PER_METHOD)
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 class ContainerFromAnnotationTests {

common/src/test/java/io/goodforgod/testcontainers/extensions/ContainerPerClassAbstractTests.java

@@ -1,7 +1,5 @@
 package io.goodforgod.testcontainers.extensions;
 
-import static org.junit.jupiter.api.Assertions.*;
-
 import io.goodforgod.testcontainers.extensions.example.ContainerRedisConnection;
 import io.goodforgod.testcontainers.extensions.example.RedisConnection;
 import io.goodforgod.testcontainers.extensions.example.TestcontainersRedis;
@@ -10,6 +8,8 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 @TestcontainersRedis(mode = ContainerMode.PER_CLASS, image = "redis:7.2-alpine")
 abstract class ContainerPerClassAbstractTests {
 

common/src/test/java/io/goodforgod/testcontainers/extensions/ContainerPerClassConstructorTests.java

@@ -1,12 +1,12 @@
 package io.goodforgod.testcontainers.extensions;
 
-import static org.junit.jupiter.api.Assertions.*;
-
 import io.goodforgod.testcontainers.extensions.example.ContainerRedisConnection;
 import io.goodforgod.testcontainers.extensions.example.RedisConnection;
 import io.goodforgod.testcontainers.extensions.example.TestcontainersRedis;
 import org.junit.jupiter.api.*;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 @TestcontainersRedis(mode = ContainerMode.PER_CLASS,
         image = "redis:7.2-alpine",
         network = @Network(shared = false, alias = "my_alias"))

common/src/test/java/io/goodforgod/testcontainers/extensions/ContainerPerClassInstanceClassTests.java

@@ -1,12 +1,12 @@
 package io.goodforgod.testcontainers.extensions;
 
-import static org.junit.jupiter.api.Assertions.*;
-
 import io.goodforgod.testcontainers.extensions.example.ContainerRedisConnection;
 import io.goodforgod.testcontainers.extensions.example.RedisConnection;
 import io.goodforgod.testcontainers.extensions.example.TestcontainersRedis;
 import org.junit.jupiter.api.*;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 @TestcontainersRedis(mode = ContainerMode.PER_CLASS,
         image = "${MY_IMAGE_ENV}",
         network = @Network(shared = false, alias = "${MY_ALIAS_ENV}"))

common/src/test/java/io/goodforgod/testcontainers/extensions/ContainerPerClassInstanceMethodTests.java

@@ -1,12 +1,12 @@
 package io.goodforgod.testcontainers.extensions;
 
-import static org.junit.jupiter.api.Assertions.*;
-
 import io.goodforgod.testcontainers.extensions.example.ContainerRedisConnection;
 import io.goodforgod.testcontainers.extensions.example.RedisConnection;
 import io.goodforgod.testcontainers.extensions.example.TestcontainersRedis;
 import org.junit.jupiter.api.*;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 @TestcontainersRedis(mode = ContainerMode.PER_CLASS,
         image = "${MY_IMAGE_ENV_EMPTY|redis:7.2-alpine}",
         network = @Network(shared = false, alias = "${MY_ALIAS_ENV_EMPTY|my_default_alias}"))

common/src/test/java/io/goodforgod/testcontainers/extensions/ContainerPerMethodConstructorTests.java

@@ -1,12 +1,12 @@
 package io.goodforgod.testcontainers.extensions;
 
-import static org.junit.jupiter.api.Assertions.*;
-
 import io.goodforgod.testcontainers.extensions.example.ContainerRedisConnection;
 import io.goodforgod.testcontainers.extensions.example.RedisConnection;
 import io.goodforgod.testcontainers.extensions.example.TestcontainersRedis;
 import org.junit.jupiter.api.*;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 @TestcontainersRedis(mode = ContainerMode.PER_METHOD, image = "redis:7.2-alpine")
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 @TestInstance(TestInstance.Lifecycle.PER_METHOD)

common/src/test/java/io/goodforgod/testcontainers/extensions/ContainerPerMethodInstanceClassTests.java

@@ -1,12 +1,12 @@
 package io.goodforgod.testcontainers.extensions;
 
-import static org.junit.jupiter.api.Assertions.*;
-
 import io.goodforgod.testcontainers.extensions.example.ContainerRedisConnection;
 import io.goodforgod.testcontainers.extensions.example.RedisConnection;
 import io.goodforgod.testcontainers.extensions.example.TestcontainersRedis;
 import org.junit.jupiter.api.*;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 @TestcontainersRedis(mode = ContainerMode.PER_METHOD, image = "redis:7.2-alpine")
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)

common/src/test/java/io/goodforgod/testcontainers/extensions/ContainerPerMethodInstanceMethodTests.java

@@ -1,12 +1,12 @@
 package io.goodforgod.testcontainers.extensions;
 
-import static org.junit.jupiter.api.Assertions.*;
-
 import io.goodforgod.testcontainers.extensions.example.ContainerRedisConnection;
 import io.goodforgod.testcontainers.extensions.example.RedisConnection;
 import io.goodforgod.testcontainers.extensions.example.TestcontainersRedis;
 import org.junit.jupiter.api.*;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 @TestcontainersRedis(mode = ContainerMode.PER_METHOD, image = "redis:7.2-alpine")
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 @TestInstance(TestInstance.Lifecycle.PER_METHOD)

common/src/test/java/io/goodforgod/testcontainers/extensions/ContainerPerRunFirstTests.java

@@ -1,8 +1,5 @@
 package io.goodforgod.testcontainers.extensions;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
 import io.goodforgod.testcontainers.extensions.example.ContainerRedisConnection;
 import io.goodforgod.testcontainers.extensions.example.RedisConnection;
 import io.goodforgod.testcontainers.extensions.example.TestcontainersRedis;
@@ -11,6 +8,9 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 @TestcontainersRedis(mode = ContainerMode.PER_RUN, image = "redis:7.2-alpine")
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 class ContainerPerRunFirstTests {