Merge pull request #25 from GoodforGod/dev

[0.12.1]

Author: GoodforGod

.github/workflows/publish-release.yml

@@ -1,4 +1,4 @@
-name: CI Master
+name: Release
 
 on:
   release:

.github/workflows/publish-snapshot.yml

@@ -1,4 +1,4 @@
-name: CI Dev
+name: Snapshot
 
 on:
   push:

README.md

@@ -30,7 +30,6 @@ Makes testing & asserts with Testcontainers even easier.
 Here is an example of [Kafka Extension](kafka) where KafkaContainer is started in `PER_RUN` mode with topic reset per method:
 
 ```java
-
 @TestcontainersKafka(mode = ContainerMode.PER_RUN,
         topics = @Topics(value = "my-topic-name", reset = Topics.Mode.PER_METHOD))
 class ExampleTests {
@@ -50,7 +49,6 @@ class ExampleTests {
 Here is an example of [Postgres Extension](postgres) where PostgresContainer is started `PER_RUN` mode and migrations are applied per method:
 
 ```java
-
 @TestcontainersPostgreSQL(mode = ContainerMode.PER_RUN,
         migration = @Migration(
                 engine = Migration.Engines.FLYWAY,

cassandra/README.md

@@ -18,15 +18,15 @@ Features:
 
 **Gradle**
 ```groovy
-testImplementation "io.goodforgod:testcontainers-extensions-cassandra:0.12.0"
+testImplementation "io.goodforgod:testcontainers-extensions-cassandra:0.12.1"
 ```
 
 **Maven**
 ```xml
 <dependency>
     <groupId>io.goodforgod</groupId>
     <artifactId>testcontainers-extensions-cassandra</artifactId>
-    <version>0.12.0</version>
+    <version>0.12.1</version>
     <scope>test</scope>
 </dependency>
 ```

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

@@ -1,6 +1,5 @@
 package io.goodforgod.testcontainers.extensions.cassandra;
 
-import com.datastax.oss.driver.api.core.CqlIdentifier;
 import com.datastax.oss.driver.api.core.CqlSession;
 import com.datastax.oss.driver.api.core.CqlSessionBuilder;
 import com.datastax.oss.driver.api.core.config.DriverConfigLoader;
@@ -176,15 +175,13 @@ private CqlSession openConnection() {
                 .withCodecRegistry(new DefaultCodecRegistry("testing-codec-registry"))
                 .withConfigLoader(configLoader)
                 .withLocalDatacenter(params().datacenter())
-                .addContactPoint(new InetSocketAddress(params().host(), params().port()));
+                .addContactPoint(InetSocketAddress.createUnresolved(params().host(), params().port()));
 
         if (params().username() != null && params().password() != null) {
             sessionBuilder.withAuthCredentials(params().username(), params().password());
         }
 
-        CqlSession session = sessionBuilder.build();
-        createKeyspace(params().keyspace(), session);
-        return session;
+        return sessionWithKeyspace(params().keyspace(), sessionBuilder);
     }
 
     @Override
@@ -208,13 +205,24 @@ public void createKeyspace(@NotNull String keyspaceName) {
         createKeyspace(keyspaceName, getConnection());
     }
 
+    private CqlSession sessionWithKeyspace(@NotNull String keyspaceName, CqlSessionBuilder sessionBuilder) {
+        try (var session = sessionBuilder.build()) {
+            String cql = "CREATE KEYSPACE IF NOT EXISTS " + keyspaceName
+                    + " WITH replication = {'class': 'SimpleStrategy', 'replication_factor': 1};";
+            var boundStatement = session.prepare(cql).bind().setTimeout(TIMEOUT);
+            session.execute(boundStatement).wasApplied();
+            return sessionBuilder.withKeyspace(keyspaceName).build();
+        } catch (Exception e) {
+            throw new CassandraConnectionException(e);
+        }
+    }
+
     private void createKeyspace(@NotNull String keyspaceName, CqlSession session) {
         try {
             String cql = "CREATE KEYSPACE IF NOT EXISTS " + keyspaceName
                     + " WITH replication = {'class': 'SimpleStrategy', 'replication_factor': 1};";
             var boundStatement = session.prepare(cql).bind().setTimeout(TIMEOUT);
             session.execute(boundStatement).wasApplied();
-            session.execute("USE " + CqlIdentifier.fromCql(keyspaceName));
         } catch (Exception e) {
             throw new CassandraConnectionException(e);
         }

clickhouse/README.md

@@ -18,15 +18,15 @@ Features:
 
 **Gradle**
 ```groovy
-testImplementation "io.goodforgod:testcontainers-extensions-clickhouse:0.12.0"
+testImplementation "io.goodforgod:testcontainers-extensions-clickhouse:0.12.1"
 ```
 
 **Maven**
 ```xml
 <dependency>
     <groupId>io.goodforgod</groupId>
     <artifactId>testcontainers-extensions-clickhouse</artifactId>
-    <version>0.12.0</version>
+    <version>0.12.1</version>
     <scope>test</scope>
 </dependency>
 ```
@@ -39,6 +39,7 @@ don't forget to add:
 **Gradle**
 ```groovy
 testRuntimeOnly "com.clickhouse:clickhouse-jdbc:0.7.0"
+testRuntimeOnly "com.clickhouse:clickhouse-http-client:0.7.0"
 ```
 
 **Maven**
@@ -49,6 +50,12 @@ testRuntimeOnly "com.clickhouse:clickhouse-jdbc:0.7.0"
     <version>0.7.0</version>
     <scope>test</scope>
 </dependency>
+<dependency>
+    <groupId>com.clickhouse</groupId>
+    <artifactId>:clickhouse-http-client</artifactId>
+    <version>0.7.0</version>
+    <scope>test</scope>
+</dependency>
 ```
 
 ## Content
@@ -277,7 +284,7 @@ or use combination of `EXTERNAL_TEST_CLICKHOUSE_HOST` & `EXTERNAL_TEST_CLICKHOUS
 Annotation parameters:
 - `engine` - to use for migration.
 - `apply` - parameter configures migration mode.
-- `drop` - configures when to reset/drop/clear database.
+- `drop` - configures when to reset/drop/clear database. (Liquibase doesn't support `dropAll` command, so database is cleaned with `TRUNCATE DATABASE`)
 - `locations` - configures locations where migrations are placed.
 
 Available migration engines:

clickhouse/src/main/java/io/goodforgod/testcontainers/extensions/jdbc/TestcontainersClickhouse.java

@@ -17,7 +17,7 @@
 @Documented
 @Target({ ElementType.TYPE })
 @Retention(RetentionPolicy.RUNTIME)
-@interface TestcontainersClickhouse {
+public @interface TestcontainersClickhouse {
 
     /**
      * @return Clickhouse image

cockroachdb/README.md

@@ -18,15 +18,15 @@ Features:
 
 **Gradle**
 ```groovy
-testImplementation "io.goodforgod:testcontainers-extensions-cockroachdb:0.12.0"
+testImplementation "io.goodforgod:testcontainers-extensions-cockroachdb:0.12.1"
 ```
 
 **Maven**
 ```xml
 <dependency>
     <groupId>io.goodforgod</groupId>
     <artifactId>testcontainers-extensions-cockroachdb</artifactId>
-    <version>0.12.0</version>
+    <version>0.12.1</version>
     <scope>test</scope>
 </dependency>
 ```

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

@@ -17,7 +17,7 @@
 @Documented
 @Target({ ElementType.TYPE })
 @Retention(RetentionPolicy.RUNTIME)
-@interface TestcontainersCockroach {
+public @interface TestcontainersCockroach {
 
     /**
      * @return Cockroachdb image

gradle.properties

@@ -1,6 +1,6 @@
 groupId=io.goodforgod
 artifactRootId=testcontainers-extensions
-artifactVersion=0.12.0-SNAPSHOT
+artifactVersion=0.12.1-SNAPSHOT
 
 
 ##### GRADLE #####