Merge pull request #46 from datastax/main

Update 2.0 Branch

Author: clun

.github/workflows/ci-astra-col-db-dbadmin.yaml

@@ -16,7 +16,7 @@ on:
       java_version:
         description: 'JDK version to use'
         required: true
-        default: '11.0'
+        default: '17.0'
       cache_pkg_mgr_name:
         description: 'Cache package manager to be used'
         required: true

.github/workflows/ci-astra-dev-new.yml

@@ -17,7 +17,7 @@ on:
       java_version:
         description: 'JDK version to use'
         required: true
-        default: '11.0'
+        default: '17.0'
       cache_pkg_mgr_name:
         description: 'Cache package manager to be used'
         required: true
@@ -100,9 +100,9 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          distribution: 'adopt'
-          java-version: '11.0'
-          cache: 'maven'
+          distribution: ${{ inputs.java_distribution }}
+          java-version: ${{ inputs.java_version }}
+          cache: ${{ inputs.cache_pkg_mgr_name }}
 
       - name: Run Maven Tests
         env:

.github/workflows/ci-astra-vectorize-bedrock-hf.yaml

@@ -24,7 +24,7 @@ on:
       java_version:
         description: 'JDK version to use'
         required: true
-        default: '11.0'
+        default: '17.0'
       cache_pkg_mgr_name:
         description: 'Cache package manager to be used'
         required: true

File

@@ -15,64 +15,6 @@ docker-compose -f ./docker-compose-dse.yml up -d
 docker run -it --rm --network container:$(docker ps | grep dse | cut -b 1-12) cassandra:latest cqlsh -u cassandra -p cassandra
 ```
 
-
-```sql
-  insert into default_keyspace.table_all_returns (
-    p_ascii,
-    p_bigint,
-    p_blob,
-    p_boolean,
-    p_date,
-    p_decimal,
-    p_double,
-    p_double_minf,
-    p_double_pinf,
-    p_duration,
-    p_float,
-    p_float_nan,
-    p_inet,
-    p_int,
-    p_smallint,
-    p_text,
-    p_text_nulled,
-    p_time,
-    p_timestamp,
-    p_tinyint,
-    p_uuid,
-    p_varint,
-    p_vector,
-    p_list_int,
-    // p_map_text_int,
-    p_set_int
-) values (
-             'abc',
-             10000,
-             0xabcdef0123456789,
-             true,
-             '2015-05-03',
-             123.45,
-             987.6543,
-             -Infinity,
-             Infinity,
-             12h48m,
-             66.55,
-             NaN,
-             '12.34.56.78',
-             2024,
-             200,
-             'måndag',
-             null,
-             '13:30:54.234',
-             '2015-05-03 13:30:54.234',
-             104,
-             9c5b94b1-35ad-49bb-b118-8e8fc24abf80,
-             123456789,
-             [0.1, 0.2, 0.3],
-             [4, 17, 34],
-             // {'a': 101, 'b': 102},
-             {9, 81}
-         );
-```
 ## Run the Test
 
 ### Prerequisites

Preferences...

@@ -0,0 +1,52 @@
+
+## Run against Local HCD Instance 
+(_to run locally your must have the data api running locally on op of HCD or DSE_)
+
+```bash
+mvn clean test -Ptest_local
+```
+
+> **Why it works ?**
+> 
+> - In `pom.xml` the environment variable `ASTRA_DB_JAVA_TEST_ENV` is set to `local` 
+> - Tests are annotated with
+> 
+> ```java
+> @EnabledIfSystemProperty(named = "ASTRA_DB_JAVA_TEST_ENV", matches = "local")
+> @DisabledIfSystemProperty(named = "ASTRA_DB_JAVA_TEST_ENV", matches = "(?!local)")
+> public class MyTest {
+> }
+> ```
+
+- To run with IDE make sure to set the environment variable `ASTRA_DB_JAVA_TEST_ENV` to `local` in your Run configuration
+
+
+## Run against Astra DEV
+
+- `ASTRA_DB_APPLICATION_TOKEN_DEV` should be defined in your environment variables, it is not in the different POM for privacy reasons.
+
+- To run with Maven (AWS,`eu-west-2`)
+
+```bash
+mvn clean test -Ptest_astra_dev
+```
+
+- To run with Maven on One particular region
+
+```java
+mvn clean test -Ptest_astra_dev \
+  -DASTRA_CLOUD_PROVIDER_DEV=GCP \
+  -DASTRA_CLOUD_REGION_DEV=us-central-1
+```
+
+- To run overriding also the token
+
+```java
+mvn clean test \
+  -Ptest_astra_dev \
+  -DASTRA_CLOUD_PROVIDER_DEV=GCP \
+  -DASTRA_CLOUD_REGION_DEV=us-central-1 \
+  -ASTRA_DB_APPLICATION_TOKEN_DEV=AstraCS:... \
+  -Dtest="com.datastax.astra.test.integration.*.*Test"
+```
+

RELEASE.MD

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.datastax.astra</groupId>
         <artifactId>astra-db-java-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0-PREVIEW1-SNAPSHOT</version>
     </parent>
 
     <dependencies>

Resources

@@ -1,7 +1,7 @@
 package com.datastax.astra.tool.loader.csv;
 
 import com.datastax.astra.client.collections.Collection;
-import com.datastax.astra.client.collections.documents.Document;
+import com.datastax.astra.client.collections.definition.documents.Document;
 import com.opencsv.CSVReader;
 import lombok.extern.slf4j.Slf4j;