Adding logs

Author: clun

astra-db-client/src/main/java/com/dtsx/astra/sdk/AstraDB.java

@@ -5,6 +5,7 @@
 import com.dtsx.astra.sdk.db.AstraDBOpsClient;
 import com.dtsx.astra.sdk.db.domain.Database;
 import com.dtsx.astra.sdk.db.exception.DatabaseNotFoundException;
+import com.dtsx.astra.sdk.utils.ApiLocator;
 import com.dtsx.astra.sdk.utils.AstraEnvironment;
 import io.stargate.sdk.ServiceDeployment;
 import io.stargate.sdk.api.SimpleTokenProvider;
@@ -44,6 +45,10 @@ public class AstraDB {
      */
     private final NamespaceClient nsClient;
 
+    /**
+     * Url to access the API
+     */
+    private final String apiEndpoint;
 
     /**
      * Initialization with endpoint and apikey.
@@ -60,6 +65,7 @@ public AstraDB(String token, String apiEndpoint) {
         if (apiEndpoint.endsWith("com")) {
             apiEndpoint = apiEndpoint + "/api/json";
         }
+        this.apiEndpoint = apiEndpoint;
         // Finding Environment based on apiEndpoint (looping to devops)
         if (apiEndpoint.contains(AstraEnvironment.PROD.getAppsSuffix())) {
             this.env = AstraEnvironment.PROD;
@@ -122,18 +128,27 @@ public AstraDB(@NonNull String token, @NonNull UUID databaseId, String region, @
                 .findById(databaseId.toString())
                 .orElseThrow(() -> new DatabaseNotFoundException(databaseId.toString()));
 
-        this.apiClient = AstraClient.builder()
-                .env(env)
-                .withDatabaseRegion(region == null ? region : db.getInfo().getRegion())
-                .withDatabaseId(databaseId.toString())
-                .disableCrossRegionFailOver()
-                .build()
-                .apiStargateJson();
+        this.apiEndpoint = ApiLocator
+                .getApiJsonEndpoint(env, databaseId.toString(), region != null ? region : db.getInfo().getRegion());
+        // Create Json Api Client without AstraDB
+        ServiceDeployment<ServiceHttp> jsonDeploy = new ServiceDeployment<>();
+        jsonDeploy.addDatacenterTokenProvider("default", new SimpleTokenProvider(token));
+        jsonDeploy.addDatacenterServices("default", new ServiceHttp("json", apiEndpoint, apiEndpoint));
+        this.apiClient = new ApiClient(jsonDeploy);
 
         // will inherit 'default_keyspace' from the database
         this.nsClient = apiClient.namespace(db.getInfo().getKeyspace());
     }
 
+    /**
+     * Gets apiEndpoint
+     *
+     * @return value of apiEndpoint
+     */
+    public String getApiEndpoint() {
+        return apiEndpoint;
+    }
+
     // --------------------------
     // ---  Find, FindAll    ----
     // --------------------------

astra-sdk-devops/src/main/java/com/dtsx/astra/sdk/utils/ApiLocator.java

@@ -89,6 +89,20 @@ public static String getApiJsonEndpoint(String dbId, String dbRegion) {
         return getApiJsonEndpoint(AstraEnvironment.PROD, dbId, dbRegion);
     }
 
+    /**
+     * END Point for the Json API
+     *
+     * @param dbId
+     *      database identifier
+     * @param dbRegion
+     *      region identifier
+     * @return
+     *      the url to invoke
+     */
+    public static String getApiEndpoint(String dbId, String dbRegion) {
+        return getApiEndpoint(AstraEnvironment.PROD, dbId, dbRegion);
+    }
+
     /**
      * END Point for the Json API
      *
@@ -102,10 +116,25 @@ public static String getApiJsonEndpoint(String dbId, String dbRegion) {
      *      the url to invoke
      */
     public static String getApiJsonEndpoint(AstraEnvironment env, String dbId, String dbRegion) {
+        return getApiEndpoint(env, dbId, dbRegion) + "/api/json";
+    }
+
+    /**
+     * END Point for the Json API
+     *
+     * @param env
+     *      target environment
+     * @param dbId
+     *      database identifier
+     * @param dbRegion
+     *      region identifier
+     * @return
+     *      the url to invoke
+     */
+    public static String getApiEndpoint(AstraEnvironment env, String dbId, String dbRegion) {
         Assert.hasLength(dbId, "dbId");
         Assert.hasLength(dbRegion, "dbRegion");
-        String val =  HTTPS + dbId + "-" + dbRegion + env.getAppsSuffix() + "/api/json";
-        return val;
+        return HTTPS + dbId + "-" + dbRegion + env.getAppsSuffix();
     }
 
     /**

pom.xml

@@ -38,7 +38,7 @@
         <lombok.version>1.18.30</lombok.version>
 
         <!-- Stargate -->
-        <stargate-sdk.version>2.1.3</stargate-sdk.version>
+        <stargate-sdk.version>2.1.4-SNAPSHOT</stargate-sdk.version>
         <stargate-grpc.version>2.0.17</stargate-grpc.version>
         <grpc-netty.version>1.56.1</grpc-netty.version>