road to fix the build

Author: clun

astra-db-java/src/main/java/com/datastax/astra/client/core/commands/CommandOptions.java

@@ -141,23 +141,6 @@ public T embeddingAuthProvider(EmbeddingHeadersProvider embeddingAuthProvider) {
         return (T) this;
     }
 
-    /**
-     * Provide the embedding service API key.
-     *
-     * @param embeddingServiceApiKey
-     *      embedding service key
-     * @return
-     *      service key
-     * @deprecated
-     *      has been replaced by {@link #embeddingAuthProvider(EmbeddingHeadersProvider)}
-     */
-    @Deprecated
-    @SuppressWarnings("unchecked")
-    public T embeddingAPIKey(String embeddingServiceApiKey) {
-        this.embeddingAuthProvider = new EmbeddingAPIKeyHeaderProvider(embeddingServiceApiKey);
-        return (T) this;
-    }
-
     /**
      * Allow to register a listener for the command.
      * @param name

astra-db-java/src/main/java/com/datastax/astra/client/core/options/TimeoutOptions.java

@@ -1,5 +1,25 @@
 package com.datastax.astra.client.core.options;
 
+/*-
+ * #%L
+ * Data API Java Client
+ * --
+ * Copyright (C) 2024 DataStax
+ * --
+ * Licensed under the Apache License, Version 2.0
+ * You may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
 import lombok.Data;
 
 @Data

astra-db-java/src/main/java/com/datastax/astra/client/tables/Table.java

@@ -623,8 +623,6 @@ public void deleteOne(Filter filter, TableDeleteOneOptions deleteOneOptions) {
      *      the query filter to apply the delete operation
      * @param options
      *      the options to apply to the operation
-     * @return
-     *      the result of the remove many operation
      */
     public void deleteMany(Filter filter, TableDeleteManyOptions options) {
         AtomicInteger totalCount = new AtomicInteger(0);

astra-db-java/src/main/java/com/datastax/astra/internal/api/DataAPIDocumentResponse.java

@@ -1,5 +1,25 @@
 package com.datastax.astra.internal.api;
 
+/*-
+ * #%L
+ * Data API Java Client
+ * --
+ * Copyright (C) 2024 DataStax
+ * --
+ * Licensed under the Apache License, Version 2.0
+ * You may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
 import com.datastax.astra.internal.serdes.tables.RowSerializer;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;

cassio-cql/src/main/java/com/dtsx/cassio/ClusteredMetadataVectorRecord.java

@@ -17,8 +17,8 @@
  *     row_id timeuuid,
  *     attributes_blob text,
  *     body_blob text,
- *     metadata_s map<text, text>,
- *     vector vector<float, 1536>,
+ *     metadata_s map&lt;text, text&gt;,
+ *     vector vector&lt;float, 1536&gt;,
  *     PRIMARY KEY (partition_id, row_id)
  * ) WITH CLUSTERING ORDER BY (row_id DESC);
  * --------------------------------------------------------------------------

examples/src/main/java/QuickStartHCD.java

@@ -1,21 +1,22 @@
 import com.datastax.astra.client.collections.Collection;
 import com.datastax.astra.client.DataAPIClient;
+import com.datastax.astra.client.collections.CollectionOptions;
+import com.datastax.astra.client.collections.documents.Document;
+import com.datastax.astra.client.core.auth.EmbeddingAPIKeyHeaderProvider;
+import com.datastax.astra.client.core.commands.CommandOptions;
 import com.datastax.astra.client.databases.Database;
 import com.datastax.astra.client.admin.DataAPIDatabaseAdmin;
-import com.datastax.astra.client.core.CollectionOptions;
-import com.datastax.astra.client.core.CommandOptions;
-import com.datastax.astra.client.core.Document;
 import com.datastax.astra.client.collections.commands.FindOneOptions;
-import com.datastax.astra.client.core.NamespaceOptions;
 import com.datastax.astra.client.core.vector.SimilarityMetric;
 import com.datastax.astra.client.core.auth.UsernamePasswordTokenProvider;
+import com.datastax.astra.client.keyspaces.KeyspaceOptions;
 
 import java.util.Optional;
 
 import static com.datastax.astra.client.DataAPIClients.DEFAULT_ENDPOINT_LOCAL;
-import static com.datastax.astra.client.core.options.DataAPIOptions.DataAPIDestination.HCD;
+import static com.datastax.astra.client.DataAPIDestination.HCD;
 import static com.datastax.astra.client.core.options.DataAPIOptions.builder;
-import static com.datastax.astra.client.core.Filters.eq;
+import static com.datastax.astra.client.core.query.Filters.eq;
 
 public class QuickStartHCD {
 
@@ -46,7 +47,7 @@ public static void main(String[] args) {
         ((DataAPIDatabaseAdmin) client
                 .getDatabase(dataApiUrl)
                 .getDatabaseAdmin())
-                .createNamespace(keyspaceName, NamespaceOptions.simpleStrategy(1));
+                .createKeyspace(keyspaceName, KeyspaceOptions.simpleStrategy(1));
         System.out.println("3/7 - Keyspace '" + keyspaceName + "'created ");
 
         Database db = client.getDatabase(dataApiUrl, keyspaceName);
@@ -58,7 +59,7 @@ public static void main(String[] args) {
                 .vectorDimension(openAiEmbeddingDimension)
                 .vectorize(openAiProvider, openAiModel)
                 .build(),
-                new CommandOptions<>().embeddingAPIKey(openAiKey));
+                new CommandOptions<>().embeddingAuthProvider(new EmbeddingAPIKeyHeaderProvider(openAiKey)));
         System.out.println("5/7 - Collection created with OpenAI embeddings");
 
         // Insert some documents

examples/src/main/java/QuickStartLocal.java

@@ -1,11 +1,11 @@
 import com.datastax.astra.client.collections.Collection;
 import com.datastax.astra.client.DataAPIClient;
+import com.datastax.astra.client.collections.documents.Document;
 import com.datastax.astra.client.databases.Database;
-import com.datastax.astra.client.core.Document;
 import com.datastax.astra.client.collections.commands.FindIterable;
 import com.datastax.astra.client.core.auth.UsernamePasswordTokenProvider;
 
-import static com.datastax.astra.client.core.options.DataAPIOptions.DataAPIDestination.CASSANDRA;
+import static com.datastax.astra.client.DataAPIDestination.CASSANDRA;
 import static com.datastax.astra.client.core.options.DataAPIOptions.builder;
 import static com.datastax.astra.client.core.vector.SimilarityMetric.COSINE;
 

examples/src/main/java/QuickStartTraining.java

@@ -1,9 +1,9 @@
 import com.datastax.astra.client.collections.Collection;
 import com.datastax.astra.client.DataAPIClient;
+import com.datastax.astra.client.collections.CollectionOptions;
+import com.datastax.astra.client.collections.documents.Document;
 import com.datastax.astra.client.core.options.DataAPIOptions;
 import com.datastax.astra.client.databases.Database;
-import com.datastax.astra.client.core.CollectionOptions;
-import com.datastax.astra.client.core.Document;
 import com.datastax.astra.client.collections.commands.FindIterable;
 
 import static com.datastax.astra.client.core.vector.SimilarityMetric.COSINE;

examples/src/main/java/Quickstart.java

@@ -1,8 +1,8 @@
 import com.datastax.astra.client.collections.Collection;
 import com.datastax.astra.client.DataAPIClient;
+import com.datastax.astra.client.collections.documents.Document;
 import com.datastax.astra.client.core.options.DataAPIOptions;
 import com.datastax.astra.client.databases.Database;
-import com.datastax.astra.client.core.Document;
 import com.datastax.astra.client.collections.commands.FindIterable;
 import com.datastax.astra.client.collections.commands.FindOptions;