Polish

modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseContainer.java

@@ -23,9 +23,11 @@ public class ClickHouseContainer extends JdbcDatabaseContainer<ClickHouseContain
 
     private static final String NAME = "clickhouse";
 
-    private static final DockerImageName CLICKHOUSE_IMAGE_NAME = DockerImageName.parse("clickhouse/clickhouse-server");
+    static final String CLICKHOUSE_CLICKHOUSE_SERVER = "clickhouse/clickhouse-server";
 
-    public static final Integer HTTP_PORT = 8123;
+    private static final DockerImageName CLICKHOUSE_IMAGE_NAME = DockerImageName.parse(CLICKHOUSE_CLICKHOUSE_SERVER);
+
+    static final Integer HTTP_PORT = 8123;
 
     static final Integer NATIVE_PORT = 9000;
 
@@ -35,11 +37,15 @@ public class ClickHouseContainer extends JdbcDatabaseContainer<ClickHouseContain
 
     private static final String TEST_QUERY = "SELECT 1";
 
+    static final String DEFAULT_USER = "default";
+
+    static final String DEFAULT_PASSWORD = "";
+
     private String databaseName = "default";
 
-    private String username = "default";
+    private String username = DEFAULT_USER;
 
-    private String password = "";
+    private String password = DEFAULT_PASSWORD;
 
     public ClickHouseContainer(String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));

modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseR2DBCDatabaseContainer.java

@@ -1,7 +1,6 @@
 package org.testcontainers.clickhouse;
 
 import io.r2dbc.spi.ConnectionFactoryOptions;
-import org.testcontainers.containers.ClickHouseR2DBCDatabaseContainerProvider;
 import org.testcontainers.r2dbc.R2DBCDatabaseContainer;
 
 /**

modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseR2DBCDatabaseContainerProvider.java → modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseR2DBCDatabaseContainerProvider.java

@@ -1,17 +1,16 @@
-package org.testcontainers.containers;
+package org.testcontainers.clickhouse;
 
 import com.clickhouse.r2dbc.connection.ClickHouseConnectionFactoryProvider;
+import io.r2dbc.spi.ConnectionFactoryMetadata;
 import io.r2dbc.spi.ConnectionFactoryOptions;
-import org.testcontainers.clickhouse.ClickHouseContainer;
-import org.testcontainers.clickhouse.ClickHouseR2DBCDatabaseContainer;
 import org.testcontainers.r2dbc.R2DBCDatabaseContainer;
 import org.testcontainers.r2dbc.R2DBCDatabaseContainerProvider;
 
-public class ClickHouseR2DBCDatabaseContainerProvider implements R2DBCDatabaseContainerProvider {
+import javax.annotation.Nullable;
 
-    public static final String DRIVER = ClickHouseConnectionFactoryProvider.CLICKHOUSE_DRIVER;
+public class ClickHouseR2DBCDatabaseContainerProvider implements R2DBCDatabaseContainerProvider {
 
-    private static final String IMAGE_NAME = "clickhouse/clickhouse-server";
+    static final String DRIVER = ClickHouseConnectionFactoryProvider.CLICKHOUSE_DRIVER;
 
     @Override
     public boolean supports(ConnectionFactoryOptions options) {
@@ -20,7 +19,8 @@ public boolean supports(ConnectionFactoryOptions options) {
 
     @Override
     public R2DBCDatabaseContainer createContainer(ConnectionFactoryOptions options) {
-        String image = IMAGE_NAME + ":" + options.getRequiredValue(IMAGE_TAG_OPTION);
+        String image =
+            ClickHouseContainer.CLICKHOUSE_CLICKHOUSE_SERVER + ":" + options.getRequiredValue(IMAGE_TAG_OPTION);
         ClickHouseContainer container = new ClickHouseContainer(image)
             .withDatabaseName((String) options.getRequiredValue(ConnectionFactoryOptions.DATABASE));
 
@@ -29,4 +29,17 @@ public R2DBCDatabaseContainer createContainer(ConnectionFactoryOptions options)
         }
         return new ClickHouseR2DBCDatabaseContainer(container);
     }
+
+    @Nullable
+    @Override
+    public ConnectionFactoryMetadata getMetadata(ConnectionFactoryOptions options) {
+        ConnectionFactoryOptions.Builder builder = options.mutate();
+        if (!options.hasOption(ConnectionFactoryOptions.USER)) {
+            builder.option(ConnectionFactoryOptions.USER, ClickHouseContainer.DEFAULT_USER);
+        }
+        if (!options.hasOption(ConnectionFactoryOptions.PASSWORD)) {
+            builder.option(ConnectionFactoryOptions.PASSWORD, ClickHouseContainer.DEFAULT_PASSWORD);
+        }
+        return R2DBCDatabaseContainerProvider.super.getMetadata(builder.build());
+    }
 }

modules/clickhouse/src/main/resources/META-INF/services/org.testcontainers.r2dbc.R2DBCDatabaseContainerProvider

@@ -1 +1 @@
-org.testcontainers.containers.ClickHouseR2DBCDatabaseContainerProvider
+org.testcontainers.clickhouse.ClickHouseR2DBCDatabaseContainerProvider

modules/clickhouse/src/test/java/org/testcontainers/clickhouse/ClickHouseR2DBCDatabaseContainerTest.java

@@ -7,13 +7,7 @@ public class ClickHouseR2DBCDatabaseContainerTest extends AbstractR2DBCDatabaseC
 
     @Override
     protected ConnectionFactoryOptions getOptions(ClickHouseContainer container) {
-        // spotless:off
-        // get_options {
-        ConnectionFactoryOptions options = ClickHouseR2DBCDatabaseContainer.getOptions(
-            container
-        );
-        // }
-        // spotless:on
+        ConnectionFactoryOptions options = ClickHouseR2DBCDatabaseContainer.getOptions(container);
 
         return options;
     }
@@ -25,10 +19,6 @@ protected String createR2DBCUrl() {
 
     @Override
     protected ClickHouseContainer createContainer() {
-        return new ClickHouseContainer("clickhouse/clickhouse-server:21.9.2-alpine")
-            .withExposedPorts(ClickHouseContainer.HTTP_PORT, ClickHouseContainer.NATIVE_PORT)
-            .withUsername("test")
-            .withPassword("test")
-            .withDatabaseName("db");
+        return new ClickHouseContainer("clickhouse/clickhouse-server:21.9.2-alpine");
     }
 }