some cleanup

Author: lizhou1111

modules/timeplus/build.gradle

@@ -5,6 +5,6 @@ dependencies {
     api project(':jdbc')
 
     testImplementation project(':jdbc-test')
-    testRuntimeOnly 'com.timeplus:proton-jdbc:0.6.0'
+    testRuntimeOnly 'com.timeplus:timeplus-native-jdbc:2.0.1'
     testImplementation 'org.assertj:assertj-core:3.25.3'
 }

modules/timeplus/src/main/java/org/testcontainers/containers/TimeplusContainer.java

@@ -13,11 +13,13 @@
  */
 public class TimeplusContainer extends JdbcDatabaseContainer<TimeplusContainer> {
 
-    private static final String NAME = "timeplus";
+    static final String NAME = "timeplus";
+
+    static final String DOCKER_IMAGE_NAME = "timeplus/timeplusd";
 
     private static final DockerImageName TIMEPLUS_IMAGE_NAME = DockerImageName.parse("timeplus/timeplusd:2.3.3");
 
-    private static final Integer HTTP_PORT = 3128;
+    private static final Integer HTTP_PORT = 3218;
 
     private static final Integer NATIVE_PORT = 8463;
 
@@ -29,25 +31,21 @@ public class TimeplusContainer extends JdbcDatabaseContainer<TimeplusContainer>
 
     private String databaseName = "default";
 
-    private String username = "proton";
+    private String username = "default";
 
-    private String password = "proton@t+";
+    private String password = "";
 
     public TimeplusContainer(String dockerImageName) {
         this(DockerImageName.parse(dockerImageName));
     }
 
     public TimeplusContainer(final DockerImageName dockerImageName) {
         super(dockerImageName);
-        dockerImageName.assertCompatibleWith(TIMEPLUS_IMAGE_NAME);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
 
         addExposedPorts(HTTP_PORT, NATIVE_PORT);
         this.waitStrategy =
-            Wait
-                .forHttp("/")
-                .forStatusCode(200)
-                .forResponsePredicate("Ok."::equals)
-                .withStartupTimeout(Duration.ofMinutes(1));
+            Wait.forHttp("/timeplusd/v1/ping").forStatusCode(200).withStartupTimeout(Duration.ofMinutes(1));
     }
 
     @Override
@@ -73,7 +71,7 @@ public String getJdbcUrl() {
             JDBC_URL_PREFIX +
             getHost() +
             ":" +
-            getMappedPort(HTTP_PORT) +
+            getMappedPort(NATIVE_PORT) +
             "/" +
             this.databaseName +
             constructUrlParameters("?", "&")

modules/timeplus/src/main/java/org/testcontainers/containers/TimeplusProvider.java

@@ -0,0 +1,32 @@
+package org.testcontainers.timeplus;
+
+import org.testcontainers.containers.JdbcDatabaseContainer;
+import org.testcontainers.containers.JdbcDatabaseContainerProvider;
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * Factory for Timeplus containers.
+ */
+public class TimeplusContainerProvider extends JdbcDatabaseContainerProvider {
+
+    private static final String DEFAULT_TAG = "2.3.3";
+
+    @Override
+    public boolean supports(String databaseType) {
+        return databaseType.equals(TimeplusContainer.NAME);
+    }
+
+    @Override
+    public JdbcDatabaseContainer newInstance() {
+        return newInstance(DEFAULT_TAG);
+    }
+
+    @Override
+    public JdbcDatabaseContainer newInstance(String tag) {
+        if (tag != null) {
+            return new TimeplusContainer(DockerImageName.parse(TimeplusContainer.DOCKER_IMAGE_NAME).withTag(tag));
+        } else {
+            return newInstance();
+        }
+    }
+}

modules/timeplus/src/main/java/org/testcontainers/timeplus/TimeplusContainer.java

@@ -0,0 +1 @@
+org.testcontainers.timeplus.TimeplusContainerProvider

modules/timeplus/src/main/java/org/testcontainers/timeplus/TimeplusContainerProvider.java

@@ -3,6 +3,5 @@
 import org.testcontainers.utility.DockerImageName;
 
 public interface TimeplusImages {
-    DockerImageName TIMEPLUS_PROTON_IMAGE = DockerImageName.parse("timeplus/timeplusd:2.2.10");
     DockerImageName TIMEPLUS_IMAGE = DockerImageName.parse("timeplus/timeplusd:2.3.3");
 }

modules/timeplus/src/main/resources/META-INF/services/org.testcontainers.containers.JdbcDatabaseContainerProvider

@@ -4,8 +4,8 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.testcontainers.TimeplusImages;
-import org.testcontainers.containers.TimeplusContainer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
+import org.testcontainers.timeplus.TimeplusContainer;
 import org.testcontainers.utility.DockerImageName;
 
 import java.sql.ResultSet;
@@ -24,10 +24,7 @@ public SimpleTimeplusTest(DockerImageName imageName) {
 
     @Parameterized.Parameters(name = "{0}")
     public static Object[][] data() {
-        return new Object[][] { //
-            { TimeplusImages.TIMEPLUS_PROTON_IMAGE },
-            { TimeplusImages.TIMEPLUS_IMAGE },
-        };
+        return new Object[][] { { TimeplusImages.TIMEPLUS_IMAGE } };
     }
 
     @Test