Skip to content

Commit 4cfe393

Browse files
clunclun
committed
Compilation ok
1 parent e18c65b commit 4cfe393

18 files changed

+888
-92
lines changed

‎src/main/java/com/datastax/astra/client/Collection.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,10 @@ protected Collection(Database db, String collectionName, Class<DOC> clazz) {
126126
// --- Global Informations ----
127127
// ----------------------------
128128

129+
public String getNamespaceName() {
130+
return getDatabase().getNamespaceName();
131+
}
132+
129133
/**
130134
* Retrieves the parent {@link Database} instance.
131135
* This parent namespace is used for performing CRUD (Create, Read, Update, Delete) operations on collections.

‎src/main/java/com/datastax/astra/client/DataApiClients.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,5 +56,12 @@ public static DataAPIClient astraDev(String token) {
5656
.build());
5757
}
5858

59+
public static DataAPIClient astraTest(String token) {
60+
return new DataAPIClient(token, DataAPIClientOptions
61+
.builder()
62+
.withDestination(DataAPIDestination.ASTRA_TEST)
63+
.build());
64+
}
65+
5966

6067
}

‎src/main/java/com/datastax/astra/client/Database.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ public Stream<CollectionDefinition> listCollections() {
177177
* @return
178178
* if namespace exists
179179
*/
180-
boolean collectionExists(String collection) {
180+
public boolean collectionExists(String collection) {
181181
return listCollectionNames().anyMatch(collection::equals);
182182
}
183183

‎src/test/java/com/datastax/astra/AstraDBTestSupport.java

Lines changed: 17 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
package com.datastax.astra;
22

3-
import com.datastax.astra.devops.db.domain.CloudProviderType;
4-
import com.datastax.astra.devops.utils.ApiLocator;
5-
import com.datastax.astra.devops.utils.AstraEnvironment;
3+
64
import com.datastax.astra.client.AstraDBAdmin;
7-
import com.datastax.astra.internal.astra.AstraDatabase;
8-
import io.stargate.sdk.utils.Utils;
5+
import com.datastax.astra.client.DataApiClients;
6+
import com.datastax.astra.client.Database;
7+
import com.dtsx.astra.sdk.db.domain.CloudProviderType;
8+
import com.dtsx.astra.sdk.utils.ApiLocator;
9+
import com.dtsx.astra.sdk.utils.AstraEnvironment;
10+
import com.dtsx.astra.sdk.utils.Utils;
911
import lombok.extern.slf4j.Slf4j;
1012

1113
import java.util.UUID;
@@ -25,39 +27,23 @@ public class AstraDBTestSupport {
2527
public static AstraDBAdmin getAstraDBClient(AstraEnvironment env) {
2628
switch (env) {
2729
case DEV:
28-
return new AstraDBAdmin(Utils.readEnvVariable("ASTRA_DB_APPLICATION_TOKEN_DEV")
29-
.orElseThrow(() -> new IllegalStateException("Please define env variable 'ASTRA_DB_APPLICATION_TOKEN_DEV'")));
30+
return DataApiClients.astraDev(Utils.readEnvVariable("ASTRA_DB_APPLICATION_TOKEN_DEV")
31+
.orElseThrow(() -> new IllegalStateException("Please define env variable 'ASTRA_DB_APPLICATION_TOKEN_DEV'")))
32+
.getAdmin();
3033
case PROD:
31-
return new AstraDBAdmin(Utils.readEnvVariable("ASTRA_DB_APPLICATION_TOKEN")
32-
.orElseThrow(() -> new IllegalStateException("Please define env variable 'ASTRA_DB_APPLICATION_TOKEN'")));
34+
return DataApiClients.astra(Utils.readEnvVariable("ASTRA_DB_APPLICATION_TOKEN")
35+
.orElseThrow(() -> new IllegalStateException("Please define env variable 'ASTRA_DB_APPLICATION_TOKEN'")))
36+
.getAdmin();
3337
case TEST:
34-
return new AstraDBAdmin(Utils.readEnvVariable("ASTRA_DB_APPLICATION_TOKEN_TEST")
35-
.orElseThrow(() -> new IllegalStateException("Please define env variable 'ASTRA_DB_APPLICATION_TOKEN_TEST'")));
38+
return DataApiClients.astraTest(Utils.readEnvVariable("ASTRA_DB_APPLICATION_TOKEN_TEST")
39+
.orElseThrow(() -> new IllegalStateException("Please define env variable 'ASTRA_DB_APPLICATION_TOKEN_TEST'")))
40+
.getAdmin();
3641
default:
3742
throw new IllegalArgumentException("Invalid Environment");
3843
}
3944
}
4045

41-
public static AstraDatabase createDatabase(AstraEnvironment env) {
42-
CloudProviderType cloud;
43-
String region;
44-
switch (env) {
45-
case DEV:
46-
case TEST:
47-
cloud = CloudProviderType.GCP;
48-
region = "europe-west4";
49-
break;
50-
case PROD:
51-
cloud = CloudProviderType.GCP;
52-
region = "us-east1";
53-
break;
54-
default:
55-
throw new IllegalArgumentException("Invalid Environment");
56-
}
57-
return createDatabase(env, cloud, region);
58-
}
59-
60-
public static AstraDatabase createDatabase(AstraEnvironment env, CloudProviderType cloud, String region) {
46+
public static Database initializeDb(AstraEnvironment env, CloudProviderType cloud, String region) {
6147
log.info("Working in environment '{}'", env.name());
6248
AstraDBAdmin client = getAstraDBClient(env);
6349
UUID databaseId = client.createDatabase(DATABASE_NAME, cloud, region);

‎src/test/java/com/datastax/astra/TestConstants.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package com.datastax.astra;
2+
3+
public interface TestConstants {
4+
5+
String NAMESPACE_NS1 = "ns1";
6+
7+
String COLLECTION_SIMPLE = "collection_simple";
8+
9+
String COLLECTION_VECTOR = "collection_vector";
10+
11+
String COLLECTION_DENY = "collection_deny";
12+
13+
String COLLECTION_ALLOW = "collection_allow";
14+
}

‎src/test/java/com/datastax/astra/documentation/collection/ClearCollection.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
package com.datastax.astra.documentation.collection;
22

3-
import com.datastax.astra.db.AstraCollection;
4-
import com.datastax.astra.internal.astra.AstraDatabase;
5-
import io.stargate.sdk.data.client.model.Document;
3+
import com.datastax.astra.client.Collection;
4+
import com.datastax.astra.client.Database;
5+
import com.datastax.astra.client.model.Document;
66

77
public class ClearCollection {
88
public static void main(String[] args) {
99
// Connect to running dn
10-
AstraDatabase db = new AstraDatabase("API_ENDPOINT", "TOKEN");
10+
Database db = new Database("API_ENDPOINT", "TOKEN");
1111

1212
// Accessing the collection
13-
AstraCollection<Document> collection = db.getCollection("collection_simple");
13+
Collection<Document> collection = db.getCollection("collection_simple");
1414

1515
// Delete all rows from an existing collection
1616
collection.deleteAll();

‎src/test/java/com/datastax/astra/documentation/db/CreateCollection.java

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,28 @@
11
package com.datastax.astra.documentation.db;
22

3-
import com.datastax.astra.db.AstraCollection;
4-
import com.datastax.astra.internal.astra.AstraDatabase;
5-
import io.stargate.sdk.data.client.exception.DataApiException;
6-
import io.stargate.sdk.data.client.model.Document;
7-
import io.stargate.sdk.data.client.model.SimilarityMetric;
8-
import io.stargate.sdk.data.client.model.collections.CreateCollectionOptions;
3+
import com.datastax.astra.client.Collection;
4+
import com.datastax.astra.client.Database;
5+
import com.datastax.astra.client.exception.DataApiException;
6+
import com.datastax.astra.client.model.Document;
7+
import com.datastax.astra.client.model.collections.CollectionOptions;
8+
import com.datastax.astra.client.model.find.SimilarityMetric;
99

1010
public class CreateCollection {
1111
public static void main(String[] args) {
12-
AstraDatabase db =
13-
new AstraDatabase("API_ENDPOINT", "TOKEN");
12+
Database db = new Database("API_ENDPOINT", "TOKEN");
1413

1514
// Create a non-vector collection
16-
AstraCollection<Document> col =
17-
db.createCollection("col");
15+
Collection<Document> col = db.createCollection("col");
1816

1917
// Create a vector collection
20-
AstraCollection<Document> col_v = db.createCollection("col_v", CreateCollectionOptions
18+
Collection<Document> col_v = db.createCollection("col_v", CollectionOptions
2119
.builder()
2220
.withVectorDimension(1536)
2321
.withVectorSimilarityMetric(SimilarityMetric.euclidean)
2422
.build());
2523

2624
// Create a collection with indexing (deny)
27-
AstraCollection<Document> col_i = db.createCollection("col_i", CreateCollectionOptions
25+
Collection<Document> col_i = db.createCollection("col_i", CollectionOptions
2826
.builder()
2927
.withIndexingDeny("blob")
3028
.build());

‎src/test/java/com/datastax/astra/documentation/db/CreateNamespace.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package com.datastax.astra.documentation.db;
22

3-
import com.datastax.astra.internal.astra.AstraDatabase;
3+
import com.datastax.astra.client.Database;
44

55
public class CreateNamespace {
66
public static void main(String[] args) {
77
// Default initialization
8-
AstraDatabase db = new AstraDatabase("API_ENDPOINT", "TOKEN");
8+
Database db = new Database("API_ENDPOINT", "TOKEN");
99

1010
// Create a new namespace
11-
db.createNamespace("<namespace_name>");
11+
db.getDatabaseAdmin().createNamespace("<namespace_name>");
1212
}
1313
}

‎src/test/java/com/datastax/astra/documentation/db/DropCollection.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.datastax.astra.documentation.db;
22

3-
import com.datastax.astra.internal.astra.AstraDatabase;
3+
import com.datastax.astra.client.Database;
44

55
public class DropCollection {
66
public static void main(String[] args) {
7-
AstraDatabase db = new AstraDatabase("API_ENDPOINT", "TOKEN");
7+
Database db = new Database("API_ENDPOINT", "TOKEN");
88

99
// Delete an existing collection
1010
db.dropCollection("collection_vector2");

0 commit comments

Comments
 (0)