Skip to content

Commit 4dd273e

Browse files
clunclun
committed
build
1 parent b52ea80 commit 4dd273e

File tree

13 files changed

+90
-88
lines changed

13 files changed

+90
-88
lines changed

‎astra-sdk-devops/src/main/java/com/dtsx/astra/sdk/db/DatabaseClient.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,15 @@ public DbPrivateLinksClient privateLink() {
345345
// ---- Utilities ----
346346
// ---------------------------------
347347

348+
/**
349+
* Gets databaseId
350+
*
351+
* @return value of databaseId
352+
*/
353+
public String getDatabaseId() {
354+
return databaseId;
355+
}
356+
348357
/**
349358
* Endpoint to access dbs.
350359
*

‎astra-sdk-devops/src/main/java/com/dtsx/astra/sdk/org/UsersClient.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.dtsx.astra.sdk.AbstractApiClient;
44
import com.dtsx.astra.sdk.AstraDevopsApiClient;
5-
import com.dtsx.astra.sdk.utils.HttpClientWrapper;
65
import com.dtsx.astra.sdk.org.domain.InviteUserRequest;
76
import com.dtsx.astra.sdk.org.domain.ResponseAllUsers;
87
import com.dtsx.astra.sdk.org.domain.Role;

‎astra-sdk-devops/src/test/java/com/datastax/astra/sdk/devops/AbstractDevopsApiTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ public abstract class AbstractDevopsApiTest {
2121
static final String SDK_TEST_DB_REGION = "us-east1";
2222

2323
/** Test Constants. */
24-
static final String SDK_TEST_KEYSPACE = "ks1";
24+
static final String SDK_TEST_KEYSPACE = "java";
2525

2626
/** Test Constants. */
27-
static final String SDK_TEST_KEYSPACE2 = "ks2";
27+
static final String SDK_TEST_KEYSPACE2 = "java2";
2828

2929
/**
3030
* Hold reference to token

‎astra-sdk/src/main/java/com/datastax/astra/sdk/AstraClient.java‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@ public class AstraClient implements Closeable {
7373
/** Access to all Stargate sub Api (rest, graphQL, doc, gRPC). */
7474
protected StargateClient stargateClient;
7575

76-
/** Keep some information realted to Astra Settings. */
76+
/** Keep some information related to Astra Settings. */
7777
protected AstraClientConfig astraClientConfig;
7878

79-
/** Hold a reference on current region used for the Failover. */
79+
/** Hold a reference on current region used for the Fail-over. */
8080
protected String currentDatabaseRegion;
8181

8282
/**
@@ -110,7 +110,7 @@ public AstraClient(String dbId, String dbRegion, String token) {
110110
* Initialization through builder.
111111
*
112112
* @param config
113-
* configuration extrated from builder
113+
* configuration extracted from builder
114114
*/
115115
public AstraClient(AstraClientConfig config) {
116116
this.astraClientConfig = config;
@@ -173,7 +173,7 @@ public AstraClient(AstraClientConfig config) {
173173
}
174174

175175
/* Loop on regions. for each region a DC. */
176-
db.get().getInfo().getDatacenters().stream().forEach(dc -> {
176+
db.get().getInfo().getDatacenters().forEach(dc -> {
177177
// Rest Api
178178
config.getStargateConfig().addServiceRest(dc.getRegion(),
179179
new ServiceHttp(dc.getRegion() + "-rest",
@@ -212,7 +212,7 @@ public AstraClient(AstraClientConfig config) {
212212

213213
} else {
214214

215-
LOGGER.info("+ Cross-region failback is disabled.");
215+
LOGGER.info("+ Cross-region fallback is disabled.");
216216
// Authentication for the DB
217217
config.getStargateConfig().withApiTokenProviderDC(currentDatabaseRegion,
218218
new SimpleTokenProvider(config.getToken()));
@@ -259,19 +259,23 @@ public AstraClient(AstraClientConfig config) {
259259
}
260260

261261
/**
262-
* Download the secure connect bundle files
262+
* Download the secure connect bundle files.
263+
*
263264
* @param config
265+
* configuration for client
264266
*/
265267
private void downloadAndSetupSecureConnectBundle(AstraClientConfig config) {
266268
if (!new File(config.getSecureConnectBundleFolder()).exists()) {
267-
new File(config.getSecureConnectBundleFolder()).mkdirs();
269+
if (new File(config.getSecureConnectBundleFolder()).mkdirs()) {
270+
LOGGER.info("+ Folder Created to hold SCB");
271+
}
268272
}
269273
// Download secure bundles (if needed)
270274
LOGGER.info("+ Downloading bundles in: [" + AnsiUtils.cyan("{}") + "]", config.getSecureConnectBundleFolder());
271275
apiDevopsDatabases.database(config.getDatabaseId())
272276
.downloadAllSecureConnectBundles(config.getSecureConnectBundleFolder());
273277

274-
// Setup the current region
278+
// Set up the current region
275279
String scbFile = config.getSecureConnectBundleFolder()
276280
+ File.separator
277281
+ AstraClientConfig.buildScbFileName(config.getDatabaseId(), config.getDatabaseRegion());
@@ -380,7 +384,7 @@ public CqlSession cqlSession() {
380384
if (stargateClient == null || !stargateClient.cqlSession().isPresent()) {
381385
throw new IllegalStateException("CQL Session is not available."
382386
+ " Make sure you enabled it with .enableCql() and provide all"
383-
+ " expected paramters: keyspace, contact points or SCB, user+password ");
387+
+ " expected parameters: keyspace, contact points or SCB, user+password ");
384388
}
385389
return stargateClient.cqlSession().get();
386390
}
@@ -396,7 +400,7 @@ public Optional<String> getToken() {
396400
}
397401

398402
/**
399-
* Getter to the configuratin, it should not be changed.
403+
* Getter to the configuration, it should not be changed.
400404
*
401405
* @return
402406
* initial configuration
@@ -423,7 +427,7 @@ public void useRegion(String region) {
423427
*
424428
* @return AstraClientBuilder
425429
*/
426-
public static final AstraClientConfig builder() {
430+
public static AstraClientConfig builder() {
427431
return new AstraClientConfig();
428432
}
429433

‎astra-sdk/src/test/java/com/datastax/astra/sdk/AstraRcTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,8 @@ public void should_create_astraRc_File() {
4545
AstraRc arc = new AstraRc(tmpAstraRC.getAbsolutePath());
4646
arc.createSectionWithToken("default", "ABC");
4747
arc.save();
48-
//Then
48+
// Then
4949
Assertions.assertTrue(tmpAstraRC.exists());
50-
System.out.println(arc.getSections());
5150
}
5251

5352

‎astra-sdk/src/test/java/com/datastax/astra/sdk/AstraTestUtils.java‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.datastax.astra.sdk;
22

3+
import com.datastax.astra.sdk.stargate.AstraStargateInitializationTest;
34
import io.stargate.sdk.StargateClient;
45
import io.stargate.sdk.utils.AnsiUtils;
56
import com.dtsx.astra.sdk.db.DatabaseClient;
@@ -15,17 +16,15 @@
1516
import java.util.stream.Collectors;
1617

1718
/**
18-
* Helper for tetst.
19-
*
20-
* @author Cedrick LUNVEN (@clunven)
19+
* Helper for tests.
2120
*/
2221
public class AstraTestUtils {
23-
22+
2423
/** Logger for our Client. */
25-
private static final Logger LOGGER = LoggerFactory.getLogger(AstraTestUtils.class);
26-
24+
private static final Logger LOGGER = LoggerFactory.getLogger(AstraStargateInitializationTest.class);
25+
2726
/** Test constant. */
28-
public static final String TEST_DBNAME = "sdk_tests";
27+
public static final String TEST_DBNAME = "sdk_java_test";
2928

3029
/** Test constant. */
3130
public static final String TEST_NAMESPACE = "java";
@@ -62,14 +61,15 @@ public static StargateClient initStargateClient() {
6261
}
6362

6463
/**
65-
* Allows to TODO
64+
* Wait for the DB to respond.
65+
*
6666
* @param dbc
67+
* database client
6768
* @param status
6869
*/
6970
public static void waitForDbStatus(DatabaseClient dbc, DatabaseStatusType status, int timeoutSeconds) {
7071
long top = System.currentTimeMillis();
71-
LOGGER.info("Waiting for DB {} to be in status {} with timeout '{}' seconds.",
72-
dbc.getDatabaseId(), status, timeoutSeconds);
72+
System.out.println("Waiting for DB " + dbc.getDatabaseId());
7373
while(status != dbc.find().get().getStatus() && ((System.currentTimeMillis()-top) < 1000*timeoutSeconds)) {
7474
System.out.print(AnsiUtils.green("\u25a0"));
7575
waitForSeconds(5);
@@ -78,7 +78,6 @@ public static void waitForDbStatus(DatabaseClient dbc, DatabaseStatusType status
7878
if (dbc.find().get().getStatus() != status) {
7979
throw new IllegalStateException("Database is not in expected state after timeouts");
8080
}
81-
LOGGER.info("Status {}", status);
8281
}
8382

8483
/**
@@ -122,10 +121,10 @@ public static String createDbAndKeyspaceIfNotExist(AstraDbClient devopsDbCli, St
122121
if (dbs.size() > 0) {
123122
LOGGER.info("A database with the expected name [" + AnsiUtils.cyan("{}") + "] already exists, checking keyspace.", dbName);
124123
Database db = dbs.get(0);
125-
DatabaseClient dbc =devopsDbCli.dbClientById(db.getId());
124+
DatabaseClient dbc = devopsDbCli.database(db.getId());
126125
if (!db.getInfo().getKeyspaces().contains(keyspace)) {
127126
LOGGER.info("Creating keyspace {}", keyspace);
128-
dbc.createKeyspace(keyspace);
127+
dbc.keyspaces().create(keyspace);
129128
waitForDbStatus(dbc, DatabaseStatusType.ACTIVE, 60);
130129
} else {
131130
LOGGER.info("A keyspace with the expected name [" + AnsiUtils.cyan("{}") + "] already exists.", keyspace);
@@ -143,7 +142,7 @@ public static String createDbAndKeyspaceIfNotExist(AstraDbClient devopsDbCli, St
143142
.keyspace(keyspace)
144143
.build());
145144
LOGGER.info("db id = '{}'", serverlessDbId);
146-
DatabaseClient dbc = devopsDbCli.dbClientById(serverlessDbId);
145+
DatabaseClient dbc = devopsDbCli.database(serverlessDbId);
147146
waitForDbStatus(dbc, DatabaseStatusType.ACTIVE, 120);
148147
return serverlessDbId;
149148
}
@@ -159,7 +158,7 @@ public static String createDbAndKeyspaceIfNotExist(AstraDbClient devopsDbCli, St
159158
*/
160159
public static void terminateDatabaseByName(AstraDbClient devopsDbCli, String dbName) {
161160
LOGGER.info("Terminating DB {}", dbName);
162-
DatabaseClient dbc = devopsDbCli.dbClientByName(dbName);
161+
DatabaseClient dbc = devopsDbCli.databaseByName(dbName);
163162
if(dbc.exist()) {
164163
dbc.delete();
165164
waitForDbStatus(dbc, DatabaseStatusType.TERMINATED, 60);

‎astra-sdk/src/test/java/com/datastax/astra/sdk/stargate/ApiDocumentCollectionsAstraTest.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010
import org.junit.jupiter.api.Test;
1111

1212
/**
13-
* Execute some unit tests agains collections.
14-
*
15-
* @author Cedrick LUNVEN (@clunven)
13+
* Execute some unit tests against collections.
1614
*/
1715
public class ApiDocumentCollectionsAstraTest extends AbstractDocClientCollectionsTest {
1816

@@ -24,7 +22,7 @@ public static void init() {
2422

2523
// Connect the client to the new created DB
2624
client = AstraClient.builder()
27-
.withToken(client.getToken().get())
25+
.withToken(client.getToken().orElseThrow(() -> new IllegalStateException("token not found")))
2826
.withCqlKeyspace(TestDocClientConstants.TEST_NAMESPACE)
2927
.withDatabaseId(dbId)
3028
.withDatabaseRegion(AstraTestUtils.TEST_REGION)

‎astra-sdk/src/test/java/com/datastax/astra/sdk/stargate/ApiDocumentDocumentAstraTest.java‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,12 @@
22

33
import com.datastax.astra.sdk.AstraClient;
44
import com.datastax.astra.sdk.AstraTestUtils;
5-
import io.stargate.sdk.test.doc.AbstractDocClientCollectionsTest;
65
import io.stargate.sdk.test.doc.AbstractDocClientDocumentsTest;
7-
import io.stargate.sdk.test.doc.AbstractDocClientNamespacesTest;
86
import io.stargate.sdk.test.doc.TestDocClientConstants;
97
import org.junit.jupiter.api.BeforeAll;
108

119
/**
12-
* Execute some unit tests agains collections.
13-
*
14-
* @author Cedrick LUNVEN (@clunven)
10+
* Execute some unit tests against collections.
1511
*/
1612
public class ApiDocumentDocumentAstraTest extends AbstractDocClientDocumentsTest {
1713

@@ -23,7 +19,7 @@ public static void init() {
2319

2420
// Connect the client to the new created DB
2521
client = AstraClient.builder()
26-
.withToken(client.getToken().get())
22+
.withToken(client.getToken().orElseThrow(() -> new IllegalStateException("token not found")))
2723
.withCqlKeyspace(TestDocClientConstants.TEST_NAMESPACE)
2824
.withDatabaseId(dbId)
2925
.withDatabaseRegion(AstraTestUtils.TEST_REGION)

‎astra-sdk/src/test/java/com/datastax/astra/sdk/stargate/ApiDocumentNamespacesAstraTest.java‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,18 @@
55
import io.stargate.sdk.doc.domain.Namespace;
66
import io.stargate.sdk.test.doc.AbstractDocClientNamespacesTest;
77
import io.stargate.sdk.test.doc.TestDocClientConstants;
8-
import org.junit.jupiter.api.*;
8+
import org.junit.jupiter.api.BeforeAll;
9+
import org.junit.jupiter.api.DisplayName;
10+
import org.junit.jupiter.api.Order;
11+
import org.junit.jupiter.api.Test;
912

1013
import java.util.Map;
11-
import java.util.Set;
1214
import java.util.function.Function;
1315
import java.util.stream.Collectors;
1416

17+
import static org.junit.jupiter.api.Assertions.assertNotNull;
18+
import static org.junit.jupiter.api.Assertions.assertTrue;
19+
1520
/**
1621
* Work with local stargate
1722
*
@@ -25,8 +30,6 @@
2530
* -e CLUSTER_VERSION=3.11 \
2631
* -e DEVELOPER_MODE=true \
2732
* stargateio/stargate-3_11:v1.0.35
28-
*
29-
* @author Cedrick LUNVEN (@clunven)
3033
*/
3134
public class ApiDocumentNamespacesAstraTest extends AbstractDocClientNamespacesTest {
3235

@@ -38,7 +41,7 @@ public static void init() {
3841

3942
// Connect the client to the new created DB
4043
client = AstraClient.builder()
41-
.withToken(client.getToken().get())
44+
.withToken(client.getToken().orElseThrow(() -> new IllegalStateException("token not found")))
4245
.withCqlKeyspace(TestDocClientConstants.TEST_NAMESPACE)
4346
.withDatabaseId(dbId)
4447
.withDatabaseRegion(AstraTestUtils.TEST_REGION)
@@ -76,9 +79,11 @@ public void c_should_create_namespace_already_exist() {
7679
@Override
7780
@DisplayName("04-Get all namespaces")
7881
public void d_should_list_namespaces() {
79-
Assertions.assertTrue(((Set) stargateDocumentApiClient.namespaceNames().collect(Collectors.toSet())).contains("java"));
80-
Map<String, Namespace> nsList = (Map) stargateDocumentApiClient.namespaces().collect(Collectors.toMap(Namespace::getName, Function.identity()));
81-
Assertions.assertNotNull(nsList.get("java"));
82+
assertTrue(stargateDocumentApiClient.namespaceNames().collect(Collectors.toSet()).contains("java"));
83+
Map<String, Namespace> nsList = stargateDocumentApiClient
84+
.namespaces()
85+
.collect(Collectors.toMap(Namespace::getName, Function.identity()));
86+
assertNotNull(nsList.get("java"));
8287
}
8388

8489
@Test

‎astra-sdk/src/test/java/com/datastax/astra/sdk/stargate/ApiDocumentRepositoryAstraTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public static void init() {
2626

2727
// Connect the client to the new created DB
2828
client = AstraClient.builder()
29-
.withToken(client.getToken().get())
29+
.withToken(client.getToken().orElseThrow(() -> new IllegalStateException("token not found")))
3030
.withCqlKeyspace(TestDocClientConstants.TEST_NAMESPACE)
3131
.withDatabaseId(dbId)
3232
.withDatabaseRegion(AstraTestUtils.TEST_REGION)

0 commit comments

Comments
 (0)