Support for multi environment

Author: clun

astra-sdk-devops/pom.xml

@@ -51,7 +51,6 @@
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
         </dependency>
-
     </dependencies>
 
 </project>

astra-sdk-devops/src/main/java/com/dtsx/astra/sdk/AbstractApiClient.java

@@ -1,22 +1,28 @@
 package com.dtsx.astra.sdk;
 
-import com.dtsx.astra.sdk.utils.ApiLocator;
 import com.dtsx.astra.sdk.utils.ApiResponseHttp;
 import com.dtsx.astra.sdk.utils.Assert;
+import com.dtsx.astra.sdk.utils.AstraEnvironment;
 import com.dtsx.astra.sdk.utils.HttpClientWrapper;
+import lombok.Getter;
 
 import static java.net.HttpURLConnection.HTTP_ACCEPTED;
 
 /**
  * Super Class for the different Http Clients of the api
  */
+@Getter
 public abstract class AbstractApiClient {
 
-    /** hold a reference to the bearer token. */
+    /**
+     * Token Value
+     */
     protected final String token;
 
-    /** hold a reference to target Astra Environment. */
-    protected final ApiLocator.AstraEnvironment environment;
+    /**
+     * Hold a reference to target Astra Environment.
+     */
+    protected final AstraEnvironment environment;
 
     /**
      * Default constructor.
@@ -26,30 +32,12 @@ public abstract class AbstractApiClient {
      * @param token
      *     token value
      */
-    public AbstractApiClient(String token, ApiLocator.AstraEnvironment env) {
+    public AbstractApiClient(String token, AstraEnvironment env) {
         Assert.hasLength(token, "token");
         this.token = token;
         this.environment = env;
     }
 
-    /**
-     * Gets token
-     *
-     * @return value of token
-     */
-    public String getToken() {
-        return token;
-    }
-
-    /**
-     * Gets environment
-     *
-     * @return value of environment
-     */
-    public ApiLocator.AstraEnvironment getEnvironment() {
-        return environment;
-    }
-
     /**
      * Access Http Client.
      *

astra-sdk-devops/src/main/java/com/dtsx/astra/sdk/AstraDevopsApiClient.java

@@ -9,6 +9,7 @@
 import com.dtsx.astra.sdk.streaming.AstraStreamingClient;
 import com.dtsx.astra.sdk.utils.ApiLocator;
 import com.dtsx.astra.sdk.utils.ApiResponseHttp;
+import com.dtsx.astra.sdk.utils.AstraEnvironment;
 import com.dtsx.astra.sdk.utils.JsonUtils;
 
 import java.util.Map;
@@ -27,7 +28,7 @@ public class AstraDevopsApiClient extends AbstractApiClient {
      *      bearerAuthToken token
      */
     public AstraDevopsApiClient(String token) {
-        this(token, ApiLocator.AstraEnvironment.PROD);
+        this(token, AstraEnvironment.PROD);
     }
 
     /**
@@ -38,7 +39,7 @@ public AstraDevopsApiClient(String token) {
      * @param token
      *      bearerAuthToken token
      */
-    public AstraDevopsApiClient(String token, ApiLocator.AstraEnvironment env) {
+    public AstraDevopsApiClient(String token, AstraEnvironment env) {
         super(token, env);
     }
 

astra-sdk-devops/src/main/java/com/dtsx/astra/sdk/db/AstraDbClient.java

@@ -6,6 +6,7 @@
 import com.dtsx.astra.sdk.utils.ApiLocator;
 import com.dtsx.astra.sdk.utils.ApiResponseHttp;
 import com.dtsx.astra.sdk.utils.Assert;
+import com.dtsx.astra.sdk.utils.AstraEnvironment;
 import com.dtsx.astra.sdk.utils.JsonUtils;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.dtsx.astra.sdk.db.domain.DatabaseFilter.Include;
@@ -36,7 +37,7 @@ public class AstraDbClient extends AbstractApiClient {
      *      authenticated token
      */
     public AstraDbClient(String token) {
-        this(token, ApiLocator.AstraEnvironment.PROD);
+        this(token, AstraEnvironment.PROD);
     }
 
     /**
@@ -47,7 +48,7 @@ public AstraDbClient(String token) {
      * @param token
      *      authenticated token
      */
-    public AstraDbClient(String token, ApiLocator.AstraEnvironment env) {
+    public AstraDbClient(String token, AstraEnvironment env) {
         super(token, env);
     }
 

astra-sdk-devops/src/main/java/com/dtsx/astra/sdk/db/DatabaseClient.java

@@ -9,6 +9,7 @@
 import com.dtsx.astra.sdk.utils.ApiLocator;
 import com.dtsx.astra.sdk.utils.ApiResponseHttp;
 import com.dtsx.astra.sdk.utils.Assert;
+import com.dtsx.astra.sdk.utils.AstraEnvironment;
 import com.dtsx.astra.sdk.utils.JsonUtils;
 import com.dtsx.astra.sdk.utils.Utils;
 import org.slf4j.Logger;
@@ -43,7 +44,7 @@ public class DatabaseClient extends AbstractApiClient {
      *      database identifier
      */
     public DatabaseClient(String token, String databaseId) {
-        this(token, ApiLocator.AstraEnvironment.PROD, databaseId);
+        this(token, AstraEnvironment.PROD, databaseId);
     }
 
     /**
@@ -56,7 +57,7 @@ public DatabaseClient(String token, String databaseId) {
      * @param databaseId
      *      database identifier
      */
-    public DatabaseClient(String token, ApiLocator.AstraEnvironment env, String databaseId) {
+    public DatabaseClient(String token, AstraEnvironment env, String databaseId) {
         super(token, env);
         Assert.hasLength(databaseId, "databaseId");
         this.databaseId = databaseId;

astra-sdk-devops/src/main/java/com/dtsx/astra/sdk/db/DbAccessListsClient.java

@@ -7,6 +7,7 @@
 import com.dtsx.astra.sdk.db.domain.Database;
 import com.dtsx.astra.sdk.utils.ApiLocator;
 import com.dtsx.astra.sdk.utils.Assert;
+import com.dtsx.astra.sdk.utils.AstraEnvironment;
 import com.dtsx.astra.sdk.utils.JsonUtils;
 
 import java.util.ArrayList;
@@ -31,7 +32,7 @@ public class DbAccessListsClient extends AbstractApiClient {
      *      database identifier
      */
     public DbAccessListsClient(String token, String databaseId) {
-        this(token, ApiLocator.AstraEnvironment.PROD, databaseId);
+        this(token, AstraEnvironment.PROD, databaseId);
     }
 
     /**
@@ -44,7 +45,7 @@ public DbAccessListsClient(String token, String databaseId) {
      * @param databaseId
      *      database identifier
      */
-    public DbAccessListsClient(String token, ApiLocator.AstraEnvironment env, String databaseId) {
+    public DbAccessListsClient(String token, AstraEnvironment env, String databaseId) {
         super(token, env);
         Assert.hasLength(databaseId, "databaseId");
         this.db = new DatabaseClient(token, databaseId).get();

astra-sdk-devops/src/main/java/com/dtsx/astra/sdk/db/DbCdcsClient.java

@@ -9,6 +9,7 @@
 import com.dtsx.astra.sdk.utils.ApiLocator;
 import com.dtsx.astra.sdk.utils.ApiResponseHttp;
 import com.dtsx.astra.sdk.utils.Assert;
+import com.dtsx.astra.sdk.utils.AstraEnvironment;
 import com.dtsx.astra.sdk.utils.JsonUtils;
 import com.fasterxml.jackson.core.type.TypeReference;
 
@@ -43,7 +44,7 @@ public class DbCdcsClient extends AbstractApiClient {
      *      database identifier
      */
     public DbCdcsClient(String token, String databaseId) {
-        this(token, ApiLocator.AstraEnvironment.PROD, databaseId);
+        this(token, AstraEnvironment.PROD, databaseId);
     }
 
     /**
@@ -56,7 +57,7 @@ public DbCdcsClient(String token, String databaseId) {
      * @param databaseId
      *      database identifier
      */
-    public DbCdcsClient(String token, ApiLocator.AstraEnvironment env, String databaseId) {
+    public DbCdcsClient(String token, AstraEnvironment env, String databaseId) {
         super(token, env);
         Assert.hasLength(databaseId, "databaseId");
         this.db = new DatabaseClient(token, environment, databaseId).get();

astra-sdk-devops/src/main/java/com/dtsx/astra/sdk/db/DbDatacentersClient.java

@@ -10,6 +10,7 @@
 import com.dtsx.astra.sdk.utils.ApiLocator;
 import com.dtsx.astra.sdk.utils.ApiResponseHttp;
 import com.dtsx.astra.sdk.utils.Assert;
+import com.dtsx.astra.sdk.utils.AstraEnvironment;
 import com.dtsx.astra.sdk.utils.JsonUtils;
 import com.fasterxml.jackson.core.type.TypeReference;
 
@@ -44,7 +45,7 @@ public class DbDatacentersClient extends AbstractApiClient {
      *      database identifier
      */
     public DbDatacentersClient(String token, String databaseId) {
-        this(token, ApiLocator.AstraEnvironment.PROD, databaseId);
+        this(token, AstraEnvironment.PROD, databaseId);
     }
 
     /**
@@ -57,7 +58,7 @@ public DbDatacentersClient(String token, String databaseId) {
      * @param databaseId
      *      database identifier
      */
-    public DbDatacentersClient(String token, ApiLocator.AstraEnvironment env, String databaseId) {
+    public DbDatacentersClient(String token, AstraEnvironment env, String databaseId) {
         super(token, env);
         Assert.hasLength(databaseId, "databaseId");
         this.db = new DatabaseClient(token, databaseId).get();

astra-sdk-devops/src/main/java/com/dtsx/astra/sdk/db/DbKeyspacesClient.java

@@ -6,6 +6,7 @@
 import com.dtsx.astra.sdk.db.exception.KeyspaceNotFoundException;
 import com.dtsx.astra.sdk.utils.ApiLocator;
 import com.dtsx.astra.sdk.utils.Assert;
+import com.dtsx.astra.sdk.utils.AstraEnvironment;
 
 import java.util.Set;
 
@@ -28,7 +29,7 @@ public class DbKeyspacesClient extends AbstractApiClient  {
      *      database identifier
      */
     public DbKeyspacesClient(String token, String databaseId) {
-        this(token, ApiLocator.AstraEnvironment.PROD, databaseId);
+        this(token, AstraEnvironment.PROD, databaseId);
     }
 
     /**
@@ -41,7 +42,7 @@ public DbKeyspacesClient(String token, String databaseId) {
      * @param databaseId
      *      database identifier
      */
-    public DbKeyspacesClient(String token, ApiLocator.AstraEnvironment env, String databaseId) {
+    public DbKeyspacesClient(String token, AstraEnvironment env, String databaseId) {
         super(token, env);
         Assert.hasLength(databaseId, "databaseId");
         this.db = new DatabaseClient(token, env, databaseId).get();

astra-sdk-devops/src/main/java/com/dtsx/astra/sdk/db/DbPrivateLinksClient.java

@@ -3,6 +3,7 @@
 import com.dtsx.astra.sdk.AbstractApiClient;
 import com.dtsx.astra.sdk.utils.ApiLocator;
 import com.dtsx.astra.sdk.utils.Assert;
+import com.dtsx.astra.sdk.utils.AstraEnvironment;
 import com.dtsx.astra.sdk.utils.HttpClientWrapper;
 import com.dtsx.astra.sdk.db.domain.Database;
 
@@ -32,7 +33,7 @@ public class DbPrivateLinksClient extends AbstractApiClient  {
      *      database identifier
      */
     public DbPrivateLinksClient(String token, String databaseId) {
-        this(token, ApiLocator.AstraEnvironment.PROD, databaseId);
+        this(token, AstraEnvironment.PROD, databaseId);
     }
 
     /**
@@ -45,7 +46,7 @@ public DbPrivateLinksClient(String token, String databaseId) {
      * @param databaseId
      *      database identifier
      */
-    public DbPrivateLinksClient(String token, ApiLocator.AstraEnvironment env, String databaseId) {
+    public DbPrivateLinksClient(String token, AstraEnvironment env, String databaseId) {
         super(token, env);
         Assert.hasLength(databaseId, "databaseId");
         this.db = new DatabaseClient(token, databaseId).get();