Skip to content

Commit 987a571

Browse files
committed
Hide secrets and improve test coverage
1 parent 91fd3cc commit 987a571

File tree

10 files changed

+2112
-516
lines changed

10 files changed

+2112
-516
lines changed

astra-db-client/pom.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
</parent>
1212

1313
<properties>
14-
<!-- used for test in this module -->
15-
<stargate-sdk.version>2.3.0</stargate-sdk.version>
1614
<openai-java.version>0.18.2</openai-java.version>
1715
<langchain4j.version>0.25.0</langchain4j.version>
1816
<okhttp.version>4.10.0</okhttp.version>
@@ -34,7 +32,6 @@
3432
<dependency>
3533
<groupId>com.datastax.stargate</groupId>
3634
<artifactId>stargate-sdk-data</artifactId>
37-
<version>2.3.0</version>
3835
</dependency>
3936

4037
<!-- CQL API (CassioIO) -->

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ public AstraDB(@NonNull String token, @NonNull UUID databaseId, @NonNull String
137137
}
138138

139139
/**
140-
* Accessing the database with id an region.
140+
* Accessing the database with id and region.
141141
*
142142
* @param token
143143
* astra token
@@ -260,7 +260,7 @@ public AstraDBCollection createCollection(String name) {
260260
* json vector store
261261
*/
262262
public <DOC> AstraDBRepository<DOC> createCollection(String name, Class<DOC> clazz) {
263-
return new AstraDBRepository<DOC>(nsClient.createCollection(name, clazz));
263+
return new AstraDBRepository<>(nsClient.createCollection(name, clazz));
264264
}
265265

266266
/**
@@ -312,7 +312,7 @@ public AstraDBCollection createCollection(String name, int vectorDimension, Simi
312312
* object type
313313
*/
314314
public <T> AstraDBRepository<T> createCollection(String name, int vectorDimension, Class<T> bean) {
315-
return new AstraDBRepository<T>(nsClient.createCollection(CollectionDefinition.builder()
315+
return new AstraDBRepository<>(nsClient.createCollection(CollectionDefinition.builder()
316316
.name(name)
317317
.vector(vectorDimension, SimilarityMetric.cosine)
318318
.build(), bean));
@@ -344,7 +344,7 @@ public AstraDBCollection createCollection(CollectionDefinition def) {
344344
* json vector store
345345
*/
346346
public <DOC> AstraDBRepository<DOC> createCollection(CollectionDefinition def, Class<DOC> clazz) {
347-
return new AstraDBRepository<DOC>(nsClient.createCollection(def, clazz));
347+
return new AstraDBRepository<>(nsClient.createCollection(def, clazz));
348348
}
349349

350350
// --------------------
@@ -376,7 +376,7 @@ public AstraDBCollection collection(@NonNull String storeName) {
376376
* type of the bean in use
377377
*/
378378
public <T> AstraDBRepository<T> collectionRepository(@NonNull String storeName, Class<T> clazz) {
379-
return new AstraDBRepository<T>(nsClient.collectionRepository(storeName, clazz));
379+
return new AstraDBRepository<>(nsClient.collectionRepository(storeName, clazz));
380380
}
381381

382382
/**
@@ -385,7 +385,7 @@ public <T> AstraDBRepository<T> collectionRepository(@NonNull String storeName,
385385
* @return
386386
* raw namespace client
387387
*/
388-
public NamespaceClient getRawNamespaceClient() {
388+
public NamespaceClient getNamespaceClient() {
389389
return nsClient;
390390
}
391391

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public class AstraDBAdmin {
5454
/**
5555
* Token header param
5656
*/
57-
public static final String TOKEN_HEADER_PARAM = "X-Cassandra-Token";
57+
public static final String TOKEN_HEADER_PARAM = "X-Token";
5858

5959
/**
6060
* Technical Keyspace name.
@@ -353,7 +353,7 @@ private DatabaseStatusType getStatus(DbOpsClient dbc) {
353353
*/
354354
private void resumeDb(Database db) {
355355
try {
356-
// Compute Endpoint for the Keyspaces
356+
// Compute Endpoint for the Keyspace
357357
String endpoint = ApiLocator.getApiRestEndpoint(db.getId(), db.getInfo().getRegion()) + "/v2/schemas/keyspace";
358358
HttpRequest request = HttpRequest.newBuilder()
359359
.uri(URI.create(endpoint))
@@ -382,7 +382,7 @@ private void resumeDb(Database db) {
382382
* @return
383383
* database client
384384
*/
385-
public DataApiClient getInternalDataApiClient(@NonNull String databaseName) {
385+
public DataApiClient getDataApiClient(@NonNull String databaseName) {
386386
return database(databaseName).getApiClient();
387387
}
388388

@@ -394,7 +394,7 @@ public DataApiClient getInternalDataApiClient(@NonNull String databaseName) {
394394
* @return
395395
* database client
396396
*/
397-
public DataApiClient getInternalDataApiClient(@NonNull UUID databaseId) {
397+
public DataApiClient getDataApiClient(@NonNull UUID databaseId) {
398398
return database(databaseId).getApiClient();
399399
}
400400

@@ -404,7 +404,7 @@ public DataApiClient getInternalDataApiClient(@NonNull UUID databaseId) {
404404
* @return
405405
* devops client.
406406
*/
407-
public AstraDBOpsClient getInternalDevopsApiClient() {
407+
public AstraDBOpsClient getDevopsApiClient() {
408408
return this.devopsDbClient;
409409
}
410410

0 commit comments

Comments
 (0)