This is an automated email from the ASF dual-hosted git repository.
bernardobotella pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-analytics.git
The following commit(s) were added to refs/heads/trunk by this push:
new 0bacfbe0 CASSANALYTICS-93: Update sidecar version to 0.2.0 (#145)
0bacfbe0 is described below
commit 0bacfbe0c3ac77e38567c907cbc303cd781ac584
Author: Bernardo Botella <[email protected]>
AuthorDate: Wed Oct 15 13:09:22 2025 -0700
CASSANALYTICS-93: Update sidecar version to 0.2.0 (#145)
Patch by Bernardo Botella; Reviewed by Francisco Guerrero for
CASSANALYTICS-93
---
CHANGES.txt | 1 +
.../sidecar/client}/HttpClientConfigTest.java | 0
.../sidecar/client}/SidecarClientConfigTest.java | 0
.../sidecar/client}/SidecarInstanceImplTest.java | 0
.../sidecar/client}/SidecarInstanceTest.java | 0
.../SimpleSidecarInstancesProviderTest.java | 0
.../sidecar/client}/StreamBufferTest.java | 0
.../sidecar/client}/request/JsonRequestTest.java | 0
.../request/JsonResponseBytesDecoderTest.java | 0
.../client}/retry/BasicRetryPolicyTest.java | 0
.../retry/ExponentialBackoffRetryPolicyTest.java | 0
.../retry/IgnoreConflictRetryPolicyTest.java | 0
.../sidecar/client}/retry/NoRetryPolicyTest.java | 0
.../retry/RunnableOnStatusCodeRetryPolicyTest.java | 0
.../OrderedInstanceSelectionPolicyTest.java | 0
.../RandomInstanceSelectionPolicyTest.java | 0
.../SingleInstanceSelectionPolicyTest.java | 0
analytics-sidecar-vertx-client-shaded/build.gradle | 1 +
.../cassandra/cdc/sidecar/SidecarCdcBuilder.java | 4 ++--
.../cassandra/cdc/sidecar/SidecarCdcClient.java | 8 ++++----
.../cassandra/clients/AnalyticsSidecarClient.java | 10 +++++-----
.../cassandra/spark/bulkwriter/BulkSparkConf.java | 2 +-
.../spark/bulkwriter/CassandraClusterInfo.java | 4 ++--
.../spark/bulkwriter/CassandraContext.java | 6 +++---
.../spark/bulkwriter/SidecarDataTransferApi.java | 4 ++--
.../cloudstorage/CloudStorageDataTransferApi.java | 2 +-
.../CloudStorageDataTransferApiImpl.java | 12 ++++++------
.../cloudstorage/CloudStorageStreamSession.java | 2 +-
.../cloudstorage/ImportCompletionCoordinator.java | 2 +-
.../CoordinatedCloudStorageDataTransferApi.java | 8 ++++----
.../coordinated/CoordinatedWriteConf.java | 2 +-
.../spark/common/SidecarInstanceFactory.java | 2 +-
.../cassandra/spark/common/SizingFactory.java | 2 +-
.../cassandra/spark/data/CassandraDataLayer.java | 10 +++++-----
.../spark/data/SidecarProvisionedSSTable.java | 4 ++--
.../spark/data/SidecarTableSizeProvider.java | 6 +++---
.../spark/validation/CassandraValidation.java | 2 +-
.../spark/validation/SidecarValidation.java | 2 +-
.../cassandra/clients/SidecarInstanceTest.java | 2 +-
.../spark/bulkwriter/BulkSparkConfTest.java | 2 +-
.../CloudStorageDataTransferApiFactoryTest.java | 2 +-
.../CloudStorageStreamSessionTest.java | 4 ++--
.../ImportCompletionCoordinatorTest.java | 6 +++---
.../coordinated/CoordinatedWriteConfTest.java | 4 ++--
.../spark/data/SidecarProvisionedSSTableTest.java | 4 ++--
.../spark/common/SidecarInstanceFactoryTest.java | 2 +-
.../sidecar/testing/LocalhostResolver.java | 3 ++-
.../testing/SharedClusterIntegrationTestBase.java | 17 +++++++++--------
.../correctness/BulkWriteCorruptionTest.java | 2 +-
.../CoordinatedBulkWriteSimpleTest.java | 5 +++--
.../java/org/apache/cassandra/clients/Sidecar.java | 22 +++++++++++-----------
.../clients/SidecarStreamConsumerAdapter.java | 12 ++++++------
gradle.properties | 2 +-
53 files changed, 95 insertions(+), 90 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index cfb8ca70..7ce881e4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,6 @@
0.2.0
-----
+ * Bump sidecar dependency to 0.2.0 (CASSANALYTICS-93)
* Support for Trie-Indexed SSTables (BTI format) (CASSANALYTICS-27)
* Add extractCdcTables method to CqlUtils (CASSANALYTICS-91)
* Create bridge modules for Cassandra 5.0 (CASSANALYTICS-84)
diff --git
a/analytics-sidecar-client/src/test/java/org.apache.cassandra.sidecar.client/HttpClientConfigTest.java
b/analytics-sidecar-client/src/test/java/org/apache/cassandra/sidecar/client/HttpClientConfigTest.java
similarity index 100%
rename from
analytics-sidecar-client/src/test/java/org.apache.cassandra.sidecar.client/HttpClientConfigTest.java
rename to
analytics-sidecar-client/src/test/java/org/apache/cassandra/sidecar/client/HttpClientConfigTest.java
diff --git
a/analytics-sidecar-client/src/test/java/org.apache.cassandra.sidecar.client/SidecarClientConfigTest.java
b/analytics-sidecar-client/src/test/java/org/apache/cassandra/sidecar/client/SidecarClientConfigTest.java
similarity index 100%
rename from
analytics-sidecar-client/src/test/java/org.apache.cassandra.sidecar.client/SidecarClientConfigTest.java
rename to
analytics-sidecar-client/src/test/java/org/apache/cassandra/sidecar/client/SidecarClientConfigTest.java
diff --git
a/analytics-sidecar-client/src/test/java/org.apache.cassandra.sidecar.client/SidecarInstanceImplTest.java
b/analytics-sidecar-client/src/test/java/org/apache/cassandra/sidecar/client/SidecarInstanceImplTest.java
similarity index 100%
rename from
analytics-sidecar-client/src/test/java/org.apache.cassandra.sidecar.client/SidecarInstanceImplTest.java
rename to
analytics-sidecar-client/src/test/java/org/apache/cassandra/sidecar/client/SidecarInstanceImplTest.java
diff --git
a/analytics-sidecar-client/src/test/java/org.apache.cassandra.sidecar.client/SidecarInstanceTest.java
b/analytics-sidecar-client/src/test/java/org/apache/cassandra/sidecar/client/SidecarInstanceTest.java
similarity index 100%
rename from
analytics-sidecar-client/src/test/java/org.apache.cassandra.sidecar.client/SidecarInstanceTest.java
rename to
analytics-sidecar-client/src/test/java/org/apache/cassandra/sidecar/client/SidecarInstanceTest.java
diff --git
a/analytics-sidecar-client/src/test/java/org.apache.cassandra.sidecar.client/SimpleSidecarInstancesProviderTest.java
b/analytics-sidecar-client/src/test/java/org/apache/cassandra/sidecar/client/SimpleSidecarInstancesProviderTest.java
similarity index 100%
rename from
analytics-sidecar-client/src/test/java/org.apache.cassandra.sidecar.client/SimpleSidecarInstancesProviderTest.java
rename to
analytics-sidecar-client/src/test/java/org/apache/cassandra/sidecar/client/SimpleSidecarInstancesProviderTest.java
diff --git
a/analytics-sidecar-client/src/test/java/org.apache.cassandra.sidecar.client/StreamBufferTest.java
b/analytics-sidecar-client/src/test/java/org/apache/cassandra/sidecar/client/StreamBufferTest.java
similarity index 100%
rename from
analytics-sidecar-client/src/test/java/org.apache.cassandra.sidecar.client/StreamBufferTest.java
rename to
analytics-sidecar-client/src/test/java/org/apache/cassandra/sidecar/client/StreamBufferTest.java
diff --git
a/analytics-sidecar-client/src/test/java/org.apache.cassandra.sidecar.client/request/JsonRequestTest.java
b/analytics-sidecar-client/src/test/java/org/apache/cassandra/sidecar/client/request/JsonRequestTest.java
similarity index 100%
rename from
analytics-sidecar-client/src/test/java/org.apache.cassandra.sidecar.client/request/JsonRequestTest.java
rename to
analytics-sidecar-client/src/test/java/org/apache/cassandra/sidecar/client/request/JsonRequestTest.java
diff --git
a/analytics-sidecar-client/src/test/java/org.apache.cassandra.sidecar.client/request/JsonResponseBytesDecoderTest.java
b/analytics-sidecar-client/src/test/java/org/apache/cassandra/sidecar/client/request/JsonResponseBytesDecoderTest.java
similarity index 100%
rename from
analytics-sidecar-client/src/test/java/org.apache.cassandra.sidecar.client/request/JsonResponseBytesDecoderTest.java
rename to
analytics-sidecar-client/src/test/java/org/apache/cassandra/sidecar/client/request/JsonResponseBytesDecoderTest.java
diff --git
a/analytics-sidecar-client/src/test/java/org.apache.cassandra.sidecar.client/retry/BasicRetryPolicyTest.java
b/analytics-sidecar-client/src/test/java/org/apache/cassandra/sidecar/client/retry/BasicRetryPolicyTest.java
similarity index 100%
rename from
analytics-sidecar-client/src/test/java/org.apache.cassandra.sidecar.client/retry/BasicRetryPolicyTest.java
rename to
analytics-sidecar-client/src/test/java/org/apache/cassandra/sidecar/client/retry/BasicRetryPolicyTest.java
diff --git
a/analytics-sidecar-client/src/test/java/org.apache.cassandra.sidecar.client/retry/ExponentialBackoffRetryPolicyTest.java
b/analytics-sidecar-client/src/test/java/org/apache/cassandra/sidecar/client/retry/ExponentialBackoffRetryPolicyTest.java
similarity index 100%
rename from
analytics-sidecar-client/src/test/java/org.apache.cassandra.sidecar.client/retry/ExponentialBackoffRetryPolicyTest.java
rename to
analytics-sidecar-client/src/test/java/org/apache/cassandra/sidecar/client/retry/ExponentialBackoffRetryPolicyTest.java
diff --git
a/analytics-sidecar-client/src/test/java/org.apache.cassandra.sidecar.client/retry/IgnoreConflictRetryPolicyTest.java
b/analytics-sidecar-client/src/test/java/org/apache/cassandra/sidecar/client/retry/IgnoreConflictRetryPolicyTest.java
similarity index 100%
rename from
analytics-sidecar-client/src/test/java/org.apache.cassandra.sidecar.client/retry/IgnoreConflictRetryPolicyTest.java
rename to
analytics-sidecar-client/src/test/java/org/apache/cassandra/sidecar/client/retry/IgnoreConflictRetryPolicyTest.java
diff --git
a/analytics-sidecar-client/src/test/java/org.apache.cassandra.sidecar.client/retry/NoRetryPolicyTest.java
b/analytics-sidecar-client/src/test/java/org/apache/cassandra/sidecar/client/retry/NoRetryPolicyTest.java
similarity index 100%
rename from
analytics-sidecar-client/src/test/java/org.apache.cassandra.sidecar.client/retry/NoRetryPolicyTest.java
rename to
analytics-sidecar-client/src/test/java/org/apache/cassandra/sidecar/client/retry/NoRetryPolicyTest.java
diff --git
a/analytics-sidecar-client/src/test/java/org.apache.cassandra.sidecar.client/retry/RunnableOnStatusCodeRetryPolicyTest.java
b/analytics-sidecar-client/src/test/java/org/apache/cassandra/sidecar/client/retry/RunnableOnStatusCodeRetryPolicyTest.java
similarity index 100%
rename from
analytics-sidecar-client/src/test/java/org.apache.cassandra.sidecar.client/retry/RunnableOnStatusCodeRetryPolicyTest.java
rename to
analytics-sidecar-client/src/test/java/org/apache/cassandra/sidecar/client/retry/RunnableOnStatusCodeRetryPolicyTest.java
diff --git
a/analytics-sidecar-client/src/test/java/org.apache.cassandra.sidecar.client/selection/OrderedInstanceSelectionPolicyTest.java
b/analytics-sidecar-client/src/test/java/org/apache/cassandra/sidecar/client/selection/OrderedInstanceSelectionPolicyTest.java
similarity index 100%
rename from
analytics-sidecar-client/src/test/java/org.apache.cassandra.sidecar.client/selection/OrderedInstanceSelectionPolicyTest.java
rename to
analytics-sidecar-client/src/test/java/org/apache/cassandra/sidecar/client/selection/OrderedInstanceSelectionPolicyTest.java
diff --git
a/analytics-sidecar-client/src/test/java/org.apache.cassandra.sidecar.client/selection/RandomInstanceSelectionPolicyTest.java
b/analytics-sidecar-client/src/test/java/org/apache/cassandra/sidecar/client/selection/RandomInstanceSelectionPolicyTest.java
similarity index 100%
rename from
analytics-sidecar-client/src/test/java/org.apache.cassandra.sidecar.client/selection/RandomInstanceSelectionPolicyTest.java
rename to
analytics-sidecar-client/src/test/java/org/apache/cassandra/sidecar/client/selection/RandomInstanceSelectionPolicyTest.java
diff --git
a/analytics-sidecar-client/src/test/java/org.apache.cassandra.sidecar.client/selection/SingleInstanceSelectionPolicyTest.java
b/analytics-sidecar-client/src/test/java/org/apache/cassandra/sidecar/client/selection/SingleInstanceSelectionPolicyTest.java
similarity index 100%
rename from
analytics-sidecar-client/src/test/java/org.apache.cassandra.sidecar.client/selection/SingleInstanceSelectionPolicyTest.java
rename to
analytics-sidecar-client/src/test/java/org/apache/cassandra/sidecar/client/selection/SingleInstanceSelectionPolicyTest.java
diff --git a/analytics-sidecar-vertx-client-shaded/build.gradle
b/analytics-sidecar-vertx-client-shaded/build.gradle
index 52d36e99..1d1bdeb1 100644
--- a/analytics-sidecar-vertx-client-shaded/build.gradle
+++ b/analytics-sidecar-vertx-client-shaded/build.gradle
@@ -75,6 +75,7 @@ shadowJar {
relocate 'com.fasterxml.jackson',
'o.a.c.sidecar.client.shaded.com.fasterxml.jackson'
relocate 'io.netty', 'o.a.c.sidecar.client.shaded.io.netty'
relocate 'io.vertx', 'o.a.c.sidecar.client.shaded.io.vertx'
+ relocate 'org.apache.cassandra.sidecar.client',
'o.a.c.sidecar.client.shaded.client'
relocate 'META-INF/native/libnetty',
'META-INF/native/libo_a_c_sidecar_client_shaded_netty'
relocate 'META-INF/versions/11/io/vertx',
'META-INF/versions/11/o/a/c/sidecar/client/shaded/io/vertx'
transform(NettyResourceTransformer.class)
diff --git
a/cassandra-analytics-cdc-sidecar/src/main/java/org/apache/cassandra/cdc/sidecar/SidecarCdcBuilder.java
b/cassandra-analytics-cdc-sidecar/src/main/java/org/apache/cassandra/cdc/sidecar/SidecarCdcBuilder.java
index b64d1871..b03695b3 100644
---
a/cassandra-analytics-cdc-sidecar/src/main/java/org/apache/cassandra/cdc/sidecar/SidecarCdcBuilder.java
+++
b/cassandra-analytics-cdc-sidecar/src/main/java/org/apache/cassandra/cdc/sidecar/SidecarCdcBuilder.java
@@ -31,8 +31,8 @@ import org.apache.cassandra.cdc.api.TokenRangeSupplier;
import org.apache.cassandra.cdc.stats.ICdcStats;
import org.apache.cassandra.clients.Sidecar;
import org.apache.cassandra.secrets.SecretsProvider;
-import org.apache.cassandra.sidecar.client.SidecarClient;
-import org.apache.cassandra.sidecar.client.SidecarInstancesProvider;
+import o.a.c.sidecar.client.shaded.client.SidecarClient;
+import o.a.c.sidecar.client.shaded.client.SidecarInstancesProvider;
import org.apache.cassandra.spark.utils.AsyncExecutor;
import org.jetbrains.annotations.NotNull;
diff --git
a/cassandra-analytics-cdc-sidecar/src/main/java/org/apache/cassandra/cdc/sidecar/SidecarCdcClient.java
b/cassandra-analytics-cdc-sidecar/src/main/java/org/apache/cassandra/cdc/sidecar/SidecarCdcClient.java
index 16ae3eda..585b48d2 100644
---
a/cassandra-analytics-cdc-sidecar/src/main/java/org/apache/cassandra/cdc/sidecar/SidecarCdcClient.java
+++
b/cassandra-analytics-cdc-sidecar/src/main/java/org/apache/cassandra/cdc/sidecar/SidecarCdcClient.java
@@ -29,9 +29,9 @@ import o.a.c.sidecar.client.shaded.common.utils.HttpRange;
import org.apache.cassandra.cdc.api.CommitLog;
import org.apache.cassandra.cdc.stats.ICdcStats;
import org.apache.cassandra.clients.Sidecar;
-import org.apache.cassandra.sidecar.client.SidecarClient;
-import org.apache.cassandra.sidecar.client.SidecarInstance;
-import org.apache.cassandra.sidecar.client.StreamBuffer;
+import o.a.c.sidecar.client.shaded.client.SidecarClient;
+import o.a.c.sidecar.client.shaded.client.SidecarInstance;
+import o.a.c.sidecar.client.shaded.client.StreamBuffer;
import org.apache.cassandra.spark.data.partitioner.CassandraInstance;
import org.apache.cassandra.spark.exceptions.TransportFailureException;
import org.apache.cassandra.spark.utils.ThrowableUtils;
@@ -80,7 +80,7 @@ public class SidecarCdcClient
public void streamCdcCommitLogSegment(CassandraInstance instance, String
segment, HttpRange httpRange, StreamConsumer streamConsumer)
{
- sidecarClient.streamCdcSegments(toSidecarInstance(instance), segment,
httpRange, new org.apache.cassandra.sidecar.client.StreamConsumer()
+ sidecarClient.streamCdcSegments(toSidecarInstance(instance), segment,
httpRange, new o.a.c.sidecar.client.shaded.client.StreamConsumer()
{
@Override
public void onRead(StreamBuffer streamBuffer)
diff --git
a/cassandra-analytics-core/src/main/java/org/apache/cassandra/clients/AnalyticsSidecarClient.java
b/cassandra-analytics-core/src/main/java/org/apache/cassandra/clients/AnalyticsSidecarClient.java
index b8798b63..2096a60a 100644
---
a/cassandra-analytics-core/src/main/java/org/apache/cassandra/clients/AnalyticsSidecarClient.java
+++
b/cassandra-analytics-core/src/main/java/org/apache/cassandra/clients/AnalyticsSidecarClient.java
@@ -21,11 +21,11 @@ package org.apache.cassandra.clients;
import o.a.c.sidecar.client.shaded.io.vertx.core.Vertx;
import o.a.c.sidecar.client.shaded.io.vertx.core.VertxOptions;
-import org.apache.cassandra.sidecar.client.HttpClientConfig;
-import org.apache.cassandra.sidecar.client.SidecarClient;
-import org.apache.cassandra.sidecar.client.SidecarClientConfig;
-import org.apache.cassandra.sidecar.client.SidecarClientConfigImpl;
-import org.apache.cassandra.sidecar.client.SidecarInstancesProvider;
+import o.a.c.sidecar.client.shaded.client.HttpClientConfig;
+import o.a.c.sidecar.client.shaded.client.SidecarClient;
+import o.a.c.sidecar.client.shaded.client.SidecarClientConfig;
+import o.a.c.sidecar.client.shaded.client.SidecarClientConfigImpl;
+import o.a.c.sidecar.client.shaded.client.SidecarInstancesProvider;
import org.apache.cassandra.spark.bulkwriter.BulkSparkConf;
import org.apache.cassandra.spark.bulkwriter.DataTransport;
import org.apache.cassandra.spark.utils.BuildInfo;
diff --git
a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/BulkSparkConf.java
b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/BulkSparkConf.java
index eecbccdf..f389dcb5 100644
---
a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/BulkSparkConf.java
+++
b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/BulkSparkConf.java
@@ -40,7 +40,7 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.cassandra.sidecar.client.SidecarInstance;
+import o.a.c.sidecar.client.shaded.client.SidecarInstance;
import org.apache.cassandra.spark.bulkwriter.cloudstorage.StorageClientConfig;
import
org.apache.cassandra.spark.bulkwriter.cloudstorage.coordinated.CoordinatedWriteConf;
import
org.apache.cassandra.spark.bulkwriter.cloudstorage.coordinated.CoordinatedWriteConf.SimpleClusterConf;
diff --git
a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/CassandraClusterInfo.java
b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/CassandraClusterInfo.java
index 29f28e4e..f84a9337 100644
---
a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/CassandraClusterInfo.java
+++
b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/CassandraClusterInfo.java
@@ -49,8 +49,8 @@ import org.apache.cassandra.bridge.CassandraBridge;
import org.apache.cassandra.bridge.CassandraBridgeFactory;
import org.apache.cassandra.bridge.CassandraVersionFeatures;
import org.apache.cassandra.clients.Sidecar;
-import org.apache.cassandra.sidecar.client.SidecarInstance;
-import org.apache.cassandra.sidecar.client.SidecarInstanceImpl;
+import o.a.c.sidecar.client.shaded.client.SidecarInstance;
+import o.a.c.sidecar.client.shaded.client.SidecarInstanceImpl;
import org.apache.cassandra.spark.bulkwriter.token.TokenRangeMapping;
import org.apache.cassandra.spark.data.ReplicationFactor;
import org.apache.cassandra.spark.data.partitioner.Partitioner;
diff --git
a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/CassandraContext.java
b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/CassandraContext.java
index d67981c1..b7c9b337 100644
---
a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/CassandraContext.java
+++
b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/CassandraContext.java
@@ -28,9 +28,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.cassandra.clients.AnalyticsSidecarClient;
-import org.apache.cassandra.sidecar.client.SidecarClient;
-import org.apache.cassandra.sidecar.client.SidecarInstance;
-import org.apache.cassandra.sidecar.client.SimpleSidecarInstancesProvider;
+import o.a.c.sidecar.client.shaded.client.SidecarClient;
+import o.a.c.sidecar.client.shaded.client.SidecarInstance;
+import o.a.c.sidecar.client.shaded.client.SimpleSidecarInstancesProvider;
import org.apache.cassandra.spark.validation.CassandraValidation;
import org.apache.cassandra.spark.validation.SidecarValidation;
import org.apache.cassandra.spark.validation.StartupValidatable;
diff --git
a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/SidecarDataTransferApi.java
b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/SidecarDataTransferApi.java
index f8cdb92e..9199b01c 100644
---
a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/SidecarDataTransferApi.java
+++
b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/SidecarDataTransferApi.java
@@ -30,8 +30,8 @@ import org.slf4j.LoggerFactory;
import o.a.c.sidecar.client.shaded.common.request.ImportSSTableRequest;
import o.a.c.sidecar.client.shaded.common.response.SSTableImportResponse;
import org.apache.cassandra.bridge.CassandraBridge;
-import org.apache.cassandra.sidecar.client.SidecarClient;
-import org.apache.cassandra.sidecar.client.SidecarInstanceImpl;
+import o.a.c.sidecar.client.shaded.client.SidecarClient;
+import o.a.c.sidecar.client.shaded.client.SidecarInstanceImpl;
import org.apache.cassandra.spark.common.Digest;
import org.apache.cassandra.spark.common.model.CassandraInstance;
import org.apache.cassandra.spark.data.QualifiedTableName;
diff --git
a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/cloudstorage/CloudStorageDataTransferApi.java
b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/cloudstorage/CloudStorageDataTransferApi.java
index 8c26144a..76e7ea6d 100644
---
a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/cloudstorage/CloudStorageDataTransferApi.java
+++
b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/cloudstorage/CloudStorageDataTransferApi.java
@@ -25,7 +25,7 @@ import
o.a.c.sidecar.client.shaded.common.request.data.CreateRestoreJobRequestPa
import
o.a.c.sidecar.client.shaded.common.request.data.CreateSliceRequestPayload;
import
o.a.c.sidecar.client.shaded.common.request.data.UpdateRestoreJobRequestPayload;
import
o.a.c.sidecar.client.shaded.common.response.data.RestoreJobSummaryResponsePayload;
-import org.apache.cassandra.sidecar.client.SidecarInstance;
+import o.a.c.sidecar.client.shaded.client.SidecarInstance;
import org.apache.cassandra.spark.exception.S3ApiCallException;
import org.apache.cassandra.spark.exception.SidecarApiCallException;
import org.apache.cassandra.spark.transports.storage.StorageCredentials;
diff --git
a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/cloudstorage/CloudStorageDataTransferApiImpl.java
b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/cloudstorage/CloudStorageDataTransferApiImpl.java
index b09cca5a..ed27e310 100644
---
a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/cloudstorage/CloudStorageDataTransferApiImpl.java
+++
b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/cloudstorage/CloudStorageDataTransferApiImpl.java
@@ -32,12 +32,12 @@ import
o.a.c.sidecar.client.shaded.common.request.data.CreateRestoreJobRequestPa
import
o.a.c.sidecar.client.shaded.common.request.data.CreateSliceRequestPayload;
import
o.a.c.sidecar.client.shaded.common.request.data.UpdateRestoreJobRequestPayload;
import
o.a.c.sidecar.client.shaded.common.response.data.RestoreJobSummaryResponsePayload;
-import org.apache.cassandra.sidecar.client.HttpResponse;
-import org.apache.cassandra.sidecar.client.HttpResponseImpl;
-import org.apache.cassandra.sidecar.client.SidecarClient;
-import org.apache.cassandra.sidecar.client.SidecarInstance;
-import org.apache.cassandra.sidecar.client.retry.RetryAction;
-import org.apache.cassandra.sidecar.client.retry.RetryPolicy;
+import o.a.c.sidecar.client.shaded.client.HttpResponse;
+import o.a.c.sidecar.client.shaded.client.HttpResponseImpl;
+import o.a.c.sidecar.client.shaded.client.SidecarClient;
+import o.a.c.sidecar.client.shaded.client.SidecarInstance;
+import o.a.c.sidecar.client.shaded.client.retry.RetryAction;
+import o.a.c.sidecar.client.shaded.client.retry.RetryPolicy;
import org.apache.cassandra.spark.bulkwriter.JobInfo;
import org.apache.cassandra.spark.data.QualifiedTableName;
import org.apache.cassandra.spark.exception.S3ApiCallException;
diff --git
a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/cloudstorage/CloudStorageStreamSession.java
b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/cloudstorage/CloudStorageStreamSession.java
index 0dcebbaf..cd92da27 100644
---
a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/cloudstorage/CloudStorageStreamSession.java
+++
b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/cloudstorage/CloudStorageStreamSession.java
@@ -39,7 +39,7 @@ import org.apache.cassandra.bridge.CassandraBridge;
import org.apache.cassandra.bridge.CassandraBridgeFactory;
import org.apache.cassandra.bridge.SSTableDescriptor;
import org.apache.cassandra.clients.Sidecar;
-import org.apache.cassandra.sidecar.client.SidecarInstance;
+import o.a.c.sidecar.client.shaded.client.SidecarInstance;
import org.apache.cassandra.spark.bulkwriter.BulkWriteValidator;
import org.apache.cassandra.spark.bulkwriter.BulkWriterContext;
import org.apache.cassandra.spark.bulkwriter.JobInfo;
diff --git
a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/cloudstorage/ImportCompletionCoordinator.java
b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/cloudstorage/ImportCompletionCoordinator.java
index 780ac1c1..1d350f87 100644
---
a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/cloudstorage/ImportCompletionCoordinator.java
+++
b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/cloudstorage/ImportCompletionCoordinator.java
@@ -42,7 +42,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import
o.a.c.sidecar.client.shaded.common.request.data.CreateSliceRequestPayload;
-import org.apache.cassandra.sidecar.client.SidecarInstance;
+import o.a.c.sidecar.client.shaded.client.SidecarInstance;
import org.apache.cassandra.spark.bulkwriter.BulkWriteValidator;
import org.apache.cassandra.spark.bulkwriter.BulkWriterContext;
import org.apache.cassandra.spark.bulkwriter.CancelJobEvent;
diff --git
a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/cloudstorage/coordinated/CoordinatedCloudStorageDataTransferApi.java
b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/cloudstorage/coordinated/CoordinatedCloudStorageDataTransferApi.java
index a56d896f..4f9354c3 100644
---
a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/cloudstorage/coordinated/CoordinatedCloudStorageDataTransferApi.java
+++
b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/cloudstorage/coordinated/CoordinatedCloudStorageDataTransferApi.java
@@ -40,10 +40,10 @@ import
o.a.c.sidecar.client.shaded.common.request.data.RestoreJobProgressRequest
import
o.a.c.sidecar.client.shaded.common.request.data.UpdateRestoreJobRequestPayload;
import
o.a.c.sidecar.client.shaded.common.response.data.RestoreJobProgressResponsePayload;
import
o.a.c.sidecar.client.shaded.common.response.data.RestoreJobSummaryResponsePayload;
-import org.apache.cassandra.sidecar.client.RequestContext;
-import org.apache.cassandra.sidecar.client.SidecarClient;
-import org.apache.cassandra.sidecar.client.SidecarInstance;
-import org.apache.cassandra.sidecar.client.retry.RetryPolicy;
+import o.a.c.sidecar.client.shaded.client.RequestContext;
+import o.a.c.sidecar.client.shaded.client.SidecarClient;
+import o.a.c.sidecar.client.shaded.client.SidecarInstance;
+import o.a.c.sidecar.client.shaded.client.retry.RetryPolicy;
import org.apache.cassandra.spark.bulkwriter.JobInfo;
import org.apache.cassandra.spark.bulkwriter.cloudstorage.Bundle;
import org.apache.cassandra.spark.bulkwriter.cloudstorage.BundleStorageObject;
diff --git
a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/cloudstorage/coordinated/CoordinatedWriteConf.java
b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/cloudstorage/coordinated/CoordinatedWriteConf.java
index 28144463..802844bd 100644
---
a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/cloudstorage/coordinated/CoordinatedWriteConf.java
+++
b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/bulkwriter/cloudstorage/coordinated/CoordinatedWriteConf.java
@@ -39,7 +39,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.type.TypeFactory;
-import org.apache.cassandra.sidecar.client.SidecarInstance;
+import o.a.c.sidecar.client.shaded.client.SidecarInstance;
import org.apache.cassandra.spark.bulkwriter.token.ConsistencyLevel;
import org.apache.cassandra.spark.common.SidecarInstanceFactory;
import org.jetbrains.annotations.NotNull;
diff --git
a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/common/SidecarInstanceFactory.java
b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/common/SidecarInstanceFactory.java
index ce697036..129826b5 100644
---
a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/common/SidecarInstanceFactory.java
+++
b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/common/SidecarInstanceFactory.java
@@ -25,7 +25,7 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.cassandra.sidecar.client.SidecarInstanceImpl;
+import o.a.c.sidecar.client.shaded.client.SidecarInstanceImpl;
public class SidecarInstanceFactory
{
diff --git
a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/common/SizingFactory.java
b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/common/SizingFactory.java
index 7433a8a8..05aa3bc3 100644
---
a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/common/SizingFactory.java
+++
b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/common/SizingFactory.java
@@ -22,7 +22,7 @@ package org.apache.cassandra.spark.common;
import java.util.concurrent.CompletableFuture;
import o.a.c.sidecar.client.shaded.common.response.RingResponse;
-import org.apache.cassandra.sidecar.client.SidecarClient;
+import o.a.c.sidecar.client.shaded.client.SidecarClient;
import org.apache.cassandra.spark.data.ClientConfig;
import org.apache.cassandra.spark.data.DefaultSizing;
import org.apache.cassandra.spark.data.DynamicSizing;
diff --git
a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/data/CassandraDataLayer.java
b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/data/CassandraDataLayer.java
index 557aaf2c..67b06dd6 100644
---
a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/data/CassandraDataLayer.java
+++
b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/data/CassandraDataLayer.java
@@ -72,11 +72,11 @@ import org.apache.cassandra.clients.ExecutorHolder;
import org.apache.cassandra.clients.Sidecar;
import org.apache.cassandra.secrets.SslConfig;
import org.apache.cassandra.secrets.SslConfigSecretsProvider;
-import org.apache.cassandra.sidecar.client.SidecarClient;
-import org.apache.cassandra.sidecar.client.SidecarInstance;
-import org.apache.cassandra.sidecar.client.SidecarInstanceImpl;
-import org.apache.cassandra.sidecar.client.SimpleSidecarInstancesProvider;
-import org.apache.cassandra.sidecar.client.exception.RetriesExhaustedException;
+import o.a.c.sidecar.client.shaded.client.SidecarClient;
+import o.a.c.sidecar.client.shaded.client.SidecarInstance;
+import o.a.c.sidecar.client.shaded.client.SidecarInstanceImpl;
+import o.a.c.sidecar.client.shaded.client.SimpleSidecarInstancesProvider;
+import o.a.c.sidecar.client.shaded.client.exception.RetriesExhaustedException;
import org.apache.cassandra.spark.common.SidecarInstanceFactory;
import org.apache.cassandra.spark.common.SizingFactory;
import org.apache.cassandra.spark.config.SchemaFeature;
diff --git
a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/data/SidecarProvisionedSSTable.java
b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/data/SidecarProvisionedSSTable.java
index d0c7525f..71ef03df 100644
---
a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/data/SidecarProvisionedSSTable.java
+++
b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/data/SidecarProvisionedSSTable.java
@@ -28,8 +28,8 @@ import
o.a.c.sidecar.client.shaded.common.response.ListSnapshotFilesResponse;
import o.a.c.sidecar.client.shaded.common.utils.HttpRange;
import org.apache.cassandra.clients.Sidecar;
import org.apache.cassandra.clients.SidecarStreamConsumerAdapter;
-import org.apache.cassandra.sidecar.client.SidecarClient;
-import org.apache.cassandra.sidecar.client.SidecarInstance;
+import o.a.c.sidecar.client.shaded.client.SidecarClient;
+import o.a.c.sidecar.client.shaded.client.SidecarInstance;
import org.apache.cassandra.analytics.stats.Stats;
import org.apache.cassandra.spark.utils.streaming.BufferingInputStream;
import org.apache.cassandra.spark.utils.streaming.CassandraFileSource;
diff --git
a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/data/SidecarTableSizeProvider.java
b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/data/SidecarTableSizeProvider.java
index 7e8acf74..eff0b987 100644
---
a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/data/SidecarTableSizeProvider.java
+++
b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/data/SidecarTableSizeProvider.java
@@ -31,9 +31,9 @@ import org.slf4j.LoggerFactory;
import o.a.c.sidecar.client.shaded.common.response.RingResponse;
import o.a.c.sidecar.client.shaded.common.response.TableStatsResponse;
import o.a.c.sidecar.client.shaded.common.response.data.RingEntry;
-import org.apache.cassandra.sidecar.client.SidecarClient;
-import org.apache.cassandra.sidecar.client.SidecarInstance;
-import org.apache.cassandra.sidecar.client.SidecarInstanceImpl;
+import o.a.c.sidecar.client.shaded.client.SidecarClient;
+import o.a.c.sidecar.client.shaded.client.SidecarInstance;
+import o.a.c.sidecar.client.shaded.client.SidecarInstanceImpl;
/**
* Implementation of {@link TableSizeProvider} that uses Sidecar's client to
calculate the table
diff --git
a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/validation/CassandraValidation.java
b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/validation/CassandraValidation.java
index c85627d2..3dc89c64 100644
---
a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/validation/CassandraValidation.java
+++
b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/validation/CassandraValidation.java
@@ -22,7 +22,7 @@ package org.apache.cassandra.spark.validation;
import java.util.concurrent.TimeUnit;
import o.a.c.sidecar.client.shaded.common.response.HealthResponse;
-import org.apache.cassandra.sidecar.client.SidecarClient;
+import o.a.c.sidecar.client.shaded.client.SidecarClient;
/**
* A startup validation that checks the connectivity and health of Cassandra
diff --git
a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/validation/SidecarValidation.java
b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/validation/SidecarValidation.java
index a7aac1e0..e9404ced 100644
---
a/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/validation/SidecarValidation.java
+++
b/cassandra-analytics-core/src/main/java/org/apache/cassandra/spark/validation/SidecarValidation.java
@@ -22,7 +22,7 @@ package org.apache.cassandra.spark.validation;
import java.util.concurrent.TimeUnit;
import o.a.c.sidecar.client.shaded.common.response.HealthResponse;
-import org.apache.cassandra.sidecar.client.SidecarClient;
+import o.a.c.sidecar.client.shaded.client.SidecarClient;
/**
* A startup validation that checks the connectivity and health of Sidecar
diff --git
a/cassandra-analytics-core/src/test/java/org/apache/cassandra/clients/SidecarInstanceTest.java
b/cassandra-analytics-core/src/test/java/org/apache/cassandra/clients/SidecarInstanceTest.java
index c48432bc..f2c5fa9d 100644
---
a/cassandra-analytics-core/src/test/java/org/apache/cassandra/clients/SidecarInstanceTest.java
+++
b/cassandra-analytics-core/src/test/java/org/apache/cassandra/clients/SidecarInstanceTest.java
@@ -21,7 +21,7 @@ package org.apache.cassandra.clients;
import org.junit.jupiter.api.Test;
-import org.apache.cassandra.sidecar.client.SidecarInstance;
+import o.a.c.sidecar.client.shaded.client.SidecarInstance;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;
diff --git
a/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/bulkwriter/BulkSparkConfTest.java
b/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/bulkwriter/BulkSparkConfTest.java
index 8773f88e..b92c1b01 100644
---
a/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/bulkwriter/BulkSparkConfTest.java
+++
b/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/bulkwriter/BulkSparkConfTest.java
@@ -28,7 +28,7 @@ import com.google.common.collect.Maps;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.apache.cassandra.sidecar.client.SidecarInstanceImpl;
+import o.a.c.sidecar.client.shaded.client.SidecarInstanceImpl;
import
org.apache.cassandra.spark.bulkwriter.cloudstorage.coordinated.CoordinatedWriteConf;
import org.apache.cassandra.spark.bulkwriter.util.SbwKryoRegistrator;
import org.apache.cassandra.spark.utils.BuildInfo;
diff --git
a/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/bulkwriter/cloudstorage/CloudStorageDataTransferApiFactoryTest.java
b/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/bulkwriter/cloudstorage/CloudStorageDataTransferApiFactoryTest.java
index afbe6493..947ab4ec 100644
---
a/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/bulkwriter/cloudstorage/CloudStorageDataTransferApiFactoryTest.java
+++
b/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/bulkwriter/cloudstorage/CloudStorageDataTransferApiFactoryTest.java
@@ -23,7 +23,7 @@ import java.util.Collections;
import org.junit.jupiter.api.Test;
-import org.apache.cassandra.sidecar.client.SidecarClient;
+import o.a.c.sidecar.client.shaded.client.SidecarClient;
import org.apache.cassandra.spark.bulkwriter.CassandraClusterInfo;
import org.apache.cassandra.spark.bulkwriter.JobInfo;
import
org.apache.cassandra.spark.bulkwriter.cloudstorage.coordinated.CassandraClusterInfoGroup;
diff --git
a/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/bulkwriter/cloudstorage/CloudStorageStreamSessionTest.java
b/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/bulkwriter/cloudstorage/CloudStorageStreamSessionTest.java
index 5a958bfc..9ebad3f4 100644
---
a/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/bulkwriter/cloudstorage/CloudStorageStreamSessionTest.java
+++
b/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/bulkwriter/cloudstorage/CloudStorageStreamSessionTest.java
@@ -43,8 +43,8 @@ import
o.a.c.sidecar.client.shaded.common.request.data.CreateSliceRequestPayload
import
o.a.c.sidecar.client.shaded.common.response.data.RestoreJobSummaryResponsePayload;
import org.apache.cassandra.bridge.CassandraBridge;
import org.apache.cassandra.bridge.SSTableSummary;
-import org.apache.cassandra.sidecar.client.SidecarClient;
-import org.apache.cassandra.sidecar.client.SidecarInstance;
+import o.a.c.sidecar.client.shaded.client.SidecarClient;
+import o.a.c.sidecar.client.shaded.client.SidecarInstance;
import org.apache.cassandra.spark.bulkwriter.BulkWriterContext;
import org.apache.cassandra.spark.bulkwriter.ClusterInfo;
import org.apache.cassandra.spark.bulkwriter.DataTransport;
diff --git
a/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/bulkwriter/cloudstorage/ImportCompletionCoordinatorTest.java
b/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/bulkwriter/cloudstorage/ImportCompletionCoordinatorTest.java
index e883d3dd..2566cc2f 100644
---
a/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/bulkwriter/cloudstorage/ImportCompletionCoordinatorTest.java
+++
b/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/bulkwriter/cloudstorage/ImportCompletionCoordinatorTest.java
@@ -45,9 +45,9 @@ import org.junit.jupiter.api.Test;
import o.a.c.sidecar.client.shaded.common.request.Request;
import
o.a.c.sidecar.client.shaded.common.request.data.CreateSliceRequestPayload;
import o.a.c.sidecar.client.shaded.common.response.data.RingEntry;
-import org.apache.cassandra.sidecar.client.SidecarClient;
-import org.apache.cassandra.sidecar.client.SidecarInstanceImpl;
-import org.apache.cassandra.sidecar.client.exception.RetriesExhaustedException;
+import o.a.c.sidecar.client.shaded.client.SidecarClient;
+import o.a.c.sidecar.client.shaded.client.SidecarInstanceImpl;
+import o.a.c.sidecar.client.shaded.client.exception.RetriesExhaustedException;
import org.apache.cassandra.spark.bulkwriter.BulkWriteValidator;
import org.apache.cassandra.spark.bulkwriter.BulkWriterContext;
import org.apache.cassandra.spark.bulkwriter.CancelJobEvent;
diff --git
a/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/bulkwriter/cloudstorage/coordinated/CoordinatedWriteConfTest.java
b/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/bulkwriter/cloudstorage/coordinated/CoordinatedWriteConfTest.java
index 96318a29..36fe25ed 100644
---
a/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/bulkwriter/cloudstorage/coordinated/CoordinatedWriteConfTest.java
+++
b/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/bulkwriter/cloudstorage/coordinated/CoordinatedWriteConfTest.java
@@ -28,8 +28,8 @@ import java.util.Set;
import org.junit.jupiter.api.Test;
-import org.apache.cassandra.sidecar.client.SidecarInstance;
-import org.apache.cassandra.sidecar.client.SidecarInstanceImpl;
+import o.a.c.sidecar.client.shaded.client.SidecarInstance;
+import o.a.c.sidecar.client.shaded.client.SidecarInstanceImpl;
import
org.apache.cassandra.spark.bulkwriter.cloudstorage.coordinated.CoordinatedWriteConf.ClusterConf;
import
org.apache.cassandra.spark.bulkwriter.cloudstorage.coordinated.CoordinatedWriteConf.SimpleClusterConf;
import org.apache.cassandra.spark.bulkwriter.token.ConsistencyLevel.CL;
diff --git
a/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/data/SidecarProvisionedSSTableTest.java
b/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/data/SidecarProvisionedSSTableTest.java
index ca2b3842..c51f44da 100644
---
a/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/data/SidecarProvisionedSSTableTest.java
+++
b/cassandra-analytics-core/src/test/java/org/apache/cassandra/spark/data/SidecarProvisionedSSTableTest.java
@@ -27,8 +27,8 @@ import org.junit.jupiter.params.provider.ValueSource;
import o.a.c.sidecar.client.shaded.common.response.ListSnapshotFilesResponse;
import org.apache.cassandra.clients.Sidecar;
-import org.apache.cassandra.sidecar.client.SidecarClient;
-import org.apache.cassandra.sidecar.client.SidecarInstanceImpl;
+import o.a.c.sidecar.client.shaded.client.SidecarClient;
+import o.a.c.sidecar.client.shaded.client.SidecarInstanceImpl;
import org.apache.cassandra.analytics.stats.Stats;
import static org.assertj.core.api.Assertions.assertThat;
diff --git
a/cassandra-analytics-core/src/test/spark3/org/apache/cassandra/spark/common/SidecarInstanceFactoryTest.java
b/cassandra-analytics-core/src/test/spark3/org/apache/cassandra/spark/common/SidecarInstanceFactoryTest.java
index 719f5d4b..277175a7 100644
---
a/cassandra-analytics-core/src/test/spark3/org/apache/cassandra/spark/common/SidecarInstanceFactoryTest.java
+++
b/cassandra-analytics-core/src/test/spark3/org/apache/cassandra/spark/common/SidecarInstanceFactoryTest.java
@@ -21,7 +21,7 @@ package org.apache.cassandra.spark.common;
import org.junit.jupiter.api.Test;
-import org.apache.cassandra.sidecar.client.SidecarInstance;
+import o.a.c.sidecar.client.shaded.client.SidecarInstance;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
diff --git
a/cassandra-analytics-integration-framework/src/main/java/org/apache/cassandra/sidecar/testing/LocalhostResolver.java
b/cassandra-analytics-integration-framework/src/main/java/org/apache/cassandra/sidecar/testing/LocalhostResolver.java
index 3c813057..141c6f8a 100644
---
a/cassandra-analytics-integration-framework/src/main/java/org/apache/cassandra/sidecar/testing/LocalhostResolver.java
+++
b/cassandra-analytics-integration-framework/src/main/java/org/apache/cassandra/sidecar/testing/LocalhostResolver.java
@@ -26,6 +26,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.cassandra.sidecar.common.server.dns.DnsResolver;
+import org.apache.cassandra.sidecar.common.server.dns.DnsResolvers;
/**
@@ -43,7 +44,7 @@ public class LocalhostResolver implements DnsResolver
public LocalhostResolver()
{
- this(DnsResolver.DEFAULT);
+ this(DnsResolvers.DEFAULT);
}
LocalhostResolver(DnsResolver delegate)
diff --git
a/cassandra-analytics-integration-framework/src/main/java/org/apache/cassandra/sidecar/testing/SharedClusterIntegrationTestBase.java
b/cassandra-analytics-integration-framework/src/main/java/org/apache/cassandra/sidecar/testing/SharedClusterIntegrationTestBase.java
index db5982f0..668e9011 100644
---
a/cassandra-analytics-integration-framework/src/main/java/org/apache/cassandra/sidecar/testing/SharedClusterIntegrationTestBase.java
+++
b/cassandra-analytics-integration-framework/src/main/java/org/apache/cassandra/sidecar/testing/SharedClusterIntegrationTestBase.java
@@ -79,17 +79,17 @@ import
org.apache.cassandra.sidecar.common.server.utils.MillisecondBoundConfigur
import
org.apache.cassandra.sidecar.common.server.utils.SecondBoundConfiguration;
import org.apache.cassandra.sidecar.common.server.utils.SidecarVersionProvider;
import org.apache.cassandra.sidecar.common.server.utils.ThrowableUtils;
+import org.apache.cassandra.sidecar.config.ClusterLeaseClaimConfiguration;
import org.apache.cassandra.sidecar.config.JmxConfiguration;
import org.apache.cassandra.sidecar.config.KeyStoreConfiguration;
-import org.apache.cassandra.sidecar.config.PeriodicTaskConfiguration;
import org.apache.cassandra.sidecar.config.S3ClientConfiguration;
import org.apache.cassandra.sidecar.config.S3ProxyConfiguration;
import org.apache.cassandra.sidecar.config.ServiceConfiguration;
import org.apache.cassandra.sidecar.config.SidecarConfiguration;
import org.apache.cassandra.sidecar.config.SslConfiguration;
+import
org.apache.cassandra.sidecar.config.yaml.ClusterLeaseClaimConfigurationImpl;
import org.apache.cassandra.sidecar.config.yaml.CoordinationConfigurationImpl;
import org.apache.cassandra.sidecar.config.yaml.KeyStoreConfigurationImpl;
-import org.apache.cassandra.sidecar.config.yaml.PeriodicTaskConfigurationImpl;
import org.apache.cassandra.sidecar.config.yaml.S3ClientConfigurationImpl;
import org.apache.cassandra.sidecar.config.yaml.SSTableUploadConfigurationImpl;
import
org.apache.cassandra.sidecar.config.yaml.SchemaKeyspaceConfigurationImpl;
@@ -97,7 +97,7 @@ import
org.apache.cassandra.sidecar.config.yaml.ServiceConfigurationImpl;
import org.apache.cassandra.sidecar.config.yaml.SidecarConfigurationImpl;
import org.apache.cassandra.sidecar.config.yaml.SslConfigurationImpl;
import org.apache.cassandra.sidecar.metrics.instance.InstanceHealthMetrics;
-import org.apache.cassandra.sidecar.server.MainModule;
+import org.apache.cassandra.sidecar.modules.SidecarModules;
import org.apache.cassandra.sidecar.server.Server;
import org.apache.cassandra.sidecar.server.SidecarServerEvents;
import org.apache.cassandra.sidecar.utils.CassandraVersionProvider;
@@ -361,7 +361,7 @@ public abstract class SharedClusterIntegrationTestBase
VertxTestContext context = new VertxTestContext();
AbstractModule testModule = new IntegrationTestModule(instances,
classLoaderWrapper, mtlsTestHelper,
dnsResolver,
configurationOverrides());
- sidecarServerInjector = Guice.createInjector(Modules.override(new
MainModule()).with(testModule));
+ sidecarServerInjector =
Guice.createInjector(Modules.override(SidecarModules.all()).with(testModule));
Server sidecarServer = sidecarServerInjector.getInstance(Server.class);
sidecarServer.start()
.onSuccess(s -> context.completeNow())
@@ -584,9 +584,10 @@ public abstract class SharedClusterIntegrationTestBase
public SidecarConfiguration sidecarConfiguration()
{
// claim lease fast for testing
- PeriodicTaskConfiguration clusterClaimTaskConfig = new
PeriodicTaskConfigurationImpl(true,
-
MillisecondBoundConfiguration.parse("1s"),
-
MillisecondBoundConfiguration.parse("1s"));
+ ClusterLeaseClaimConfiguration clusterLeaseClaimConfiguration =
ClusterLeaseClaimConfigurationImpl.builder()
+
.initialDelayRandomDelta(
+
MillisecondBoundConfiguration.parse("1s"))
+
.build();
ServiceConfiguration conf = ServiceConfigurationImpl.builder()
.host("0.0.0.0") // binds to all interfaces, potential security issue if left
running for long
.port(0) //
let the test find an available port
@@ -596,7 +597,7 @@ public abstract class SharedClusterIntegrationTestBase
.sstableUploadConfiguration(new
SSTableUploadConfigurationImpl(DEFAULT_CONCURRENT_UPLOAD_LIMIT,
1,
DEFAULT_FILE_PERMISSIONS))
-
.coordinationConfiguration(new
CoordinationConfigurationImpl(clusterClaimTaskConfig))
+
.coordinationConfiguration(new
CoordinationConfigurationImpl(clusterLeaseClaimConfiguration))
.build();
diff --git
a/cassandra-analytics-integration-tests/src/test/java/org/apache/cassandra/analytics/correctness/BulkWriteCorruptionTest.java
b/cassandra-analytics-integration-tests/src/test/java/org/apache/cassandra/analytics/correctness/BulkWriteCorruptionTest.java
index f815701b..3fb47b6d 100644
---
a/cassandra-analytics-integration-tests/src/test/java/org/apache/cassandra/analytics/correctness/BulkWriteCorruptionTest.java
+++
b/cassandra-analytics-integration-tests/src/test/java/org/apache/cassandra/analytics/correctness/BulkWriteCorruptionTest.java
@@ -95,7 +95,7 @@ public class BulkWriteCorruptionTest extends
SharedClusterSparkIntegrationTestBa
.hasMessageContaining("Bulk Write to Cassandra has failed")
.rootCause()
.isExactlyInstanceOf(ConsistencyNotSatisfiedException.class)
-
.hasMessageContaining("Cause=org.apache.cassandra.sidecar.client.exception.RetriesExhaustedException")
+
.hasMessageContaining("Cause=o.a.c.sidecar.client.shaded.client.exception.RetriesExhaustedException")
.hasMessageContaining("after 5 attempts") // upload exhausted after 5
attempts
.hasMessageContaining("HttpResponseImpl{statusCode=455, " +
"statusMessage='Client Error (455)', " +
diff --git
a/cassandra-analytics-integration-tests/src/test/java/org/apache/cassandra/analytics/testcontainer/CoordinatedBulkWriteSimpleTest.java
b/cassandra-analytics-integration-tests/src/test/java/org/apache/cassandra/analytics/testcontainer/CoordinatedBulkWriteSimpleTest.java
index 21a37bd1..6e65ea3e 100644
---
a/cassandra-analytics-integration-tests/src/test/java/org/apache/cassandra/analytics/testcontainer/CoordinatedBulkWriteSimpleTest.java
+++
b/cassandra-analytics-integration-tests/src/test/java/org/apache/cassandra/analytics/testcontainer/CoordinatedBulkWriteSimpleTest.java
@@ -44,7 +44,7 @@ import
org.apache.cassandra.sidecar.config.S3ClientConfiguration;
import org.apache.cassandra.sidecar.config.yaml.S3ClientConfigurationImpl;
import
org.apache.cassandra.sidecar.config.yaml.SidecarConfigurationImpl.Builder;
import org.apache.cassandra.sidecar.db.schema.SidecarSchema;
-import org.apache.cassandra.sidecar.server.MainModule;
+import org.apache.cassandra.sidecar.modules.SidecarModules;
import org.apache.cassandra.sidecar.server.Server;
import org.apache.cassandra.sidecar.testing.QualifiedName;
import
org.apache.cassandra.sidecar.testing.SharedClusterIntegrationTestBase.IntegrationTestModule;
@@ -143,7 +143,8 @@ public class CoordinatedBulkWriteSimpleTest extends
CoordinatedWriteTestBase
mtlsTestHelper,
dnsResolver,
sidecarConfigurator);
- sidecarServerInjector = Guice.createInjector(Modules.override(new
MainModule()).with(testModule));
+ sidecarServerInjector =
Guice.createInjector(Modules.override(SidecarModules.all()).with(testModule));
+
Server sidecarServer = sidecarServerInjector.getInstance(Server.class);
sidecarServer.start().onFailure(context::failNow);
diff --git
a/cassandra-analytics-sidecar-client/src/main/java/org/apache/cassandra/clients/Sidecar.java
b/cassandra-analytics-sidecar-client/src/main/java/org/apache/cassandra/clients/Sidecar.java
index d1857eb0..d5922c2d 100644
---
a/cassandra-analytics-sidecar-client/src/main/java/org/apache/cassandra/clients/Sidecar.java
+++
b/cassandra-analytics-sidecar-client/src/main/java/org/apache/cassandra/clients/Sidecar.java
@@ -36,17 +36,17 @@ import
o.a.c.sidecar.client.shaded.common.response.NodeSettings;
import o.a.c.sidecar.client.shaded.io.vertx.core.Vertx;
import o.a.c.sidecar.client.shaded.io.vertx.core.VertxOptions;
import org.apache.cassandra.secrets.SecretsProvider;
-import org.apache.cassandra.sidecar.client.HttpClientConfig;
-import org.apache.cassandra.sidecar.client.SidecarClient;
-import org.apache.cassandra.sidecar.client.SidecarClientConfig;
-import org.apache.cassandra.sidecar.client.SidecarClientConfigImpl;
-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.client.VertxHttpClient;
-import org.apache.cassandra.sidecar.client.VertxRequestExecutor;
-import org.apache.cassandra.sidecar.client.retry.ExponentialBackoffRetryPolicy;
-import org.apache.cassandra.sidecar.client.retry.RetryPolicy;
+import o.a.c.sidecar.client.shaded.client.HttpClientConfig;
+import o.a.c.sidecar.client.shaded.client.SidecarClient;
+import o.a.c.sidecar.client.shaded.client.SidecarClientConfig;
+import o.a.c.sidecar.client.shaded.client.SidecarClientConfigImpl;
+import o.a.c.sidecar.client.shaded.client.SidecarInstance;
+import o.a.c.sidecar.client.shaded.client.SidecarInstanceImpl;
+import o.a.c.sidecar.client.shaded.client.SidecarInstancesProvider;
+import o.a.c.sidecar.client.shaded.client.VertxHttpClient;
+import o.a.c.sidecar.client.shaded.client.VertxRequestExecutor;
+import o.a.c.sidecar.client.shaded.client.retry.ExponentialBackoffRetryPolicy;
+import o.a.c.sidecar.client.shaded.client.retry.RetryPolicy;
import org.apache.cassandra.spark.common.model.CassandraInstance;
import org.apache.cassandra.spark.data.FileType;
import org.apache.cassandra.spark.utils.BuildInfo;
diff --git
a/cassandra-analytics-sidecar-client/src/main/java/org/apache/cassandra/clients/SidecarStreamConsumerAdapter.java
b/cassandra-analytics-sidecar-client/src/main/java/org/apache/cassandra/clients/SidecarStreamConsumerAdapter.java
index 0e48f0b2..ce87b79c 100644
---
a/cassandra-analytics-sidecar-client/src/main/java/org/apache/cassandra/clients/SidecarStreamConsumerAdapter.java
+++
b/cassandra-analytics-sidecar-client/src/main/java/org/apache/cassandra/clients/SidecarStreamConsumerAdapter.java
@@ -22,14 +22,14 @@ package org.apache.cassandra.clients;
import java.nio.ByteBuffer;
import java.util.Objects;
-import org.apache.cassandra.sidecar.client.StreamBuffer;
+import o.a.c.sidecar.client.shaded.client.StreamBuffer;
import org.apache.cassandra.spark.utils.streaming.StreamConsumer;
/**
- * A delegate class that connects Sidecar's {@link
org.apache.cassandra.sidecar.client.StreamConsumer} to the analytics
+ * A delegate class that connects Sidecar's {@link
o.a.c.sidecar.client.shaded.client.StreamConsumer} to the analytics
* {@link StreamConsumer}
*/
-public class SidecarStreamConsumerAdapter implements
org.apache.cassandra.sidecar.client.StreamConsumer
+public class SidecarStreamConsumerAdapter implements
o.a.c.sidecar.client.shaded.client.StreamConsumer
{
private final StreamConsumer delegate;
@@ -39,7 +39,7 @@ public class SidecarStreamConsumerAdapter implements
org.apache.cassandra.sideca
}
@Override
- public void onRead(org.apache.cassandra.sidecar.client.StreamBuffer
streamBuffer)
+ public void onRead(o.a.c.sidecar.client.shaded.client.StreamBuffer
streamBuffer)
{
delegate.onRead(SidecarStreamBufferWrapper.wrap(streamBuffer));
}
@@ -58,11 +58,11 @@ public class SidecarStreamConsumerAdapter implements
org.apache.cassandra.sideca
/**
* A {@link org.apache.cassandra.spark.utils.streaming.StreamBuffer}
implementations that internally wraps
- * Sidecar's {@link org.apache.cassandra.sidecar.client.StreamBuffer}
+ * Sidecar's {@link o.a.c.sidecar.client.shaded.client.StreamBuffer}
*/
static final class SidecarStreamBufferWrapper implements
org.apache.cassandra.spark.utils.streaming.StreamBuffer
{
- public final org.apache.cassandra.sidecar.client.StreamBuffer buffer;
+ public final o.a.c.sidecar.client.shaded.client.StreamBuffer buffer;
private SidecarStreamBufferWrapper(StreamBuffer buffer)
{
diff --git a/gradle.properties b/gradle.properties
index 4312771c..930920de 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -23,7 +23,7 @@ description=Apache Cassandra Analytics
analyticsJDKLevel=11
cassandra40Version=4.0.17
cassandra50Version=5.0.5
-sidecarVersion=0.1.0
+sidecarVersion=0.2.0
intellijVersion=9.0.4
junitVersion=5.10.2
assertjCoreVersion=3.24.2
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
