Bump the tarantool driver version

Author: wey1and

pom.xml

@@ -46,7 +46,7 @@
   </scm>
 
     <properties>
-        <driver.version>0.4.3</driver.version>
+        <driver.version>0.6.0</driver.version>
         <testcontainers.version>1.15.1</testcontainers.version>
         <snakeyaml.version>1.26</snakeyaml.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

src/main/java/org/testcontainers/containers/PathUtils.java

@@ -1,6 +1,5 @@
 package org.testcontainers.containers;
 
-import java.io.File;
 import java.nio.file.Path;
 
 /**
@@ -22,9 +21,9 @@ private PathUtils() {
      */
     public static String normalizePath(String path) {
         String result;
-        if( path.startsWith("/")
+        if (path.startsWith("/")
                 && path.length() > 3
-                && path.charAt(2) == ':' ) {
+                && path.charAt(2) == ':') {
             result = path.substring(1);
         } else {
             result = path;

src/main/java/org/testcontainers/containers/TarantoolCartridgeContainer.java

@@ -15,7 +15,7 @@
 
 /**
  * Sets up a Tarantool Cartridge cluster and provides API for configuring it.
- *
+ * <p>
  * The container constructors accept the classpath resources relative path to the instances.yml file, which contents
  * may look like
  *
@@ -47,7 +47,7 @@
  *   http_port: 8085
  * </code>
  * </pre>
- *
+ * <p>
  * and the classpath resources relative path to a topology bootstrap script, which contents may look like
  *
  * <pre>
@@ -69,9 +69,9 @@
  * return cartridge.admin_edit_topology({replicasets = replicasets})
  * </code>
  * </pre>
- *
+ * <p>
  * After the topology changes are applied, the vshard bootstrap command will be executed.
- *
+ * <p>
  * The instances.yml file will be analyzed and the ports, specified in advertise_uri options together with the ports,
  * specified in the http_port options, will be exposed.
  *
@@ -90,14 +90,14 @@ public class TarantoolCartridgeContainer extends GenericContainer<TarantoolCartr
     private static final String SCRIPT_RESOURCE_DIRECTORY = "";
     private static final String INSTANCE_DIR = "/app";
 
-    private static final String ENV_TARANTOOL_VERSION="TARANTOOL_VERSION";
-    private static final String ENV_TARANTOOL_SERVER_USER="TARANTOOL_SERVER_USER";
-    private static final String ENV_TARANTOOL_SERVER_UID="TARANTOOL_SERVER_UID";
-    private static final String ENV_TARANTOOL_SERVER_GROUP="TARANTOOL_SERVER_GROUP";
-    private static final String ENV_TARANTOOL_SERVER_GID="TARANTOOL_SERVER_GID";
-    private static final String ENV_TARANTOOL_WORKDIR="TARANTOOL_WORKDIR";
-    private static final String ENV_TARANTOOL_RUNDIR="TARANTOOL_RUNDIR";
-    private static final String ENV_TARANTOOL_DATADIR="TARANTOOL_DATADIR";
+    private static final String ENV_TARANTOOL_VERSION = "TARANTOOL_VERSION";
+    private static final String ENV_TARANTOOL_SERVER_USER = "TARANTOOL_SERVER_USER";
+    private static final String ENV_TARANTOOL_SERVER_UID = "TARANTOOL_SERVER_UID";
+    private static final String ENV_TARANTOOL_SERVER_GROUP = "TARANTOOL_SERVER_GROUP";
+    private static final String ENV_TARANTOOL_SERVER_GID = "TARANTOOL_SERVER_GID";
+    private static final String ENV_TARANTOOL_WORKDIR = "TARANTOOL_WORKDIR";
+    private static final String ENV_TARANTOOL_RUNDIR = "TARANTOOL_RUNDIR";
+    private static final String ENV_TARANTOOL_DATADIR = "TARANTOOL_DATADIR";
 
     private String routerHost = ROUTER_HOST;
     private int routerPort = ROUTER_PORT;
@@ -115,7 +115,7 @@ public class TarantoolCartridgeContainer extends GenericContainer<TarantoolCartr
      * Create a container with default image and specified instances file from the classpath resources. Assumes that
      * there is a file named Dockerfile in the project resources classpath.
      *
-     * @param instancesFile path to instances.yml, relative to the classpath resources
+     * @param instancesFile             path to instances.yml, relative to the classpath resources
      * @param topologyConfigurationFile path to a topology bootstrap script, relative to the classpath resources
      */
     public TarantoolCartridgeContainer(String instancesFile, String topologyConfigurationFile) {
@@ -125,8 +125,8 @@ public TarantoolCartridgeContainer(String instancesFile, String topologyConfigur
     /**
      * Create a container with default image and specified instances file from the classpath resources
      *
-     * @param dockerFile path to a Dockerfile which configures Cartridge and other necessary services
-     * @param instancesFile path to instances.yml, relative to the classpath resources
+     * @param dockerFile                path to a Dockerfile which configures Cartridge and other necessary services
+     * @param instancesFile             path to instances.yml, relative to the classpath resources
      * @param topologyConfigurationFile path to a topology bootstrap script, relative to the classpath resources
      */
     public TarantoolCartridgeContainer(String dockerFile, String instancesFile, String topologyConfigurationFile) {
@@ -138,9 +138,9 @@ public TarantoolCartridgeContainer(String dockerFile, String instancesFile, Stri
      * the result Cartridge container image name, you can cache the image and avoid rebuilding on each test run (the
      * image is tagged with the provided name and not deleted after tests finishing).
      *
-     * @param dockerFile URL resource path to a Dockerfile which configures Cartridge and other necessary services
-     * @param buildImageName Specify a stable image name for the test container to prevent rebuilds
-     * @param instancesFile URL resource path to instances.yml relative in the classpath
+     * @param dockerFile                URL resource path to a Dockerfile which configures Cartridge and other necessary services
+     * @param buildImageName            Specify a stable image name for the test container to prevent rebuilds
+     * @param instancesFile             URL resource path to instances.yml relative in the classpath
      * @param topologyConfigurationFile URL resource path to a topology bootstrap script in the classpath
      */
     public TarantoolCartridgeContainer(String dockerFile, String buildImageName,

src/main/java/org/testcontainers/containers/TarantoolContainerClientHelper.java

@@ -1,13 +1,13 @@
 package org.testcontainers.containers;
 
-import io.tarantool.driver.ClusterTarantoolTupleClient;
-import io.tarantool.driver.TarantoolClientConfig;
-import io.tarantool.driver.TarantoolServerAddress;
 import io.tarantool.driver.api.TarantoolClient;
+import io.tarantool.driver.api.TarantoolClientConfig;
 import io.tarantool.driver.api.TarantoolResult;
+import io.tarantool.driver.api.TarantoolServerAddress;
 import io.tarantool.driver.api.tuple.TarantoolTuple;
 import io.tarantool.driver.auth.SimpleTarantoolCredentials;
 import io.tarantool.driver.auth.TarantoolCredentials;
+import io.tarantool.driver.core.ClusterTarantoolTupleClient;
 import org.testcontainers.utility.MountableFile;
 
 import java.nio.file.Paths;
@@ -43,7 +43,7 @@ public final class TarantoolContainerClientHelper {
     /**
      * Configure or return an already configured client connected to a Cartridge router
      *
-     * @param config router instance client config
+     * @param config  router instance client config
      * @param address router host address
      * @return a configured client
      */

src/test/java/org/testcontainers/containers/PathUtilsTest.java

@@ -26,12 +26,12 @@ void normalizePathTest() {
         Assertions.assertEquals("c:/work/server.lua",
                 normalizePath("c:\\work\\server.lua"));
 
-        Assertions.assertEquals("c:/",  normalizePath("c:\\"));
+        Assertions.assertEquals("c:/", normalizePath("c:\\"));
 
-        Assertions.assertEquals("/dummy",  normalizePath("/dummy"));
+        Assertions.assertEquals("/dummy", normalizePath("/dummy"));
 
-        Assertions.assertEquals("/c",  normalizePath("/c"));
+        Assertions.assertEquals("/c", normalizePath("/c"));
 
-        Assertions.assertThrows(NullPointerException.class, () -> normalizePath((String)null));
+        Assertions.assertThrows(NullPointerException.class, () -> normalizePath((String) null));
     }
 }