From 97dd34f494f89af40a1eed50caf5713c035b05c1 Mon Sep 17 00:00:00 2001 From: Alexey Kuzin Date: Tue, 3 Oct 2023 19:35:25 +0200 Subject: [PATCH] Fix incorrect package change for TarantoolSpaceOperations TarantoolSpaceOperations interface does not belong to the "options" package, and its implementations too. --- .../java/io/tarantool/driver/api/TarantoolClient.java | 2 +- .../io/tarantool/driver/api/cursor/OffsetCursor.java | 2 +- .../tarantool/driver/api/cursor/StartAfterCursor.java | 2 +- .../space/{options => }/TarantoolSpaceOperations.java | 10 +++++++++- .../io/tarantool/driver/api/space/package-info.java | 6 ++++++ .../tarantool/driver/core/AbstractTarantoolClient.java | 2 +- .../driver/core/ClusterTarantoolTupleClient.java | 2 +- .../io/tarantool/driver/core/ProxyTarantoolClient.java | 2 +- .../driver/core/ProxyTarantoolTupleClient.java | 2 +- .../tarantool/driver/core/RetryingTarantoolClient.java | 2 +- .../driver/core/RetryingTarantoolTupleClient.java | 2 +- .../driver/core/space/ProxyTarantoolSpace.java | 2 +- .../driver/core/space/RetryingTarantoolSpace.java | 2 +- .../io/tarantool/driver/core/space/TarantoolSpace.java | 2 +- .../integration/ClusterTarantoolTupleClientIT.java | 2 +- .../driver/integration/ClusterTruncateIT.java | 2 +- .../tarantool/driver/integration/OffsetCursorIT.java | 2 +- .../io/tarantool/driver/integration/ProxyCursorIT.java | 2 +- .../integration/ProxyTarantoolClientExampleIT.java | 2 +- .../driver/integration/ProxyTarantoolClientIT.java | 2 +- .../ProxyTarantoolClientMixedInstancesIT.java | 2 +- ...oxyTarantoolClientWithAddressProviderExampleIT.java | 2 +- .../tarantool/driver/integration/ProxyTruncateIT.java | 2 +- .../io/tarantool/driver/integration/ReconnectIT.java | 2 +- .../driver/integration/SingleInstanceExampleIT.java | 2 +- .../java/io/tarantool/driver/integration/Utils.java | 2 +- .../proxy/options/ProxySpaceDeleteOptionsIT.java | 2 +- .../proxy/options/ProxySpaceInsertManyOptionsIT.java | 2 +- .../proxy/options/ProxySpaceInsertOptionsIT.java | 2 +- .../proxy/options/ProxySpaceReplaceManyOptionsIT.java | 2 +- .../proxy/options/ProxySpaceReplaceOptionsIT.java | 2 +- .../proxy/options/ProxySpaceSelectOptionsIT.java | 2 +- .../proxy/options/ProxySpaceUpdateOptionsIT.java | 2 +- .../proxy/options/ProxySpaceUpsertOptionsIT.java | 2 +- 34 files changed, 47 insertions(+), 33 deletions(-) rename src/main/java/io/tarantool/driver/api/space/{options => }/TarantoolSpaceOperations.java (95%) create mode 100644 src/main/java/io/tarantool/driver/api/space/package-info.java diff --git a/src/main/java/io/tarantool/driver/api/TarantoolClient.java b/src/main/java/io/tarantool/driver/api/TarantoolClient.java index 00ce76eb9..9f5a42e0a 100644 --- a/src/main/java/io/tarantool/driver/api/TarantoolClient.java +++ b/src/main/java/io/tarantool/driver/api/TarantoolClient.java @@ -4,7 +4,7 @@ import io.tarantool.driver.api.connection.TarantoolConnectionListeners; import io.tarantool.driver.api.metadata.TarantoolMetadataOperations; import io.tarantool.driver.api.metadata.TarantoolMetadataProvider; -import io.tarantool.driver.api.space.options.TarantoolSpaceOperations; +import io.tarantool.driver.api.space.TarantoolSpaceOperations; import io.tarantool.driver.exceptions.TarantoolClientException; import io.tarantool.driver.protocol.Packable; diff --git a/src/main/java/io/tarantool/driver/api/cursor/OffsetCursor.java b/src/main/java/io/tarantool/driver/api/cursor/OffsetCursor.java index 2f1c08e6c..d2358848d 100644 --- a/src/main/java/io/tarantool/driver/api/cursor/OffsetCursor.java +++ b/src/main/java/io/tarantool/driver/api/cursor/OffsetCursor.java @@ -1,7 +1,7 @@ package io.tarantool.driver.api.cursor; import io.tarantool.driver.api.conditions.Conditions; -import io.tarantool.driver.api.space.options.TarantoolSpaceOperations; +import io.tarantool.driver.api.space.TarantoolSpaceOperations; import io.tarantool.driver.exceptions.TarantoolClientException; import io.tarantool.driver.protocol.Packable; diff --git a/src/main/java/io/tarantool/driver/api/cursor/StartAfterCursor.java b/src/main/java/io/tarantool/driver/api/cursor/StartAfterCursor.java index 505b912a7..9108463a8 100644 --- a/src/main/java/io/tarantool/driver/api/cursor/StartAfterCursor.java +++ b/src/main/java/io/tarantool/driver/api/cursor/StartAfterCursor.java @@ -1,7 +1,7 @@ package io.tarantool.driver.api.cursor; import io.tarantool.driver.api.conditions.Conditions; -import io.tarantool.driver.api.space.options.TarantoolSpaceOperations; +import io.tarantool.driver.api.space.TarantoolSpaceOperations; import io.tarantool.driver.exceptions.TarantoolClientException; import io.tarantool.driver.mappers.MessagePackMapper; import io.tarantool.driver.protocol.Packable; diff --git a/src/main/java/io/tarantool/driver/api/space/options/TarantoolSpaceOperations.java b/src/main/java/io/tarantool/driver/api/space/TarantoolSpaceOperations.java similarity index 95% rename from src/main/java/io/tarantool/driver/api/space/options/TarantoolSpaceOperations.java rename to src/main/java/io/tarantool/driver/api/space/TarantoolSpaceOperations.java index 175b90f03..33fa8fbb9 100644 --- a/src/main/java/io/tarantool/driver/api/space/options/TarantoolSpaceOperations.java +++ b/src/main/java/io/tarantool/driver/api/space/TarantoolSpaceOperations.java @@ -1,4 +1,4 @@ -package io.tarantool.driver.api.space.options; +package io.tarantool.driver.api.space; import io.tarantool.driver.api.conditions.Conditions; import io.tarantool.driver.api.cursor.TarantoolCursor; @@ -6,6 +6,14 @@ import io.tarantool.driver.api.tuple.operations.TupleOperations; import io.tarantool.driver.exceptions.TarantoolClientException; import io.tarantool.driver.protocol.Packable; +import io.tarantool.driver.api.space.options.DeleteOptions; +import io.tarantool.driver.api.space.options.InsertOptions; +import io.tarantool.driver.api.space.options.InsertManyOptions; +import io.tarantool.driver.api.space.options.ReplaceOptions; +import io.tarantool.driver.api.space.options.ReplaceManyOptions; +import io.tarantool.driver.api.space.options.SelectOptions; +import io.tarantool.driver.api.space.options.UpdateOptions; +import io.tarantool.driver.api.space.options.UpsertOptions; import java.util.Collection; import java.util.concurrent.CompletableFuture; diff --git a/src/main/java/io/tarantool/driver/api/space/package-info.java b/src/main/java/io/tarantool/driver/api/space/package-info.java new file mode 100644 index 000000000..42f02f8a9 --- /dev/null +++ b/src/main/java/io/tarantool/driver/api/space/package-info.java @@ -0,0 +1,6 @@ +/** + * Contains interfaces for Tarantool space operations + * + * @author Alexey Kuzin + */ +package io.tarantool.driver.api.space; diff --git a/src/main/java/io/tarantool/driver/core/AbstractTarantoolClient.java b/src/main/java/io/tarantool/driver/core/AbstractTarantoolClient.java index c497804b2..e7eb176d3 100644 --- a/src/main/java/io/tarantool/driver/core/AbstractTarantoolClient.java +++ b/src/main/java/io/tarantool/driver/core/AbstractTarantoolClient.java @@ -31,7 +31,7 @@ import io.tarantool.driver.api.metadata.TarantoolMetadataOperations; import io.tarantool.driver.api.metadata.TarantoolMetadataProvider; import io.tarantool.driver.api.metadata.TarantoolSpaceMetadata; -import io.tarantool.driver.api.space.options.TarantoolSpaceOperations; +import io.tarantool.driver.api.space.TarantoolSpaceOperations; import io.tarantool.driver.core.connection.TarantoolConnectionFactory; import io.tarantool.driver.core.connection.TarantoolConnectionManager; import io.tarantool.driver.core.metadata.SpacesMetadataProvider; diff --git a/src/main/java/io/tarantool/driver/core/ClusterTarantoolTupleClient.java b/src/main/java/io/tarantool/driver/core/ClusterTarantoolTupleClient.java index 5bbe492cf..f6f867a2c 100644 --- a/src/main/java/io/tarantool/driver/core/ClusterTarantoolTupleClient.java +++ b/src/main/java/io/tarantool/driver/core/ClusterTarantoolTupleClient.java @@ -7,7 +7,7 @@ import io.tarantool.driver.api.connection.TarantoolConnectionSelectionStrategies.ParallelRoundRobinStrategyFactory; import io.tarantool.driver.api.metadata.TarantoolMetadataOperations; import io.tarantool.driver.api.metadata.TarantoolSpaceMetadata; -import io.tarantool.driver.api.space.options.TarantoolSpaceOperations; +import io.tarantool.driver.api.space.TarantoolSpaceOperations; import io.tarantool.driver.api.tuple.TarantoolTuple; import io.tarantool.driver.auth.SimpleTarantoolCredentials; import io.tarantool.driver.auth.TarantoolCredentials; diff --git a/src/main/java/io/tarantool/driver/core/ProxyTarantoolClient.java b/src/main/java/io/tarantool/driver/core/ProxyTarantoolClient.java index c194a5ab6..280b2171f 100644 --- a/src/main/java/io/tarantool/driver/core/ProxyTarantoolClient.java +++ b/src/main/java/io/tarantool/driver/core/ProxyTarantoolClient.java @@ -13,7 +13,7 @@ import io.tarantool.driver.api.metadata.TarantoolMetadataProvider; import io.tarantool.driver.api.metadata.TarantoolSpaceMetadata; import io.tarantool.driver.api.proxy.ProxyOperationsMappingConfig; -import io.tarantool.driver.api.space.options.TarantoolSpaceOperations; +import io.tarantool.driver.api.space.TarantoolSpaceOperations; import io.tarantool.driver.core.metadata.DDLTarantoolSpaceMetadataConverter; import io.tarantool.driver.core.metadata.ProxyMetadataProvider; import io.tarantool.driver.core.metadata.TarantoolMetadata; diff --git a/src/main/java/io/tarantool/driver/core/ProxyTarantoolTupleClient.java b/src/main/java/io/tarantool/driver/core/ProxyTarantoolTupleClient.java index a17ba3706..ac46bba01 100644 --- a/src/main/java/io/tarantool/driver/core/ProxyTarantoolTupleClient.java +++ b/src/main/java/io/tarantool/driver/core/ProxyTarantoolTupleClient.java @@ -7,7 +7,7 @@ import io.tarantool.driver.api.metadata.TarantoolMetadataOperations; import io.tarantool.driver.api.metadata.TarantoolSpaceMetadata; import io.tarantool.driver.api.proxy.ProxyOperationsMappingConfig; -import io.tarantool.driver.api.space.options.TarantoolSpaceOperations; +import io.tarantool.driver.api.space.TarantoolSpaceOperations; import io.tarantool.driver.api.tuple.TarantoolTuple; import io.tarantool.driver.core.space.ProxyTarantoolTupleSpace; diff --git a/src/main/java/io/tarantool/driver/core/RetryingTarantoolClient.java b/src/main/java/io/tarantool/driver/core/RetryingTarantoolClient.java index c032efb31..bc148137e 100644 --- a/src/main/java/io/tarantool/driver/core/RetryingTarantoolClient.java +++ b/src/main/java/io/tarantool/driver/core/RetryingTarantoolClient.java @@ -11,7 +11,7 @@ import io.tarantool.driver.api.metadata.TarantoolMetadataProvider; import io.tarantool.driver.api.retry.RequestRetryPolicy; import io.tarantool.driver.api.retry.RequestRetryPolicyFactory; -import io.tarantool.driver.api.space.options.TarantoolSpaceOperations; +import io.tarantool.driver.api.space.TarantoolSpaceOperations; import io.tarantool.driver.core.space.RetryingTarantoolSpace; import io.tarantool.driver.exceptions.TarantoolClientException; import io.tarantool.driver.mappers.CallResultMapper; diff --git a/src/main/java/io/tarantool/driver/core/RetryingTarantoolTupleClient.java b/src/main/java/io/tarantool/driver/core/RetryingTarantoolTupleClient.java index 6a3503f61..90b1f6ce2 100644 --- a/src/main/java/io/tarantool/driver/core/RetryingTarantoolTupleClient.java +++ b/src/main/java/io/tarantool/driver/core/RetryingTarantoolTupleClient.java @@ -3,7 +3,7 @@ import io.tarantool.driver.api.TarantoolClient; import io.tarantool.driver.api.TarantoolResult; import io.tarantool.driver.api.retry.RequestRetryPolicyFactory; -import io.tarantool.driver.api.space.options.TarantoolSpaceOperations; +import io.tarantool.driver.api.space.TarantoolSpaceOperations; import io.tarantool.driver.api.tuple.TarantoolTuple; import io.tarantool.driver.core.space.RetryingTarantoolSpace; diff --git a/src/main/java/io/tarantool/driver/core/space/ProxyTarantoolSpace.java b/src/main/java/io/tarantool/driver/core/space/ProxyTarantoolSpace.java index 592c64a8b..65cb7f3c0 100644 --- a/src/main/java/io/tarantool/driver/core/space/ProxyTarantoolSpace.java +++ b/src/main/java/io/tarantool/driver/core/space/ProxyTarantoolSpace.java @@ -7,7 +7,7 @@ import io.tarantool.driver.api.metadata.TarantoolMetadataOperations; import io.tarantool.driver.api.metadata.TarantoolSpaceMetadata; import io.tarantool.driver.api.proxy.ProxyOperationsMappingConfig; -import io.tarantool.driver.api.space.options.TarantoolSpaceOperations; +import io.tarantool.driver.api.space.TarantoolSpaceOperations; import io.tarantool.driver.api.space.options.DeleteOptions; import io.tarantool.driver.api.space.options.InsertManyOptions; import io.tarantool.driver.api.space.options.InsertOptions; diff --git a/src/main/java/io/tarantool/driver/core/space/RetryingTarantoolSpace.java b/src/main/java/io/tarantool/driver/core/space/RetryingTarantoolSpace.java index b4dbf6c62..7927db213 100644 --- a/src/main/java/io/tarantool/driver/core/space/RetryingTarantoolSpace.java +++ b/src/main/java/io/tarantool/driver/core/space/RetryingTarantoolSpace.java @@ -5,7 +5,7 @@ import io.tarantool.driver.api.metadata.TarantoolSpaceMetadata; import io.tarantool.driver.api.retry.RequestRetryPolicy; import io.tarantool.driver.api.retry.RequestRetryPolicyFactory; -import io.tarantool.driver.api.space.options.TarantoolSpaceOperations; +import io.tarantool.driver.api.space.TarantoolSpaceOperations; import io.tarantool.driver.api.space.options.DeleteOptions; import io.tarantool.driver.api.space.options.InsertManyOptions; import io.tarantool.driver.api.space.options.InsertOptions; diff --git a/src/main/java/io/tarantool/driver/core/space/TarantoolSpace.java b/src/main/java/io/tarantool/driver/core/space/TarantoolSpace.java index b7b2911fb..25ac8d9d1 100644 --- a/src/main/java/io/tarantool/driver/core/space/TarantoolSpace.java +++ b/src/main/java/io/tarantool/driver/core/space/TarantoolSpace.java @@ -6,7 +6,7 @@ import io.tarantool.driver.api.metadata.TarantoolIndexMetadata; import io.tarantool.driver.api.metadata.TarantoolMetadataOperations; import io.tarantool.driver.api.metadata.TarantoolSpaceMetadata; -import io.tarantool.driver.api.space.options.TarantoolSpaceOperations; +import io.tarantool.driver.api.space.TarantoolSpaceOperations; import io.tarantool.driver.api.tuple.operations.TupleOperation; import io.tarantool.driver.api.tuple.operations.TupleOperations; import io.tarantool.driver.core.connection.TarantoolConnectionManager; diff --git a/src/test/java/io/tarantool/driver/integration/ClusterTarantoolTupleClientIT.java b/src/test/java/io/tarantool/driver/integration/ClusterTarantoolTupleClientIT.java index 5b19c49e0..079feb975 100644 --- a/src/test/java/io/tarantool/driver/integration/ClusterTarantoolTupleClientIT.java +++ b/src/test/java/io/tarantool/driver/integration/ClusterTarantoolTupleClientIT.java @@ -4,7 +4,7 @@ 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.space.options.TarantoolSpaceOperations; +import io.tarantool.driver.api.space.TarantoolSpaceOperations; import io.tarantool.driver.api.tuple.TarantoolTuple; import io.tarantool.driver.api.tuple.operations.TupleOperations; import io.tarantool.driver.core.tuple.TarantoolTupleImpl; diff --git a/src/test/java/io/tarantool/driver/integration/ClusterTruncateIT.java b/src/test/java/io/tarantool/driver/integration/ClusterTruncateIT.java index d1e6ee2f7..6a4bc6501 100644 --- a/src/test/java/io/tarantool/driver/integration/ClusterTruncateIT.java +++ b/src/test/java/io/tarantool/driver/integration/ClusterTruncateIT.java @@ -3,7 +3,7 @@ import io.tarantool.driver.api.TarantoolResult; import io.tarantool.driver.api.conditions.Conditions; -import io.tarantool.driver.api.space.options.TarantoolSpaceOperations; +import io.tarantool.driver.api.space.TarantoolSpaceOperations; import io.tarantool.driver.api.tuple.TarantoolTuple; import io.tarantool.driver.core.tuple.TarantoolTupleImpl; import io.tarantool.driver.exceptions.TarantoolClientException; diff --git a/src/test/java/io/tarantool/driver/integration/OffsetCursorIT.java b/src/test/java/io/tarantool/driver/integration/OffsetCursorIT.java index 0fff5245e..44da9c79e 100644 --- a/src/test/java/io/tarantool/driver/integration/OffsetCursorIT.java +++ b/src/test/java/io/tarantool/driver/integration/OffsetCursorIT.java @@ -3,7 +3,7 @@ import io.tarantool.driver.api.conditions.Conditions; import io.tarantool.driver.api.cursor.TarantoolCursor; -import io.tarantool.driver.api.space.options.TarantoolSpaceOperations; +import io.tarantool.driver.api.space.TarantoolSpaceOperations; import io.tarantool.driver.api.tuple.TarantoolTuple; import io.tarantool.driver.core.tuple.TarantoolTupleImpl; import io.tarantool.driver.exceptions.TarantoolClientException; diff --git a/src/test/java/io/tarantool/driver/integration/ProxyCursorIT.java b/src/test/java/io/tarantool/driver/integration/ProxyCursorIT.java index 5af39507d..ffc1cbe8f 100644 --- a/src/test/java/io/tarantool/driver/integration/ProxyCursorIT.java +++ b/src/test/java/io/tarantool/driver/integration/ProxyCursorIT.java @@ -9,7 +9,7 @@ import io.tarantool.driver.api.conditions.Conditions; import io.tarantool.driver.api.cursor.TarantoolCursor; import io.tarantool.driver.api.retry.TarantoolRequestRetryPolicies; -import io.tarantool.driver.api.space.options.TarantoolSpaceOperations; +import io.tarantool.driver.api.space.TarantoolSpaceOperations; import io.tarantool.driver.api.tuple.TarantoolTuple; import io.tarantool.driver.auth.SimpleTarantoolCredentials; import io.tarantool.driver.auth.TarantoolCredentials; diff --git a/src/test/java/io/tarantool/driver/integration/ProxyTarantoolClientExampleIT.java b/src/test/java/io/tarantool/driver/integration/ProxyTarantoolClientExampleIT.java index edec391cb..02b99f9d2 100644 --- a/src/test/java/io/tarantool/driver/integration/ProxyTarantoolClientExampleIT.java +++ b/src/test/java/io/tarantool/driver/integration/ProxyTarantoolClientExampleIT.java @@ -4,7 +4,7 @@ import io.tarantool.driver.api.TarantoolClientFactory; import io.tarantool.driver.api.TarantoolResult; import io.tarantool.driver.api.conditions.Conditions; -import io.tarantool.driver.api.space.options.TarantoolSpaceOperations; +import io.tarantool.driver.api.space.TarantoolSpaceOperations; import io.tarantool.driver.api.tuple.DefaultTarantoolTupleFactory; import io.tarantool.driver.api.tuple.TarantoolTuple; import io.tarantool.driver.api.tuple.TarantoolTupleFactory; diff --git a/src/test/java/io/tarantool/driver/integration/ProxyTarantoolClientIT.java b/src/test/java/io/tarantool/driver/integration/ProxyTarantoolClientIT.java index 8ac6f859e..86b47d8e3 100644 --- a/src/test/java/io/tarantool/driver/integration/ProxyTarantoolClientIT.java +++ b/src/test/java/io/tarantool/driver/integration/ProxyTarantoolClientIT.java @@ -34,7 +34,7 @@ import io.tarantool.driver.api.metadata.TarantoolMetadataOperations; import io.tarantool.driver.api.metadata.TarantoolSpaceMetadata; import io.tarantool.driver.api.retry.TarantoolRequestRetryPolicies; -import io.tarantool.driver.api.space.options.TarantoolSpaceOperations; +import io.tarantool.driver.api.space.TarantoolSpaceOperations; import io.tarantool.driver.api.tuple.DefaultTarantoolTupleFactory; import io.tarantool.driver.api.tuple.TarantoolTuple; import io.tarantool.driver.api.tuple.TarantoolTupleFactory; diff --git a/src/test/java/io/tarantool/driver/integration/ProxyTarantoolClientMixedInstancesIT.java b/src/test/java/io/tarantool/driver/integration/ProxyTarantoolClientMixedInstancesIT.java index 5cbb459ee..73be37c9b 100644 --- a/src/test/java/io/tarantool/driver/integration/ProxyTarantoolClientMixedInstancesIT.java +++ b/src/test/java/io/tarantool/driver/integration/ProxyTarantoolClientMixedInstancesIT.java @@ -13,7 +13,7 @@ import io.tarantool.driver.api.metadata.TarantoolMetadataOperations; import io.tarantool.driver.api.metadata.TarantoolSpaceMetadata; import io.tarantool.driver.api.retry.TarantoolRequestRetryPolicies; -import io.tarantool.driver.api.space.options.TarantoolSpaceOperations; +import io.tarantool.driver.api.space.TarantoolSpaceOperations; import io.tarantool.driver.api.tuple.DefaultTarantoolTupleFactory; import io.tarantool.driver.api.tuple.TarantoolTuple; import io.tarantool.driver.api.tuple.TarantoolTupleFactory; diff --git a/src/test/java/io/tarantool/driver/integration/ProxyTarantoolClientWithAddressProviderExampleIT.java b/src/test/java/io/tarantool/driver/integration/ProxyTarantoolClientWithAddressProviderExampleIT.java index 9f11589e7..575ffa7ca 100644 --- a/src/test/java/io/tarantool/driver/integration/ProxyTarantoolClientWithAddressProviderExampleIT.java +++ b/src/test/java/io/tarantool/driver/integration/ProxyTarantoolClientWithAddressProviderExampleIT.java @@ -6,7 +6,7 @@ import io.tarantool.driver.api.TarantoolClientConfig; import io.tarantool.driver.api.TarantoolClusterAddressProvider; import io.tarantool.driver.api.TarantoolResult; -import io.tarantool.driver.api.space.options.TarantoolSpaceOperations; +import io.tarantool.driver.api.space.TarantoolSpaceOperations; import io.tarantool.driver.api.tuple.DefaultTarantoolTupleFactory; import io.tarantool.driver.api.tuple.TarantoolTuple; import io.tarantool.driver.api.tuple.TarantoolTupleFactory; diff --git a/src/test/java/io/tarantool/driver/integration/ProxyTruncateIT.java b/src/test/java/io/tarantool/driver/integration/ProxyTruncateIT.java index 22d511555..4fc98d3e2 100644 --- a/src/test/java/io/tarantool/driver/integration/ProxyTruncateIT.java +++ b/src/test/java/io/tarantool/driver/integration/ProxyTruncateIT.java @@ -8,7 +8,7 @@ import io.tarantool.driver.api.TarantoolServerAddress; import io.tarantool.driver.api.conditions.Conditions; import io.tarantool.driver.api.retry.TarantoolRequestRetryPolicies; -import io.tarantool.driver.api.space.options.TarantoolSpaceOperations; +import io.tarantool.driver.api.space.TarantoolSpaceOperations; import io.tarantool.driver.api.tuple.DefaultTarantoolTupleFactory; import io.tarantool.driver.api.tuple.TarantoolTuple; import io.tarantool.driver.api.tuple.TarantoolTupleFactory; diff --git a/src/test/java/io/tarantool/driver/integration/ReconnectIT.java b/src/test/java/io/tarantool/driver/integration/ReconnectIT.java index 94fdce318..cc5d09278 100644 --- a/src/test/java/io/tarantool/driver/integration/ReconnectIT.java +++ b/src/test/java/io/tarantool/driver/integration/ReconnectIT.java @@ -7,7 +7,7 @@ import io.tarantool.driver.api.TarantoolResult; import io.tarantool.driver.api.TarantoolServerAddress; import io.tarantool.driver.api.conditions.Conditions; -import io.tarantool.driver.api.space.options.TarantoolSpaceOperations; +import io.tarantool.driver.api.space.TarantoolSpaceOperations; import io.tarantool.driver.api.tuple.DefaultTarantoolTupleFactory; import io.tarantool.driver.api.tuple.TarantoolTuple; import io.tarantool.driver.api.tuple.TarantoolTupleFactory; diff --git a/src/test/java/io/tarantool/driver/integration/SingleInstanceExampleIT.java b/src/test/java/io/tarantool/driver/integration/SingleInstanceExampleIT.java index 125ffb41b..4a81aa9a2 100644 --- a/src/test/java/io/tarantool/driver/integration/SingleInstanceExampleIT.java +++ b/src/test/java/io/tarantool/driver/integration/SingleInstanceExampleIT.java @@ -4,7 +4,7 @@ import io.tarantool.driver.api.TarantoolClientFactory; import io.tarantool.driver.api.TarantoolResult; import io.tarantool.driver.api.conditions.Conditions; -import io.tarantool.driver.api.space.options.TarantoolSpaceOperations; +import io.tarantool.driver.api.space.TarantoolSpaceOperations; import io.tarantool.driver.api.tuple.DefaultTarantoolTupleFactory; import io.tarantool.driver.api.tuple.TarantoolTuple; import io.tarantool.driver.api.tuple.TarantoolTupleFactory; diff --git a/src/test/java/io/tarantool/driver/integration/Utils.java b/src/test/java/io/tarantool/driver/integration/Utils.java index 1e9041eec..5d0a38f01 100644 --- a/src/test/java/io/tarantool/driver/integration/Utils.java +++ b/src/test/java/io/tarantool/driver/integration/Utils.java @@ -3,7 +3,7 @@ import io.tarantool.driver.api.TarantoolClient; import io.tarantool.driver.api.TarantoolResult; import io.tarantool.driver.api.conditions.Conditions; -import io.tarantool.driver.api.space.options.TarantoolSpaceOperations; +import io.tarantool.driver.api.space.TarantoolSpaceOperations; import io.tarantool.driver.api.tuple.TarantoolTuple; import io.tarantool.driver.exceptions.TarantoolClientException; import io.tarantool.driver.protocol.Packable; diff --git a/src/test/java/io/tarantool/driver/integration/proxy/options/ProxySpaceDeleteOptionsIT.java b/src/test/java/io/tarantool/driver/integration/proxy/options/ProxySpaceDeleteOptionsIT.java index 8d7d0dd59..c8f51faf1 100644 --- a/src/test/java/io/tarantool/driver/integration/proxy/options/ProxySpaceDeleteOptionsIT.java +++ b/src/test/java/io/tarantool/driver/integration/proxy/options/ProxySpaceDeleteOptionsIT.java @@ -4,7 +4,7 @@ import io.tarantool.driver.api.TarantoolClientConfig; import io.tarantool.driver.api.TarantoolResult; import io.tarantool.driver.api.conditions.Conditions; -import io.tarantool.driver.api.space.options.TarantoolSpaceOperations; +import io.tarantool.driver.api.space.TarantoolSpaceOperations; import io.tarantool.driver.api.space.options.InsertOptions; import io.tarantool.driver.api.space.options.ProxyDeleteOptions; import io.tarantool.driver.api.space.options.ProxyInsertOptions; diff --git a/src/test/java/io/tarantool/driver/integration/proxy/options/ProxySpaceInsertManyOptionsIT.java b/src/test/java/io/tarantool/driver/integration/proxy/options/ProxySpaceInsertManyOptionsIT.java index 9626ff098..ccb4ed1a5 100644 --- a/src/test/java/io/tarantool/driver/integration/proxy/options/ProxySpaceInsertManyOptionsIT.java +++ b/src/test/java/io/tarantool/driver/integration/proxy/options/ProxySpaceInsertManyOptionsIT.java @@ -4,7 +4,7 @@ import io.tarantool.driver.api.TarantoolClientConfig; import io.tarantool.driver.api.TarantoolResult; import io.tarantool.driver.api.conditions.Conditions; -import io.tarantool.driver.api.space.options.TarantoolSpaceOperations; +import io.tarantool.driver.api.space.TarantoolSpaceOperations; import io.tarantool.driver.api.space.options.InsertManyOptions; import io.tarantool.driver.api.space.options.crud.enums.RollbackOnError; import io.tarantool.driver.api.space.options.crud.enums.StopOnError; diff --git a/src/test/java/io/tarantool/driver/integration/proxy/options/ProxySpaceInsertOptionsIT.java b/src/test/java/io/tarantool/driver/integration/proxy/options/ProxySpaceInsertOptionsIT.java index 2a400fb58..9e3389ad0 100644 --- a/src/test/java/io/tarantool/driver/integration/proxy/options/ProxySpaceInsertOptionsIT.java +++ b/src/test/java/io/tarantool/driver/integration/proxy/options/ProxySpaceInsertOptionsIT.java @@ -4,7 +4,7 @@ import io.tarantool.driver.api.TarantoolClientConfig; import io.tarantool.driver.api.TarantoolResult; import io.tarantool.driver.api.conditions.Conditions; -import io.tarantool.driver.api.space.options.TarantoolSpaceOperations; +import io.tarantool.driver.api.space.TarantoolSpaceOperations; import io.tarantool.driver.api.space.options.InsertOptions; import io.tarantool.driver.api.space.options.SelectOptions; import io.tarantool.driver.api.space.options.ProxyInsertOptions; diff --git a/src/test/java/io/tarantool/driver/integration/proxy/options/ProxySpaceReplaceManyOptionsIT.java b/src/test/java/io/tarantool/driver/integration/proxy/options/ProxySpaceReplaceManyOptionsIT.java index 4f360cda8..6a93323cc 100644 --- a/src/test/java/io/tarantool/driver/integration/proxy/options/ProxySpaceReplaceManyOptionsIT.java +++ b/src/test/java/io/tarantool/driver/integration/proxy/options/ProxySpaceReplaceManyOptionsIT.java @@ -3,7 +3,7 @@ import io.tarantool.driver.api.TarantoolClient; import io.tarantool.driver.api.TarantoolClientConfig; import io.tarantool.driver.api.TarantoolResult; -import io.tarantool.driver.api.space.options.TarantoolSpaceOperations; +import io.tarantool.driver.api.space.TarantoolSpaceOperations; import io.tarantool.driver.api.space.options.ReplaceManyOptions; import io.tarantool.driver.api.space.options.crud.enums.RollbackOnError; import io.tarantool.driver.api.space.options.crud.enums.StopOnError; diff --git a/src/test/java/io/tarantool/driver/integration/proxy/options/ProxySpaceReplaceOptionsIT.java b/src/test/java/io/tarantool/driver/integration/proxy/options/ProxySpaceReplaceOptionsIT.java index 7ff1b6781..5d8a5c786 100644 --- a/src/test/java/io/tarantool/driver/integration/proxy/options/ProxySpaceReplaceOptionsIT.java +++ b/src/test/java/io/tarantool/driver/integration/proxy/options/ProxySpaceReplaceOptionsIT.java @@ -4,7 +4,7 @@ import io.tarantool.driver.api.TarantoolClientConfig; import io.tarantool.driver.api.TarantoolResult; import io.tarantool.driver.api.conditions.Conditions; -import io.tarantool.driver.api.space.options.TarantoolSpaceOperations; +import io.tarantool.driver.api.space.TarantoolSpaceOperations; import io.tarantool.driver.api.space.options.ReplaceOptions; import io.tarantool.driver.api.space.options.ProxyDeleteOptions; import io.tarantool.driver.api.space.options.ProxyReplaceOptions; diff --git a/src/test/java/io/tarantool/driver/integration/proxy/options/ProxySpaceSelectOptionsIT.java b/src/test/java/io/tarantool/driver/integration/proxy/options/ProxySpaceSelectOptionsIT.java index a29354f7e..8c023dd72 100644 --- a/src/test/java/io/tarantool/driver/integration/proxy/options/ProxySpaceSelectOptionsIT.java +++ b/src/test/java/io/tarantool/driver/integration/proxy/options/ProxySpaceSelectOptionsIT.java @@ -6,7 +6,7 @@ import io.tarantool.driver.api.conditions.Conditions; import io.tarantool.driver.api.space.options.crud.enums.Mode; import io.tarantool.driver.api.space.options.SelectOptions; -import io.tarantool.driver.api.space.options.TarantoolSpaceOperations; +import io.tarantool.driver.api.space.TarantoolSpaceOperations; import io.tarantool.driver.api.space.options.ProxySelectOptions; import io.tarantool.driver.api.tuple.DefaultTarantoolTupleFactory; import io.tarantool.driver.api.tuple.TarantoolTuple; diff --git a/src/test/java/io/tarantool/driver/integration/proxy/options/ProxySpaceUpdateOptionsIT.java b/src/test/java/io/tarantool/driver/integration/proxy/options/ProxySpaceUpdateOptionsIT.java index 9328b68e1..c528ab3b7 100644 --- a/src/test/java/io/tarantool/driver/integration/proxy/options/ProxySpaceUpdateOptionsIT.java +++ b/src/test/java/io/tarantool/driver/integration/proxy/options/ProxySpaceUpdateOptionsIT.java @@ -4,7 +4,7 @@ import io.tarantool.driver.api.TarantoolClientConfig; import io.tarantool.driver.api.TarantoolResult; import io.tarantool.driver.api.conditions.Conditions; -import io.tarantool.driver.api.space.options.TarantoolSpaceOperations; +import io.tarantool.driver.api.space.TarantoolSpaceOperations; import io.tarantool.driver.api.space.options.UpdateOptions; import io.tarantool.driver.api.space.options.ProxyUpdateOptions; import io.tarantool.driver.api.tuple.DefaultTarantoolTupleFactory; diff --git a/src/test/java/io/tarantool/driver/integration/proxy/options/ProxySpaceUpsertOptionsIT.java b/src/test/java/io/tarantool/driver/integration/proxy/options/ProxySpaceUpsertOptionsIT.java index 9748cfa17..91b47c93c 100644 --- a/src/test/java/io/tarantool/driver/integration/proxy/options/ProxySpaceUpsertOptionsIT.java +++ b/src/test/java/io/tarantool/driver/integration/proxy/options/ProxySpaceUpsertOptionsIT.java @@ -4,7 +4,7 @@ import io.tarantool.driver.api.TarantoolClientConfig; import io.tarantool.driver.api.TarantoolResult; import io.tarantool.driver.api.conditions.Conditions; -import io.tarantool.driver.api.space.options.TarantoolSpaceOperations; +import io.tarantool.driver.api.space.TarantoolSpaceOperations; import io.tarantool.driver.api.space.options.ProxyUpsertOptions; import io.tarantool.driver.api.tuple.DefaultTarantoolTupleFactory; import io.tarantool.driver.api.tuple.TarantoolTuple;