removing the stack from the logs

datastax · clun · Nov 30, 2024 · Nov 19, 2024 · Nov 20, 2024 · Nov 21, 2024
commit 4d832cf1813a8ccc99f88a64c6fc1eb86170711a
diff --git a/astra-db-java/src/main/java/com/datastax/astra/client/exception/DataAPIErrorDescriptor.java b/astra-db-java/src/main/java/com/datastax/astra/client/exception/DataAPIErrorDescriptor.java
@@ -20,6 +20,8 @@
  * #L%
  */
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -30,6 +32,7 @@
  */
 @Getter
 @Setter
+@JsonIgnoreProperties({"stackTrace", "suppressed", "cause", "localizedMessage"})
 public class DataAPIErrorDescriptor extends RuntimeException {
 
     /**
@@ -77,6 +80,7 @@ public DataAPIErrorDescriptor() {
      * @return A concatenated string representing the full error message, which may include the exception class name,
      * the error code in parentheses, and the detailed error message. Each element is included only if it is not {@code null}.
      */
+    @JsonIgnore
     public String getErrorMessage() {
         StringBuilder sb = new StringBuilder();
         if (exceptionClass != null) {
@@ -90,4 +94,11 @@ public String getErrorMessage() {
         }
         return sb.toString().trim();
     }
+
+    @Override
+    @JsonIgnore
+    public String getLocalizedMessage() {
+        return super.getLocalizedMessage();
+    }
+
 }
diff --git a/...-db-java/src/main/java/com/datastax/astra/client/tables/mapping/EntityBeanDefinition.java b/...-db-java/src/main/java/com/datastax/astra/client/tables/mapping/EntityBeanDefinition.java
@@ -152,10 +152,10 @@ public EntityBeanDefinition(Class<T> clazz) {
     }
 
     /**
-     * Build the partition Key based on annotated fields.
+     * Build the partition Key based on annotated fields with @PartitionBy with position.
      *
      * @return
-     *      list of partition keys
+     *      An ordered list of partition keys (partition key)
      */
     public List<String> getPartitionBy() {
         return getFields().values().stream()
@@ -171,10 +171,10 @@ public List<String> getPartitionBy() {
     }
 
     /**
-     * Build the clustering Key based on annotated fields.
+     * Build the partition sort based on annotated fields @PartitionSort with position and order.
      *
      * @return
-     *      list of clustering keys
+     *      an ordered map representing the partition sort (clustering columns)
      */
     public Map<String, Integer> getPartitionSort() {
         List<EntityFieldDefinition> fields = getFields().values().stream()

diff --git a/astra-db-java/src/main/java/com/datastax/astra/internal/api/DataAPIResponse.java b/astra-db-java/src/main/java/com/datastax/astra/internal/api/DataAPIResponse.java
@@ -21,7 +21,9 @@
  */
 
 import com.datastax.astra.client.collections.documents.Document;
+import com.datastax.astra.client.core.commands.Command;
 import com.datastax.astra.client.exception.DataAPIErrorDescriptor;
+import com.datastax.astra.client.exception.UnexpectedDataAPIResponseException;
 import com.datastax.astra.internal.serdes.DataAPISerializer;
 import com.datastax.astra.internal.utils.Assert;
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -89,7 +91,9 @@ public DataAPIResponse() {
      */
     @SuppressWarnings("unchecked")
     public Stream<String> getStatusKeyAsStringStream(@NonNull String key) {
-        Assert.isTrue(status.containsKey(key), "Key not found in status map");
+        if (!status.containsKey(key)) {
+            throw new UnexpectedDataAPIResponseException(new Command(), this, "Key '" + key + "' has not been found in response.");
+        }
         return ((ArrayList<String>) status.get(key)).stream();
     }
 

diff --git a/astra-db-java/src/test/java/com/datastax/astra/test/integration/AbstractDatabaseTest.java b/astra-db-java/src/test/java/com/datastax/astra/test/integration/AbstractDatabaseTest.java
@@ -45,9 +45,18 @@ public abstract class AbstractDatabaseTest extends AbstractDataAPITest {
     // --------- Collections --------------
     // ------------------------------------
 
+    public void cleanupCollections() {
+        // Removing a few collections to test mores elements
+        getDatabase().listCollectionNames().forEach(c -> {
+            System.out.println("Dropping collection ..." + c);
+            getDatabase().dropCollection(c);
+        });
+    }
+
     @Test
     @Order(1)
     public void shouldCreateCollectionSimple() {
+        cleanupCollections();
         // When
         getDatabase().createCollection(COLLECTION_SIMPLE);
         assertThat(getDatabase().collectionExists(COLLECTION_SIMPLE)).isTrue();
@@ -227,8 +236,6 @@ public void shouldCollectionWorkWithUUIDs() {
         resultsList.getInsertedIds().forEach(id -> assertThat(id).isInstanceOf(UUID.class));
     }
 
-
-
     @Test
     @Order(11)
     public void shouldCollectionWorkWithObjectIds() {
@@ -263,13 +270,14 @@ public void shouldCollectionWorkWithObjectIds() {
         product.setCode(UUID.randomUUID());
         product.setPrice(0d);
         Collection<ProductObjectId> collectionObjectId = getDatabase().createCollection(COLLECTION_OBJECTID,
-                        new CollectionDefinition().defaultId(OBJECT_ID), ProductObjectId.class);
+                new CollectionDefinition().defaultId(OBJECT_ID), ProductObjectId.class);
         collectionObjectId.deleteAll();
         collectionObjectId.insertOne(product);
         Optional<ProductObjectId> productObjectId = collectionObjectId.findOne(eq(product.getId()));
         assertThat(productObjectId).isPresent();
     }
 
+
     @Test
     @Order(12)
     public void shouldCollectionWorkWithUUIDv6() {
@@ -302,6 +310,7 @@ public void shouldCollectionWorkWithUUIDv6() {
     @Test
     @Order(13)
     public void shouldCollectionWorkWithUUIDv7() {
+        cleanupCollections();
         // When
         Collection<Document> collectionUUID = getDatabase()
                 .createCollection(COLLECTION_UUID_V7, new CollectionDefinition()

diff --git a/...-db-java/src/test/java/com/datastax/astra/test/integration/local/LocalDatabaseITTest.java b/...-db-java/src/test/java/com/datastax/astra/test/integration/local/LocalDatabaseITTest.java
@@ -7,10 +7,12 @@
 import com.datastax.astra.client.core.options.DataAPIClientOptions;
 import com.datastax.astra.client.databases.Database;
 import com.datastax.astra.client.core.auth.UsernamePasswordTokenProvider;
+import com.datastax.astra.client.exception.DataAPIException;
 import com.datastax.astra.client.exception.DataAPIResponseException;
 import com.datastax.astra.client.core.commands.Command;
 import com.datastax.astra.client.collections.documents.Document;
 import com.datastax.astra.client.core.http.HttpProxy;
+import com.datastax.astra.client.exception.UnexpectedDataAPIResponseException;
 import com.datastax.astra.test.integration.AbstractDatabaseTest;
 import com.dtsx.astra.sdk.db.domain.CloudProviderType;
 import com.dtsx.astra.sdk.utils.AstraEnvironment;
@@ -56,10 +58,8 @@ void shouldRunInvalidCommand() {
             //getDatabase().registerListener("demo", new MockCommandObserver());
             getDatabase().runCommand(new Command("invalid", new Document()));
             //getDatabase().deleteListener("demo");
-        } catch(DataAPIResponseException dat) {
-            assertThat(dat.getMessage()).contains("No \"invalid\" command found ");
-            assertThat(dat.getApiErrors()).isNotEmpty();
-            assertThat(dat.getCommandsList()).isNotEmpty();
+        } catch(DataAPIException dat) {
+            assertThat(dat.getMessage()).contains("COMMAND_UNKNOWN");;
         }
     }
 

diff --git a/...egration/local/QuickStartTablesLocal.java → ...stra/test/unit/QuickStartTablesLocal.java b/...egration/local/QuickStartTablesLocal.java → ...stra/test/unit/QuickStartTablesLocal.java
@@ -1,4 +1,4 @@
-package com.datastax.astra.test.integration.local;
+package com.datastax.astra.test.unit;
 
 import com.datastax.astra.client.DataAPIClients;
 import com.datastax.astra.client.core.query.Filter;