This is an automated email from the ASF dual-hosted git repository.
frankgh pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-sidecar.git
The following commit(s) were added to refs/heads/trunk by this push:
new f092111d CASSSIDECAR-246: Restore compatibility in Sidecar client
(#216)
f092111d is described below
commit f092111d17a392ce0a1daec043dc7688c5032c49
Author: Francisco Guerrero <[email protected]>
AuthorDate: Fri May 9 18:44:58 2025 -0700
CASSSIDECAR-246: Restore compatibility in Sidecar client (#216)
Patch by Francisco Guerrero; reviewed by Yifan Cai for CASSSIDECAR-246
---
.../apache/cassandra/sidecar/{common => }/client/SidecarInstance.java | 2 +-
.../cassandra/sidecar/{common => }/client/SidecarInstanceImpl.java | 2 +-
.../src/main/java/org/apache/cassandra/sidecar/client/HttpClient.java | 2 --
.../main/java/org/apache/cassandra/sidecar/client/HttpResponse.java | 2 --
.../java/org/apache/cassandra/sidecar/client/HttpResponseImpl.java | 2 --
.../main/java/org/apache/cassandra/sidecar/client/RequestContext.java | 1 -
.../java/org/apache/cassandra/sidecar/client/RequestExecutor.java | 1 -
.../main/java/org/apache/cassandra/sidecar/client/SidecarClient.java | 1 -
.../cassandra/sidecar/client/SidecarClientBlobRestoreExtension.java | 1 -
.../org/apache/cassandra/sidecar/client/SidecarInstancesProvider.java | 2 --
.../cassandra/sidecar/client/SimpleSidecarInstancesProvider.java | 2 --
.../cassandra/sidecar/client/selection/InstanceSelectionPolicy.java | 2 +-
.../sidecar/client/selection/OrderedInstanceSelectionPolicy.java | 2 +-
.../sidecar/client/selection/RandomInstanceSelectionPolicy.java | 2 +-
.../sidecar/client/selection/SingleInstanceSelectionPolicy.java | 2 +-
.../org/apache/cassandra/sidecar/client/SidecarInstanceImplTest.java | 3 ---
.../java/org/apache/cassandra/sidecar/client/SidecarInstanceTest.java | 2 --
.../cassandra/sidecar/client/SimpleSidecarInstancesProviderTest.java | 2 --
.../sidecar/client/selection/OrderedInstanceSelectionPolicyTest.java | 2 +-
.../sidecar/client/selection/RandomInstanceSelectionPolicyTest.java | 2 +-
.../sidecar/client/selection/SingleInstanceSelectionPolicyTest.java | 2 +-
.../java/org/apache/cassandra/sidecar/client/SidecarClientTest.java | 3 +--
.../org/apache/cassandra/sidecar/client/request/BaseRequestTest.java | 2 +-
.../sidecar/health/SidecarPeerDownDetectorIntegrationTest.java | 2 +-
.../org/apache/cassandra/sidecar/codecs/SidecarInstanceCodec.java | 4 ++--
.../sidecar/coordination/CassandraClientTokenRingProvider.java | 2 +-
.../sidecar/coordination/DynamicSidecarInstancesProvider.java | 4 ++--
.../sidecar/coordination/InnerDcTokenAdjacentPeerProvider.java | 4 ++--
.../cassandra/sidecar/coordination/SidecarHttpHealthProvider.java | 2 +-
.../cassandra/sidecar/coordination/SidecarPeerHealthMonitorTask.java | 4 ++--
.../cassandra/sidecar/coordination/SidecarPeerHealthProvider.java | 2 +-
.../apache/cassandra/sidecar/coordination/SidecarPeerProvider.java | 2 +-
.../org/apache/cassandra/sidecar/coordination/TokenRingProvider.java | 2 +-
.../java/org/apache/cassandra/sidecar/server/SidecarServerEvents.java | 4 ++--
.../org/apache/cassandra/sidecar/codecs/SidecarInstanceCodecTest.java | 4 ++--
.../sidecar/coordination/InnerDcTokenAdjacentPeerProviderTests.java | 2 +-
.../org/apache/cassandra/sidecar/utils/SidecarClientProviderTest.java | 2 +-
.../java/org/apache/cassandra/sidecar/client/VertxHttpClient.java | 1 -
.../org/apache/cassandra/sidecar/client/VertxSidecarClientTest.java | 1 -
39 files changed, 31 insertions(+), 55 deletions(-)
diff --git
a/client-common/src/main/java/org/apache/cassandra/sidecar/common/client/SidecarInstance.java
b/client-common/src/main/java/org/apache/cassandra/sidecar/client/SidecarInstance.java
similarity index 95%
rename from
client-common/src/main/java/org/apache/cassandra/sidecar/common/client/SidecarInstance.java
rename to
client-common/src/main/java/org/apache/cassandra/sidecar/client/SidecarInstance.java
index 5d104f2b..1d2d1482 100644
---
a/client-common/src/main/java/org/apache/cassandra/sidecar/common/client/SidecarInstance.java
+++
b/client-common/src/main/java/org/apache/cassandra/sidecar/client/SidecarInstance.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.cassandra.sidecar.common.client;
+package org.apache.cassandra.sidecar.client;
/**
* Holds information about the Cassandra Sidecar Instance host and port
diff --git
a/client-common/src/main/java/org/apache/cassandra/sidecar/common/client/SidecarInstanceImpl.java
b/client-common/src/main/java/org/apache/cassandra/sidecar/client/SidecarInstanceImpl.java
similarity index 98%
rename from
client-common/src/main/java/org/apache/cassandra/sidecar/common/client/SidecarInstanceImpl.java
rename to
client-common/src/main/java/org/apache/cassandra/sidecar/client/SidecarInstanceImpl.java
index 0c973054..751218b1 100644
---
a/client-common/src/main/java/org/apache/cassandra/sidecar/common/client/SidecarInstanceImpl.java
+++
b/client-common/src/main/java/org/apache/cassandra/sidecar/client/SidecarInstanceImpl.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.cassandra.sidecar.common.client;
+package org.apache.cassandra.sidecar.client;
import java.util.Objects;
diff --git
a/client/src/main/java/org/apache/cassandra/sidecar/client/HttpClient.java
b/client/src/main/java/org/apache/cassandra/sidecar/client/HttpClient.java
index e920d755..9c6d9258 100644
--- a/client/src/main/java/org/apache/cassandra/sidecar/client/HttpClient.java
+++ b/client/src/main/java/org/apache/cassandra/sidecar/client/HttpClient.java
@@ -20,8 +20,6 @@ package org.apache.cassandra.sidecar.client;
import java.util.concurrent.CompletableFuture;
-import org.apache.cassandra.sidecar.common.client.SidecarInstance;
-
/**
* An interface to represent an HTTP client
*/
diff --git
a/client/src/main/java/org/apache/cassandra/sidecar/client/HttpResponse.java
b/client/src/main/java/org/apache/cassandra/sidecar/client/HttpResponse.java
index 3e1d7df5..38068575 100644
--- a/client/src/main/java/org/apache/cassandra/sidecar/client/HttpResponse.java
+++ b/client/src/main/java/org/apache/cassandra/sidecar/client/HttpResponse.java
@@ -22,8 +22,6 @@ import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Map;
-import org.apache.cassandra.sidecar.common.client.SidecarInstance;
-
/**
* Represents the HTTP response received from the remote Sidecar service
*/
diff --git
a/client/src/main/java/org/apache/cassandra/sidecar/client/HttpResponseImpl.java
b/client/src/main/java/org/apache/cassandra/sidecar/client/HttpResponseImpl.java
index f8b38207..9d273f47 100644
---
a/client/src/main/java/org/apache/cassandra/sidecar/client/HttpResponseImpl.java
+++
b/client/src/main/java/org/apache/cassandra/sidecar/client/HttpResponseImpl.java
@@ -23,8 +23,6 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
-import org.apache.cassandra.sidecar.common.client.SidecarInstance;
-
/**
* A simple implementation of the {@link HttpResponse}
*/
diff --git
a/client/src/main/java/org/apache/cassandra/sidecar/client/RequestContext.java
b/client/src/main/java/org/apache/cassandra/sidecar/client/RequestContext.java
index f782077d..21ee1822 100644
---
a/client/src/main/java/org/apache/cassandra/sidecar/client/RequestContext.java
+++
b/client/src/main/java/org/apache/cassandra/sidecar/client/RequestContext.java
@@ -28,7 +28,6 @@ import
org.apache.cassandra.sidecar.client.retry.NoRetryPolicy;
import org.apache.cassandra.sidecar.client.retry.RetryPolicy;
import org.apache.cassandra.sidecar.client.selection.InstanceSelectionPolicy;
import
org.apache.cassandra.sidecar.client.selection.SingleInstanceSelectionPolicy;
-import org.apache.cassandra.sidecar.common.client.SidecarInstance;
import org.apache.cassandra.sidecar.common.request.CassandraJmxHealthRequest;
import
org.apache.cassandra.sidecar.common.request.CassandraNativeHealthRequest;
import
org.apache.cassandra.sidecar.common.request.CleanSSTableUploadSessionRequest;
diff --git
a/client/src/main/java/org/apache/cassandra/sidecar/client/RequestExecutor.java
b/client/src/main/java/org/apache/cassandra/sidecar/client/RequestExecutor.java
index 745e2618..15f92aeb 100644
---
a/client/src/main/java/org/apache/cassandra/sidecar/client/RequestExecutor.java
+++
b/client/src/main/java/org/apache/cassandra/sidecar/client/RequestExecutor.java
@@ -32,7 +32,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.netty.handler.codec.http.HttpResponseStatus;
-import org.apache.cassandra.sidecar.common.client.SidecarInstance;
import org.apache.cassandra.sidecar.common.request.Request;
import org.apache.cassandra.sidecar.common.request.ResponseBytesDecoder;
diff --git
a/client/src/main/java/org/apache/cassandra/sidecar/client/SidecarClient.java
b/client/src/main/java/org/apache/cassandra/sidecar/client/SidecarClient.java
index 71910285..56b3b31c 100644
---
a/client/src/main/java/org/apache/cassandra/sidecar/client/SidecarClient.java
+++
b/client/src/main/java/org/apache/cassandra/sidecar/client/SidecarClient.java
@@ -36,7 +36,6 @@ import org.apache.cassandra.sidecar.client.retry.RetryPolicy;
import
org.apache.cassandra.sidecar.client.retry.RunnableOnStatusCodeRetryPolicy;
import org.apache.cassandra.sidecar.client.selection.InstanceSelectionPolicy;
import
org.apache.cassandra.sidecar.client.selection.RandomInstanceSelectionPolicy;
-import org.apache.cassandra.sidecar.common.client.SidecarInstance;
import org.apache.cassandra.sidecar.common.request.AbortRestoreJobRequest;
import org.apache.cassandra.sidecar.common.request.AllServicesConfigRequest;
import org.apache.cassandra.sidecar.common.request.CreateRestoreJobRequest;
diff --git
a/client/src/main/java/org/apache/cassandra/sidecar/client/SidecarClientBlobRestoreExtension.java
b/client/src/main/java/org/apache/cassandra/sidecar/client/SidecarClientBlobRestoreExtension.java
index 6cf81a00..6ff95155 100644
---
a/client/src/main/java/org/apache/cassandra/sidecar/client/SidecarClientBlobRestoreExtension.java
+++
b/client/src/main/java/org/apache/cassandra/sidecar/client/SidecarClientBlobRestoreExtension.java
@@ -22,7 +22,6 @@ package org.apache.cassandra.sidecar.client;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
-import org.apache.cassandra.sidecar.common.client.SidecarInstance;
import
org.apache.cassandra.sidecar.common.request.data.AbortRestoreJobRequestPayload;
import
org.apache.cassandra.sidecar.common.request.data.CreateRestoreJobRequestPayload;
import
org.apache.cassandra.sidecar.common.request.data.CreateSliceRequestPayload;
diff --git
a/client/src/main/java/org/apache/cassandra/sidecar/client/SidecarInstancesProvider.java
b/client/src/main/java/org/apache/cassandra/sidecar/client/SidecarInstancesProvider.java
index 1598bf54..313b019e 100644
---
a/client/src/main/java/org/apache/cassandra/sidecar/client/SidecarInstancesProvider.java
+++
b/client/src/main/java/org/apache/cassandra/sidecar/client/SidecarInstancesProvider.java
@@ -20,8 +20,6 @@ package org.apache.cassandra.sidecar.client;
import java.util.List;
-import org.apache.cassandra.sidecar.common.client.SidecarInstance;
-
/**
* A class that provides the list of {@link SidecarInstance}s. This class
allows for statically or dynamically
* providing a list of instances. It is meant to support expansions and shrink
of Cassandra clusters.
diff --git
a/client/src/main/java/org/apache/cassandra/sidecar/client/SimpleSidecarInstancesProvider.java
b/client/src/main/java/org/apache/cassandra/sidecar/client/SimpleSidecarInstancesProvider.java
index 41fc52de..70770049 100644
---
a/client/src/main/java/org/apache/cassandra/sidecar/client/SimpleSidecarInstancesProvider.java
+++
b/client/src/main/java/org/apache/cassandra/sidecar/client/SimpleSidecarInstancesProvider.java
@@ -22,8 +22,6 @@ package org.apache.cassandra.sidecar.client;
import java.util.Collections;
import java.util.List;
-import org.apache.cassandra.sidecar.common.client.SidecarInstance;
-
/**
* A {@link SidecarInstancesProvider} that returns Sidecar instances from a
list of instances.
*/
diff --git
a/client/src/main/java/org/apache/cassandra/sidecar/client/selection/InstanceSelectionPolicy.java
b/client/src/main/java/org/apache/cassandra/sidecar/client/selection/InstanceSelectionPolicy.java
index 56b6342b..d1d33bb5 100644
---
a/client/src/main/java/org/apache/cassandra/sidecar/client/selection/InstanceSelectionPolicy.java
+++
b/client/src/main/java/org/apache/cassandra/sidecar/client/selection/InstanceSelectionPolicy.java
@@ -18,7 +18,7 @@
package org.apache.cassandra.sidecar.client.selection;
-import org.apache.cassandra.sidecar.common.client.SidecarInstance;
+import org.apache.cassandra.sidecar.client.SidecarInstance;
/**
* Defines the selection policy for an instance
diff --git
a/client/src/main/java/org/apache/cassandra/sidecar/client/selection/OrderedInstanceSelectionPolicy.java
b/client/src/main/java/org/apache/cassandra/sidecar/client/selection/OrderedInstanceSelectionPolicy.java
index 1b936d9d..ecdca712 100644
---
a/client/src/main/java/org/apache/cassandra/sidecar/client/selection/OrderedInstanceSelectionPolicy.java
+++
b/client/src/main/java/org/apache/cassandra/sidecar/client/selection/OrderedInstanceSelectionPolicy.java
@@ -20,8 +20,8 @@ package org.apache.cassandra.sidecar.client.selection;
import java.util.Iterator;
+import org.apache.cassandra.sidecar.client.SidecarInstance;
import org.apache.cassandra.sidecar.client.SidecarInstancesProvider;
-import org.apache.cassandra.sidecar.common.client.SidecarInstance;
import org.jetbrains.annotations.NotNull;
/**
diff --git
a/client/src/main/java/org/apache/cassandra/sidecar/client/selection/RandomInstanceSelectionPolicy.java
b/client/src/main/java/org/apache/cassandra/sidecar/client/selection/RandomInstanceSelectionPolicy.java
index 3d08afd1..9864df0c 100644
---
a/client/src/main/java/org/apache/cassandra/sidecar/client/selection/RandomInstanceSelectionPolicy.java
+++
b/client/src/main/java/org/apache/cassandra/sidecar/client/selection/RandomInstanceSelectionPolicy.java
@@ -24,8 +24,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.concurrent.ThreadLocalRandom;
+import org.apache.cassandra.sidecar.client.SidecarInstance;
import org.apache.cassandra.sidecar.client.SidecarInstancesProvider;
-import org.apache.cassandra.sidecar.common.client.SidecarInstance;
import org.jetbrains.annotations.NotNull;
/**
diff --git
a/client/src/main/java/org/apache/cassandra/sidecar/client/selection/SingleInstanceSelectionPolicy.java
b/client/src/main/java/org/apache/cassandra/sidecar/client/selection/SingleInstanceSelectionPolicy.java
index a3156e7d..ecf0fc42 100644
---
a/client/src/main/java/org/apache/cassandra/sidecar/client/selection/SingleInstanceSelectionPolicy.java
+++
b/client/src/main/java/org/apache/cassandra/sidecar/client/selection/SingleInstanceSelectionPolicy.java
@@ -21,7 +21,7 @@ package org.apache.cassandra.sidecar.client.selection;
import java.util.Iterator;
import java.util.NoSuchElementException;
-import org.apache.cassandra.sidecar.common.client.SidecarInstance;
+import org.apache.cassandra.sidecar.client.SidecarInstance;
import org.jetbrains.annotations.NotNull;
/**
diff --git
a/client/src/test/java/org/apache/cassandra/sidecar/client/SidecarInstanceImplTest.java
b/client/src/test/java/org/apache/cassandra/sidecar/client/SidecarInstanceImplTest.java
index 48a6f275..8307eba7 100644
---
a/client/src/test/java/org/apache/cassandra/sidecar/client/SidecarInstanceImplTest.java
+++
b/client/src/test/java/org/apache/cassandra/sidecar/client/SidecarInstanceImplTest.java
@@ -18,9 +18,6 @@
package org.apache.cassandra.sidecar.client;
-import org.apache.cassandra.sidecar.common.client.SidecarInstance;
-import org.apache.cassandra.sidecar.common.client.SidecarInstanceImpl;
-
/**
* Unit tests for the {@link SidecarInstanceImpl} class
*/
diff --git
a/client/src/test/java/org/apache/cassandra/sidecar/client/SidecarInstanceTest.java
b/client/src/test/java/org/apache/cassandra/sidecar/client/SidecarInstanceTest.java
index dd5d748c..012dfe38 100644
---
a/client/src/test/java/org/apache/cassandra/sidecar/client/SidecarInstanceTest.java
+++
b/client/src/test/java/org/apache/cassandra/sidecar/client/SidecarInstanceTest.java
@@ -23,8 +23,6 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
-import org.apache.cassandra.sidecar.common.client.SidecarInstance;
-
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.assertj.core.api.Assertions.assertThatNullPointerException;
diff --git
a/client/src/test/java/org/apache/cassandra/sidecar/client/SimpleSidecarInstancesProviderTest.java
b/client/src/test/java/org/apache/cassandra/sidecar/client/SimpleSidecarInstancesProviderTest.java
index 2dfff97c..684da96f 100644
---
a/client/src/test/java/org/apache/cassandra/sidecar/client/SimpleSidecarInstancesProviderTest.java
+++
b/client/src/test/java/org/apache/cassandra/sidecar/client/SimpleSidecarInstancesProviderTest.java
@@ -23,8 +23,6 @@ import java.util.List;
import org.junit.jupiter.api.Test;
-import org.apache.cassandra.sidecar.common.client.SidecarInstanceImpl;
-
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static
org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
diff --git
a/client/src/test/java/org/apache/cassandra/sidecar/client/selection/OrderedInstanceSelectionPolicyTest.java
b/client/src/test/java/org/apache/cassandra/sidecar/client/selection/OrderedInstanceSelectionPolicyTest.java
index 2b3ff793..88d377ae 100644
---
a/client/src/test/java/org/apache/cassandra/sidecar/client/selection/OrderedInstanceSelectionPolicyTest.java
+++
b/client/src/test/java/org/apache/cassandra/sidecar/client/selection/OrderedInstanceSelectionPolicyTest.java
@@ -26,9 +26,9 @@ import java.util.NoSuchElementException;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.apache.cassandra.sidecar.client.SidecarInstance;
import org.apache.cassandra.sidecar.client.SidecarInstancesProvider;
import org.apache.cassandra.sidecar.client.SimpleSidecarInstancesProvider;
-import org.apache.cassandra.sidecar.common.client.SidecarInstance;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
diff --git
a/client/src/test/java/org/apache/cassandra/sidecar/client/selection/RandomInstanceSelectionPolicyTest.java
b/client/src/test/java/org/apache/cassandra/sidecar/client/selection/RandomInstanceSelectionPolicyTest.java
index 2ec756b7..20374d01 100644
---
a/client/src/test/java/org/apache/cassandra/sidecar/client/selection/RandomInstanceSelectionPolicyTest.java
+++
b/client/src/test/java/org/apache/cassandra/sidecar/client/selection/RandomInstanceSelectionPolicyTest.java
@@ -26,9 +26,9 @@ import java.util.NoSuchElementException;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.apache.cassandra.sidecar.client.SidecarInstance;
import org.apache.cassandra.sidecar.client.SidecarInstancesProvider;
import org.apache.cassandra.sidecar.client.SimpleSidecarInstancesProvider;
-import org.apache.cassandra.sidecar.common.client.SidecarInstance;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
diff --git
a/client/src/test/java/org/apache/cassandra/sidecar/client/selection/SingleInstanceSelectionPolicyTest.java
b/client/src/test/java/org/apache/cassandra/sidecar/client/selection/SingleInstanceSelectionPolicyTest.java
index 4d77befc..19fd5287 100644
---
a/client/src/test/java/org/apache/cassandra/sidecar/client/selection/SingleInstanceSelectionPolicyTest.java
+++
b/client/src/test/java/org/apache/cassandra/sidecar/client/selection/SingleInstanceSelectionPolicyTest.java
@@ -24,7 +24,7 @@ import java.util.NoSuchElementException;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.apache.cassandra.sidecar.common.client.SidecarInstance;
+import org.apache.cassandra.sidecar.client.SidecarInstance;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
diff --git
a/client/src/testFixtures/java/org/apache/cassandra/sidecar/client/SidecarClientTest.java
b/client/src/testFixtures/java/org/apache/cassandra/sidecar/client/SidecarClientTest.java
index 8ca82368..ad709b91 100644
---
a/client/src/testFixtures/java/org/apache/cassandra/sidecar/client/SidecarClientTest.java
+++
b/client/src/testFixtures/java/org/apache/cassandra/sidecar/client/SidecarClientTest.java
@@ -40,6 +40,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.function.Consumer;
import java.util.stream.Collectors;
+
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -62,8 +63,6 @@ import
org.apache.cassandra.sidecar.client.request.RequestExecutorTest;
import org.apache.cassandra.sidecar.client.retry.RetryAction;
import org.apache.cassandra.sidecar.client.retry.RetryPolicy;
import org.apache.cassandra.sidecar.common.ApiEndpointsV1;
-import org.apache.cassandra.sidecar.common.client.SidecarInstance;
-import org.apache.cassandra.sidecar.common.client.SidecarInstanceImpl;
import org.apache.cassandra.sidecar.common.data.OperationalJobStatus;
import org.apache.cassandra.sidecar.common.data.RestoreJobSecrets;
import org.apache.cassandra.sidecar.common.request.ImportSSTableRequest;
diff --git
a/client/src/testFixtures/java/org/apache/cassandra/sidecar/client/request/BaseRequestTest.java
b/client/src/testFixtures/java/org/apache/cassandra/sidecar/client/request/BaseRequestTest.java
index fec386ff..b05388d7 100644
---
a/client/src/testFixtures/java/org/apache/cassandra/sidecar/client/request/BaseRequestTest.java
+++
b/client/src/testFixtures/java/org/apache/cassandra/sidecar/client/request/BaseRequestTest.java
@@ -27,13 +27,13 @@ import org.apache.cassandra.sidecar.client.HttpClient;
import org.apache.cassandra.sidecar.client.HttpClientConfig;
import org.apache.cassandra.sidecar.client.RequestContext;
import org.apache.cassandra.sidecar.client.RequestExecutor;
+import org.apache.cassandra.sidecar.client.SidecarInstanceImpl;
import org.apache.cassandra.sidecar.client.SimpleSidecarInstancesProvider;
import org.apache.cassandra.sidecar.client.retry.NoRetryPolicy;
import org.apache.cassandra.sidecar.client.retry.RetryPolicy;
import org.apache.cassandra.sidecar.client.selection.InstanceSelectionPolicy;
import
org.apache.cassandra.sidecar.client.selection.OrderedInstanceSelectionPolicy;
import
org.apache.cassandra.sidecar.client.selection.RandomInstanceSelectionPolicy;
-import org.apache.cassandra.sidecar.common.client.SidecarInstanceImpl;
import org.jetbrains.annotations.NotNull;
/**
diff --git
a/integration-tests/src/integrationTest/org/apache/cassandra/sidecar/health/SidecarPeerDownDetectorIntegrationTest.java
b/integration-tests/src/integrationTest/org/apache/cassandra/sidecar/health/SidecarPeerDownDetectorIntegrationTest.java
index 1d7addc3..2c1d02bd 100644
---
a/integration-tests/src/integrationTest/org/apache/cassandra/sidecar/health/SidecarPeerDownDetectorIntegrationTest.java
+++
b/integration-tests/src/integrationTest/org/apache/cassandra/sidecar/health/SidecarPeerDownDetectorIntegrationTest.java
@@ -34,7 +34,7 @@ import com.google.inject.Provides;
import com.google.inject.Singleton;
import org.apache.cassandra.distributed.api.ICluster;
import org.apache.cassandra.distributed.api.IInstance;
-import org.apache.cassandra.sidecar.common.client.SidecarInstance;
+import org.apache.cassandra.sidecar.client.SidecarInstance;
import org.apache.cassandra.sidecar.common.server.dns.DnsResolver;
import org.apache.cassandra.sidecar.common.server.utils.DriverUtils;
import
org.apache.cassandra.sidecar.common.server.utils.MillisecondBoundConfiguration;
diff --git
a/server/src/main/java/org/apache/cassandra/sidecar/codecs/SidecarInstanceCodec.java
b/server/src/main/java/org/apache/cassandra/sidecar/codecs/SidecarInstanceCodec.java
index 1b9b7780..5b3ebb00 100644
---
a/server/src/main/java/org/apache/cassandra/sidecar/codecs/SidecarInstanceCodec.java
+++
b/server/src/main/java/org/apache/cassandra/sidecar/codecs/SidecarInstanceCodec.java
@@ -21,8 +21,8 @@ package org.apache.cassandra.sidecar.codecs;
import io.vertx.core.buffer.Buffer;
import io.vertx.core.eventbus.MessageCodec;
import io.vertx.core.eventbus.impl.CodecManager;
-import org.apache.cassandra.sidecar.common.client.SidecarInstance;
-import org.apache.cassandra.sidecar.common.client.SidecarInstanceImpl;
+import org.apache.cassandra.sidecar.client.SidecarInstance;
+import org.apache.cassandra.sidecar.client.SidecarInstanceImpl;
/**
* Codecs for Sidecar instances
diff --git
a/server/src/main/java/org/apache/cassandra/sidecar/coordination/CassandraClientTokenRingProvider.java
b/server/src/main/java/org/apache/cassandra/sidecar/coordination/CassandraClientTokenRingProvider.java
index dfb4fd40..d38bdba7 100644
---
a/server/src/main/java/org/apache/cassandra/sidecar/coordination/CassandraClientTokenRingProvider.java
+++
b/server/src/main/java/org/apache/cassandra/sidecar/coordination/CassandraClientTokenRingProvider.java
@@ -48,10 +48,10 @@ import com.datastax.driver.core.Metadata;
import com.datastax.driver.core.Token;
import com.google.inject.Inject;
import com.google.inject.Singleton;
+import org.apache.cassandra.sidecar.client.SidecarInstance;
import org.apache.cassandra.sidecar.cluster.InstancesMetadata;
import org.apache.cassandra.sidecar.cluster.instance.InstanceMetadata;
import org.apache.cassandra.sidecar.cluster.locator.LocalTokenRangesProvider;
-import org.apache.cassandra.sidecar.common.client.SidecarInstance;
import org.apache.cassandra.sidecar.common.server.cluster.locator.Partitioner;
import org.apache.cassandra.sidecar.common.server.cluster.locator.Partitioners;
import org.apache.cassandra.sidecar.common.server.cluster.locator.TokenRange;
diff --git
a/server/src/main/java/org/apache/cassandra/sidecar/coordination/DynamicSidecarInstancesProvider.java
b/server/src/main/java/org/apache/cassandra/sidecar/coordination/DynamicSidecarInstancesProvider.java
index 7352741d..6db2c853 100644
---
a/server/src/main/java/org/apache/cassandra/sidecar/coordination/DynamicSidecarInstancesProvider.java
+++
b/server/src/main/java/org/apache/cassandra/sidecar/coordination/DynamicSidecarInstancesProvider.java
@@ -21,10 +21,10 @@ package org.apache.cassandra.sidecar.coordination;
import java.util.List;
import java.util.stream.Collectors;
+import org.apache.cassandra.sidecar.client.SidecarInstance;
+import org.apache.cassandra.sidecar.client.SidecarInstanceImpl;
import org.apache.cassandra.sidecar.client.SidecarInstancesProvider;
import org.apache.cassandra.sidecar.cluster.InstancesMetadata;
-import org.apache.cassandra.sidecar.common.client.SidecarInstance;
-import org.apache.cassandra.sidecar.common.client.SidecarInstanceImpl;
import org.apache.cassandra.sidecar.config.ServiceConfiguration;
/**
diff --git
a/server/src/main/java/org/apache/cassandra/sidecar/coordination/InnerDcTokenAdjacentPeerProvider.java
b/server/src/main/java/org/apache/cassandra/sidecar/coordination/InnerDcTokenAdjacentPeerProvider.java
index 5941da03..9ca0df43 100644
---
a/server/src/main/java/org/apache/cassandra/sidecar/coordination/InnerDcTokenAdjacentPeerProvider.java
+++
b/server/src/main/java/org/apache/cassandra/sidecar/coordination/InnerDcTokenAdjacentPeerProvider.java
@@ -43,8 +43,8 @@ import com.datastax.driver.core.KeyspaceMetadata;
import com.datastax.driver.core.Metadata;
import com.google.inject.Inject;
import com.google.inject.Singleton;
-import org.apache.cassandra.sidecar.common.client.SidecarInstance;
-import org.apache.cassandra.sidecar.common.client.SidecarInstanceImpl;
+import org.apache.cassandra.sidecar.client.SidecarInstance;
+import org.apache.cassandra.sidecar.client.SidecarInstanceImpl;
import org.apache.cassandra.sidecar.common.server.cluster.locator.Token;
import org.apache.cassandra.sidecar.common.server.cluster.locator.TokenRange;
import org.apache.cassandra.sidecar.common.server.dns.DnsResolver;
diff --git
a/server/src/main/java/org/apache/cassandra/sidecar/coordination/SidecarHttpHealthProvider.java
b/server/src/main/java/org/apache/cassandra/sidecar/coordination/SidecarHttpHealthProvider.java
index 63eef1a3..008d3871 100644
---
a/server/src/main/java/org/apache/cassandra/sidecar/coordination/SidecarHttpHealthProvider.java
+++
b/server/src/main/java/org/apache/cassandra/sidecar/coordination/SidecarHttpHealthProvider.java
@@ -24,7 +24,7 @@ import com.google.inject.Inject;
import com.google.inject.Singleton;
import io.vertx.core.Future;
import org.apache.cassandra.sidecar.client.SidecarClient;
-import org.apache.cassandra.sidecar.common.client.SidecarInstance;
+import org.apache.cassandra.sidecar.client.SidecarInstance;
import org.apache.cassandra.sidecar.common.response.HealthResponse;
import org.apache.cassandra.sidecar.utils.SidecarClientProvider;
diff --git
a/server/src/main/java/org/apache/cassandra/sidecar/coordination/SidecarPeerHealthMonitorTask.java
b/server/src/main/java/org/apache/cassandra/sidecar/coordination/SidecarPeerHealthMonitorTask.java
index c5541fe7..e2ae016b 100644
---
a/server/src/main/java/org/apache/cassandra/sidecar/coordination/SidecarPeerHealthMonitorTask.java
+++
b/server/src/main/java/org/apache/cassandra/sidecar/coordination/SidecarPeerHealthMonitorTask.java
@@ -34,9 +34,9 @@ import io.vertx.core.Future;
import io.vertx.core.Promise;
import io.vertx.core.Vertx;
import io.vertx.core.eventbus.EventBus;
+import org.apache.cassandra.sidecar.client.SidecarInstance;
+import org.apache.cassandra.sidecar.client.SidecarInstanceImpl;
import org.apache.cassandra.sidecar.codecs.SidecarInstanceCodec;
-import org.apache.cassandra.sidecar.common.client.SidecarInstance;
-import org.apache.cassandra.sidecar.common.client.SidecarInstanceImpl;
import org.apache.cassandra.sidecar.common.server.utils.DurationSpec;
import org.apache.cassandra.sidecar.config.SidecarConfiguration;
import org.apache.cassandra.sidecar.config.SidecarPeerHealthConfiguration;
diff --git
a/server/src/main/java/org/apache/cassandra/sidecar/coordination/SidecarPeerHealthProvider.java
b/server/src/main/java/org/apache/cassandra/sidecar/coordination/SidecarPeerHealthProvider.java
index 5658e020..e867e15b 100644
---
a/server/src/main/java/org/apache/cassandra/sidecar/coordination/SidecarPeerHealthProvider.java
+++
b/server/src/main/java/org/apache/cassandra/sidecar/coordination/SidecarPeerHealthProvider.java
@@ -20,7 +20,7 @@ package org.apache.cassandra.sidecar.coordination;
import io.vertx.core.Future;
-import org.apache.cassandra.sidecar.common.client.SidecarInstance;
+import org.apache.cassandra.sidecar.client.SidecarInstance;
/**
* Interface to provide health information for other Sidecar instances
diff --git
a/server/src/main/java/org/apache/cassandra/sidecar/coordination/SidecarPeerProvider.java
b/server/src/main/java/org/apache/cassandra/sidecar/coordination/SidecarPeerProvider.java
index 7c8734c0..edc7e1a8 100644
---
a/server/src/main/java/org/apache/cassandra/sidecar/coordination/SidecarPeerProvider.java
+++
b/server/src/main/java/org/apache/cassandra/sidecar/coordination/SidecarPeerProvider.java
@@ -20,7 +20,7 @@ package org.apache.cassandra.sidecar.coordination;
import java.util.Set;
-import org.apache.cassandra.sidecar.common.client.SidecarInstance;
+import org.apache.cassandra.sidecar.client.SidecarInstance;
/**
* Provides a set of Sidecar peers
diff --git
a/server/src/main/java/org/apache/cassandra/sidecar/coordination/TokenRingProvider.java
b/server/src/main/java/org/apache/cassandra/sidecar/coordination/TokenRingProvider.java
index 7f64f634..c3a67630 100644
---
a/server/src/main/java/org/apache/cassandra/sidecar/coordination/TokenRingProvider.java
+++
b/server/src/main/java/org/apache/cassandra/sidecar/coordination/TokenRingProvider.java
@@ -33,9 +33,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.datastax.driver.core.Host;
+import org.apache.cassandra.sidecar.client.SidecarInstance;
import org.apache.cassandra.sidecar.cluster.InstancesMetadata;
import org.apache.cassandra.sidecar.cluster.instance.InstanceMetadata;
-import org.apache.cassandra.sidecar.common.client.SidecarInstance;
import org.apache.cassandra.sidecar.common.response.NodeSettings;
import org.apache.cassandra.sidecar.common.server.cluster.locator.Partitioner;
import org.apache.cassandra.sidecar.common.server.cluster.locator.Partitioners;
diff --git
a/server/src/main/java/org/apache/cassandra/sidecar/server/SidecarServerEvents.java
b/server/src/main/java/org/apache/cassandra/sidecar/server/SidecarServerEvents.java
index 8867cc48..7763ef75 100644
---
a/server/src/main/java/org/apache/cassandra/sidecar/server/SidecarServerEvents.java
+++
b/server/src/main/java/org/apache/cassandra/sidecar/server/SidecarServerEvents.java
@@ -90,14 +90,14 @@ public enum SidecarServerEvents
/**
* The {@link io.vertx.core.eventbus.EventBus} address where events will
be published when the health of a Sidecar
- * peer instance is marked as DOWN, including in the payload the {@link
org.apache.cassandra.sidecar.common.client.SidecarInstance}
+ * peer instance is marked as DOWN, including in the payload the {@link
org.apache.cassandra.sidecar.client.SidecarInstance}
* whose status changed.
*/
ON_SIDECAR_PEER_DOWN,
/**
* The {@link io.vertx.core.eventbus.EventBus} address where events will
be published when the health of a Sidecar
- * peer instance is marked as UP, including in the payload the {@link
org.apache.cassandra.sidecar.common.client.SidecarInstance}
+ * peer instance is marked as UP, including in the payload the {@link
org.apache.cassandra.sidecar.client.SidecarInstance}
* whose status changed.
*/
ON_SIDECAR_PEER_UP,
diff --git
a/server/src/test/java/org/apache/cassandra/sidecar/codecs/SidecarInstanceCodecTest.java
b/server/src/test/java/org/apache/cassandra/sidecar/codecs/SidecarInstanceCodecTest.java
index 36b792a4..8b0d3a6f 100644
---
a/server/src/test/java/org/apache/cassandra/sidecar/codecs/SidecarInstanceCodecTest.java
+++
b/server/src/test/java/org/apache/cassandra/sidecar/codecs/SidecarInstanceCodecTest.java
@@ -29,8 +29,8 @@ import io.vertx.core.Vertx;
import io.vertx.core.buffer.Buffer;
import io.vertx.core.eventbus.EventBus;
import org.apache.cassandra.sidecar.TestResourceReaper;
-import org.apache.cassandra.sidecar.common.client.SidecarInstance;
-import org.apache.cassandra.sidecar.common.client.SidecarInstanceImpl;
+import org.apache.cassandra.sidecar.client.SidecarInstance;
+import org.apache.cassandra.sidecar.client.SidecarInstanceImpl;
import static org.apache.cassandra.testing.utils.AssertionUtils.getBlocking;
import static org.assertj.core.api.Assertions.assertThat;
diff --git
a/server/src/test/java/org/apache/cassandra/sidecar/coordination/InnerDcTokenAdjacentPeerProviderTests.java
b/server/src/test/java/org/apache/cassandra/sidecar/coordination/InnerDcTokenAdjacentPeerProviderTests.java
index 61e4c9ae..ea208db7 100644
---
a/server/src/test/java/org/apache/cassandra/sidecar/coordination/InnerDcTokenAdjacentPeerProviderTests.java
+++
b/server/src/test/java/org/apache/cassandra/sidecar/coordination/InnerDcTokenAdjacentPeerProviderTests.java
@@ -41,9 +41,9 @@ import com.datastax.driver.core.Host;
import com.datastax.driver.core.KeyspaceMetadata;
import com.datastax.driver.core.Metadata;
import com.datastax.driver.core.Token;
+import org.apache.cassandra.sidecar.client.SidecarInstance;
import org.apache.cassandra.sidecar.cluster.CassandraAdapterDelegate;
import org.apache.cassandra.sidecar.cluster.instance.InstanceMetadata;
-import org.apache.cassandra.sidecar.common.client.SidecarInstance;
import org.apache.cassandra.sidecar.common.server.cluster.locator.TokenRange;
import org.apache.cassandra.sidecar.common.server.dns.DnsResolver;
import org.apache.cassandra.sidecar.common.server.utils.DriverUtils;
diff --git
a/server/src/test/java/org/apache/cassandra/sidecar/utils/SidecarClientProviderTest.java
b/server/src/test/java/org/apache/cassandra/sidecar/utils/SidecarClientProviderTest.java
index 1f3d7187..9926a7d8 100644
---
a/server/src/test/java/org/apache/cassandra/sidecar/utils/SidecarClientProviderTest.java
+++
b/server/src/test/java/org/apache/cassandra/sidecar/utils/SidecarClientProviderTest.java
@@ -38,7 +38,7 @@ import com.google.inject.util.Modules;
import io.vertx.core.Vertx;
import org.apache.cassandra.sidecar.TestModule;
import org.apache.cassandra.sidecar.client.SidecarClient;
-import org.apache.cassandra.sidecar.common.client.SidecarInstanceImpl;
+import org.apache.cassandra.sidecar.client.SidecarInstanceImpl;
import org.apache.cassandra.sidecar.common.response.HealthResponse;
import
org.apache.cassandra.sidecar.common.server.utils.SecondBoundConfiguration;
import org.apache.cassandra.sidecar.config.SidecarClientConfiguration;
diff --git
a/vertx-client/src/main/java/org/apache/cassandra/sidecar/client/VertxHttpClient.java
b/vertx-client/src/main/java/org/apache/cassandra/sidecar/client/VertxHttpClient.java
index 2db8a9c6..a0c2f35c 100644
---
a/vertx-client/src/main/java/org/apache/cassandra/sidecar/client/VertxHttpClient.java
+++
b/vertx-client/src/main/java/org/apache/cassandra/sidecar/client/VertxHttpClient.java
@@ -54,7 +54,6 @@ import io.vertx.ext.web.client.WebClient;
import io.vertx.ext.web.client.WebClientOptions;
import io.vertx.ext.web.client.predicate.ResponsePredicateResult;
import io.vertx.ext.web.codec.BodyCodec;
-import org.apache.cassandra.sidecar.common.client.SidecarInstance;
import org.apache.cassandra.sidecar.common.request.Request;
import org.apache.cassandra.sidecar.common.request.UploadableRequest;
diff --git
a/vertx-client/src/test/java/org/apache/cassandra/sidecar/client/VertxSidecarClientTest.java
b/vertx-client/src/test/java/org/apache/cassandra/sidecar/client/VertxSidecarClientTest.java
index 5d3997e5..f7c1e034 100644
---
a/vertx-client/src/test/java/org/apache/cassandra/sidecar/client/VertxSidecarClientTest.java
+++
b/vertx-client/src/test/java/org/apache/cassandra/sidecar/client/VertxSidecarClientTest.java
@@ -24,7 +24,6 @@ import java.util.List;
import io.vertx.core.Vertx;
import org.apache.cassandra.sidecar.client.retry.ExponentialBackoffRetryPolicy;
import org.apache.cassandra.sidecar.client.retry.RetryPolicy;
-import org.apache.cassandra.sidecar.common.client.SidecarInstanceImpl;
/**
* Unit tests for the {@link SidecarClient} using vertx
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
