Bump the tarantool driver version and testcontainers version (#60)

tarantool · Oct 18, 2021 · d8d1e2b · d8d1e2b
1 parent 0699d85
commit d8d1e2b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 15 deletions.
diff --git a/pom.xml b/pom.xml
@@ -48,8 +48,8 @@
     <properties>
         <spring.version>5.2.13.RELEASE</spring.version>
         <spring-boot.version>2.3.2.RELEASE</spring-boot.version>
-        <driver.version>0.5.0</driver.version>
-        <testcontainers.version>0.4.4</testcontainers.version>
+        <driver.version>0.6.0</driver.version>
+        <testcontainers.version>0.4.5</testcontainers.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <logging.config>${project.basedir}/src/test/resources/logback-test.xml</logging.config>

diff --git a/...in/java/org/springframework/data/tarantool/config/AbstractTarantoolDataConfiguration.java b/...in/java/org/springframework/data/tarantool/config/AbstractTarantoolDataConfiguration.java
@@ -1,15 +1,14 @@
 package org.springframework.data.tarantool.config;
 
-import io.tarantool.driver.ClusterTarantoolClient;
-import io.tarantool.driver.ClusterTarantoolTupleClient;
-import io.tarantool.driver.TarantoolClientConfig;
-import io.tarantool.driver.TarantoolClusterAddressProvider;
-import io.tarantool.driver.TarantoolServerAddress;
 import io.tarantool.driver.api.TarantoolClient;
+import io.tarantool.driver.api.TarantoolClientConfig;
+import io.tarantool.driver.api.TarantoolClusterAddressProvider;
 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.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.tarantool.core.DefaultTarantoolExceptionTranslator;
@@ -39,7 +38,7 @@
 public abstract class AbstractTarantoolDataConfiguration extends TarantoolConfigurationSupport {
 
     /**
-     * Create a cluster {@link TarantoolClient} instance. Constructs a {@link ClusterTarantoolClient}
+     * Create a cluster {@link TarantoolClient} instance. Constructs a {@link ClusterTarantoolTupleClient}
      * instance by default.
      * Override {@link #tarantoolClientConfig(TarantoolCredentials)} to configure client settings and
      * {@link #tarantoolClusterAddressProvider()}} to configure the Tarantool server address.

diff --git a/src/main/java/org/springframework/data/tarantool/core/BaseTarantoolTemplate.java b/src/main/java/org/springframework/data/tarantool/core/BaseTarantoolTemplate.java
@@ -1,19 +1,19 @@
 package org.springframework.data.tarantool.core;
 
-import io.tarantool.driver.ProxyTarantoolClient;
 import io.tarantool.driver.api.SingleValueCallResult;
 import io.tarantool.driver.api.TarantoolClient;
 import io.tarantool.driver.api.TarantoolResult;
 import io.tarantool.driver.api.conditions.Conditions;
+import io.tarantool.driver.api.metadata.TarantoolSpaceMetadata;
 import io.tarantool.driver.api.tuple.TarantoolTuple;
-import io.tarantool.driver.api.tuple.TarantoolTupleImpl;
 import io.tarantool.driver.api.tuple.operations.TupleOperations;
+import io.tarantool.driver.core.ProxyTarantoolClient;
+import io.tarantool.driver.core.tuple.TarantoolTupleImpl;
 import io.tarantool.driver.exceptions.TarantoolSpaceOperationException;
 import io.tarantool.driver.mappers.CallResultMapper;
 import io.tarantool.driver.mappers.MessagePackMapper;
 import io.tarantool.driver.mappers.MessagePackObjectMapper;
 import io.tarantool.driver.mappers.ValueConverter;
-import io.tarantool.driver.metadata.TarantoolSpaceMetadata;
 import io.tarantool.driver.protocol.TarantoolIndexQuery;
 import org.msgpack.value.Value;
 import org.springframework.dao.DataAccessException;

diff --git a/src/test/java/org/springframework/data/tarantool/TestConfig.java b/src/test/java/org/springframework/data/tarantool/TestConfig.java
@@ -1,14 +1,14 @@
 package org.springframework.data.tarantool;
 
-import io.tarantool.driver.ProxyTarantoolTupleClient;
-import io.tarantool.driver.TarantoolClientConfig;
-import io.tarantool.driver.TarantoolClusterAddressProvider;
-import io.tarantool.driver.TarantoolServerAddress;
 import io.tarantool.driver.api.TarantoolClient;
+import io.tarantool.driver.api.TarantoolClientConfig;
+import io.tarantool.driver.api.TarantoolClusterAddressProvider;
 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.ProxyTarantoolTupleClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;