all test passing

Author: clun

astra-sdk/pom.xml

@@ -31,9 +31,9 @@
 
 		<!-- Astra Expose APIs through Stargate -->
 		<dependency>
-			<groupId>com.datastax.stargate</groupId>
+			<groupId>io.stargate</groupId>
 			<artifactId>stargate-sdk</artifactId>
-			<version>${project.version}</version>
+			<version>2.0.1-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>

astra-sdk/src/main/java/com/datastax/astra/sdk/AstraClient.java

@@ -18,18 +18,17 @@
 
 import com.datastax.astra.sdk.config.AstraClientConfig;
 import com.datastax.oss.driver.api.core.CqlSession;
-import com.datastax.stargate.sdk.StargateClient;
-import com.datastax.stargate.sdk.doc.ApiDocumentClient;
-import com.datastax.stargate.sdk.gql.ApiGraphQLClient;
-import com.datastax.stargate.sdk.grpc.ApiGrpcClient;
-import com.datastax.stargate.sdk.rest.ApiDataClient;
-import com.datastax.stargate.sdk.utils.AnsiUtils;
-import com.datastax.stargate.sdk.utils.Utils;
+import io.stargate.sdk.StargateClient;
+import io.stargate.sdk.doc.StargateDocumentApiClient;
+import io.stargate.sdk.gql.StargateGraphQLApiClient;
+import io.stargate.sdk.grpc.StargateGrpcApiClient;
+import io.stargate.sdk.rest.StargateRestApiClient;
+import io.stargate.sdk.utils.AnsiUtils;
+import io.stargate.sdk.utils.Utils;
 import com.dtsx.astra.sdk.db.DatabasesClient;
 import com.dtsx.astra.sdk.db.domain.Database;
 import com.dtsx.astra.sdk.org.OrganizationsClient;
 import com.dtsx.astra.sdk.streaming.StreamingClient;
-import com.dtsx.astra.sdk.utils.ApiLocator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -253,7 +252,7 @@ private void downloadAndSetupSecureConnectBundle(AstraClientConfig config) {
      * 
      * @return ApiDocumentClient
      */
-    public ApiDocumentClient apiStargateDocument() {
+    public StargateDocumentApiClient apiStargateDocument() {
         if (stargateClient == null) {
             throw new IllegalStateException("Api Document is not available "
                     + "you need to provide dbId/dbRegion/username/password at initialization.");
@@ -266,7 +265,7 @@ public ApiDocumentClient apiStargateDocument() {
      * 
      * @return ApiRestClient
      */
-    public ApiDataClient apiStargateData() {
+    public StargateRestApiClient apiStargateData() {
         if (stargateClient == null) {
             throw new IllegalStateException("Api Rest is not available "
                     + "you need to provide dbId/dbRegion/username/password at initialization.");
@@ -279,7 +278,7 @@ public ApiDataClient apiStargateData() {
      * 
      * @return ApiGraphQLClient
      */
-    public ApiGraphQLClient apiStargateGraphQL() {
+    public StargateGraphQLApiClient apiStargateGraphQL() {
         if (stargateClient == null) {
             throw new IllegalStateException("GraphQL Api is not available "
                     + "you need to provide dbId/dbRegion/token at initialization.");
@@ -293,7 +292,7 @@ public ApiGraphQLClient apiStargateGraphQL() {
      * @return
      *      grpc Stargate API.
      */
-    public ApiGrpcClient apiStargateGrpc() {
+    public StargateGrpcApiClient apiStargateGrpc() {
         if (stargateClient == null) {
             throw new IllegalStateException("GRPC Api is not available "
                     + "you need to provide dbId/dbRegion/token at initialization.");

astra-sdk/src/main/java/com/datastax/astra/sdk/config/AstraClientConfig.java

@@ -5,9 +5,9 @@
 import com.datastax.oss.driver.api.core.config.ProgrammaticDriverConfigLoaderBuilder;
 import com.datastax.oss.driver.api.core.config.TypedDriverOption;
 import com.datastax.oss.driver.api.core.tracker.RequestTracker;
-import com.datastax.stargate.sdk.audit.ServiceCallObserver;
-import com.datastax.stargate.sdk.StargateClientBuilder;
-import com.datastax.stargate.sdk.utils.AnsiUtils;
+import io.stargate.sdk.audit.ServiceCallObserver;
+import io.stargate.sdk.StargateClientBuilder;
+import io.stargate.sdk.utils.AnsiUtils;
 import com.evanlennick.retry4j.config.RetryConfig;
 import org.apache.hc.client5.http.config.RequestConfig;
 import com.dtsx.astra.sdk.utils.AstraRc;
@@ -20,8 +20,8 @@
 import java.util.List;
 import java.util.Map;
 
-import static com.datastax.stargate.sdk.utils.Assert.hasLength;
-import static com.datastax.stargate.sdk.utils.Utils.readEnvVariable;
+import static io.stargate.sdk.utils.Assert.hasLength;
+import static io.stargate.sdk.utils.Utils.readEnvVariable;
 
 /**
  * Helper and configure for Astra.

astra-sdk/src/test/java/com/datastax/astra/sdk/AstraTestUtils.java

@@ -1,7 +1,7 @@
 package com.datastax.astra.sdk;
 
-import com.datastax.stargate.sdk.StargateClient;
-import com.datastax.stargate.sdk.utils.AnsiUtils;
+import io.stargate.sdk.StargateClient;
+import io.stargate.sdk.utils.AnsiUtils;
 import com.dtsx.astra.sdk.db.DatabaseClient;
 import com.dtsx.astra.sdk.db.DatabasesClient;
 import com.dtsx.astra.sdk.db.domain.CloudProviderType;

astra-sdk/src/test/java/com/datastax/astra/sdk/stargate/ApiDocumentRepositoryAstraTest.java

@@ -1,6 +1,6 @@
 package com.datastax.astra.sdk.stargate;
 
-import com.datastax.stargate.sdk.StargateClient;
+import io.stargate.sdk.StargateClient;
 
 /**
  * Execute some unit tests agains collections.

astra-sdk/src/test/java/com/datastax/astra/sdk/stargate/ApiGrpcAstraTest.java

@@ -3,7 +3,7 @@
 import org.junit.jupiter.api.Assertions;
 
 import com.datastax.astra.sdk.AstraClient;
-import com.datastax.stargate.sdk.grpc.domain.ResultSetGrpc;
+import io.stargate.sdk.grpc.domain.ResultSetGrpc;
 
 public class ApiGrpcAstraTest {
 

astra-spring-boot-autoconfigure/src/main/java/com/datastax/astra/boot/AstraSpringAutoConfiguration.java

@@ -43,7 +43,7 @@
 import com.datastax.oss.driver.api.core.CqlSession;
 import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
 import com.datastax.oss.driver.api.core.metrics.DefaultSessionMetric;
-import com.datastax.stargate.sdk.utils.Utils;
+import io.stargate.sdk.utils.Utils;
 
 import io.micrometer.core.instrument.MeterRegistry;
 

pom.xml

@@ -62,19 +62,11 @@
 	</properties>
 
 	<modules>
-		<module>stargate-sdk-commons</module>
-		<module>stargate-sdk-httpclient</module>
-		<module>stargate-sdk-rest</module>
-		<module>stargate-sdk-docapi</module>
-		<module>stargate-sdk-graphql</module>
-		<module>stargate-sdk-grpc</module>
-		<module>stargate-sdk</module>
-
 		<module>astra-sdk</module>
 		<module>astra-sdk-devops</module>
-		
 		<module>astra-spring-boot-autoconfigure</module>
 		<module>astra-spring-boot-starter</module>
+		<module>stargate-sdk</module>
 	</modules>
 
 	<dependencyManagement>