Skip to content

Commit e7746c5

Browse files
clunclun
committed
compiling
1 parent 75a36fa commit e7746c5

File tree

86 files changed

+2013
-2077
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+2013
-2077
lines changed

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import com.datastax.astra.sdk.config.AstraClientConfig;
2020
import com.datastax.oss.driver.api.core.CqlSession;
2121
import com.datastax.stargate.sdk.StargateClient;
22-
import com.datastax.stargate.sdk.config.StargateNodeConfig;
2322
import com.datastax.stargate.sdk.doc.ApiDocumentClient;
2423
import com.datastax.stargate.sdk.gql.ApiGraphQLClient;
2524
import com.datastax.stargate.sdk.grpc.ApiGrpcClient;
@@ -172,7 +171,7 @@ public AstraClient(AstraClientConfig config) {
172171
throw new IllegalArgumentException("Cannot retrieve db with id " + config.getDatabaseId());
173172
}
174173

175-
// Loop on regions
174+
/* Loop on regions
176175
db.get().getInfo().getDatacenters().stream().forEach(dc -> {
177176
config.getStargateConfig().withApiNodeDC(dc.getRegion(),
178177
new StargateNodeConfig(
@@ -193,9 +192,10 @@ public AstraClient(AstraClientConfig config) {
193192
+ File.separator
194193
+ AstraClientConfig.buildScbFileName(config.getDatabaseId(), dc.getRegion()));
195194
}
196-
);
195+
);*/
197196

198197
} else {
198+
/*
199199
LOGGER.info("+ Cross-region failback is disabled.");
200200
config.getStargateConfig().withApiNodeDC(currentDatabaseRegion,
201201
new StargateNodeConfig(
@@ -214,9 +214,10 @@ public AstraClient(AstraClientConfig config) {
214214
config.getSecureConnectBundleFolder()
215215
+ File.separator
216216
+ AstraClientConfig.buildScbFileName(config.getDatabaseId(), currentDatabaseRegion));
217+
*/
217218
}
218219
this.stargateClient = config.getStargateConfig().build();
219-
220+
220221
} else {
221222
LOGGER.info("+ API(s) CqlSession [" + AnsiUtils.red("DISABLED")+ "]");
222223
LOGGER.info("+ API(s) Document [" + AnsiUtils.red("DISABLED")+ "]");

‎astra-sdk/src/main/java/com/datastax/astra/sdk/config/AstraClientConfig.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import com.datastax.oss.driver.api.core.config.ProgrammaticDriverConfigLoaderBuilder;
66
import com.datastax.oss.driver.api.core.config.TypedDriverOption;
77
import com.datastax.oss.driver.api.core.tracker.RequestTracker;
8-
import com.datastax.stargate.sdk.audit.ApiInvocationObserver;
9-
import com.datastax.stargate.sdk.config.StargateClientConfig;
8+
import com.datastax.stargate.sdk.audit.ServiceCallObserver;
9+
import com.datastax.stargate.sdk.StargateClientBuilder;
1010
import com.datastax.stargate.sdk.utils.AnsiUtils;
1111
import com.evanlennick.retry4j.config.RetryConfig;
1212
import org.apache.hc.client5.http.config.RequestConfig;
@@ -204,15 +204,15 @@ public String getDatabaseRegion() {
204204
// ------------------------------------------------
205205

206206
/** Configuring Stargate to work in Astra. */
207-
private final StargateClientConfig stargateConfig;
207+
private final StargateClientBuilder stargateConfig;
208208

209209
/**
210210
* Getter accessor for attribute 'stargateConfig'.
211211
*
212212
* @return
213213
* current value of 'stargateConfig'
214214
*/
215-
public StargateClientConfig getStargateConfig() {
215+
public StargateClientBuilder getStargateConfig() {
216216
return stargateConfig;
217217
}
218218

@@ -253,7 +253,7 @@ public AstraClientConfig withHttpRetryConfig(RetryConfig retryConfig) {
253253
* instance of your Observer
254254
* @return self reference
255255
*/
256-
public AstraClientConfig addHttpObserver(String name, ApiInvocationObserver observer) {
256+
public AstraClientConfig addHttpObserver(String name, ServiceCallObserver observer) {
257257
stargateConfig.addHttpObserver(name, observer);
258258
return this;
259259
}
@@ -265,7 +265,7 @@ public AstraClientConfig addHttpObserver(String name, ApiInvocationObserver obse
265265
* observers lists
266266
* @return self reference
267267
*/
268-
public AstraClientConfig withHttpObservers(Map<String, ApiInvocationObserver> observers) {
268+
public AstraClientConfig withHttpObservers(Map<String, ServiceCallObserver> observers) {
269269
stargateConfig.withHttpObservers(observers);
270270
return this;
271271
}
@@ -973,7 +973,7 @@ public AstraClientConfig() {
973973
LOGGER.info("Initializing [" + AnsiUtils.yellow("AstraClient") + "]");
974974

975975
// Loading Stargate Environment variable
976-
stargateConfig = new StargateClientConfig();
976+
stargateConfig = new StargateClientBuilder();
977977

978978
// Loading ~/.astrarc section default if present
979979
if (AstraRc.isDefaultConfigFileExists()) {

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

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

33
import com.datastax.stargate.sdk.StargateClient;
4-
import com.datastax.stargate.sdk.doc.test.ApiDocumentNamespacesTest;
54
import com.datastax.stargate.sdk.utils.AnsiUtils;
65
import com.dtsx.astra.sdk.db.DatabaseClient;
76
import com.dtsx.astra.sdk.db.DatabasesClient;
@@ -27,7 +26,10 @@ public class AstraTestUtils {
2726

2827
/** Test constant. */
2928
public static final String TEST_DBNAME = "sdk_tests";
30-
29+
30+
/** Test constant. */
31+
public static final String TEST_NAMESPACE = "java";
32+
3133
/** Test constant. */
3234
public static final String TEST_REGION = "us-east-1";
3335

@@ -100,7 +102,7 @@ public static void waitForSeconds(int seconds) {
100102
*/
101103
public static String createTestDbIfNotExist(AstraClient astraClient) {
102104
return createDbAndKeyspaceIfNotExist(
103-
astraClient.apiDevopsDatabases(), TEST_DBNAME, ApiDocumentNamespacesTest.TEST_NAMESPACE);
105+
astraClient.apiDevopsDatabases(), TEST_DBNAME, TEST_NAMESPACE);
104106
}
105107

106108
/**

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

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,16 @@
1616

1717
package com.datastax.astra.sdk.stargate;
1818

19-
import java.util.stream.Collectors;
20-
19+
import com.datastax.astra.sdk.AstraClient;
20+
import com.datastax.astra.sdk.AstraTestUtils;
2121
import org.junit.jupiter.api.Assertions;
2222
import org.junit.jupiter.api.BeforeAll;
2323
import org.junit.jupiter.api.DisplayName;
2424
import org.junit.jupiter.api.Test;
2525
import org.slf4j.Logger;
2626
import org.slf4j.LoggerFactory;
2727

28-
import com.datastax.astra.sdk.AstraClient;
29-
import com.datastax.astra.sdk.AstraTestUtils;
30-
import com.datastax.stargate.sdk.doc.test.ApiDocumentTest;
28+
import java.util.stream.Collectors;
3129

3230
/**
3331
* Multiple Connectivity mode for eacj parameters.
@@ -40,7 +38,11 @@ public class CqlSessionAstraTest {
4038
private static final Logger LOGGER = LoggerFactory.getLogger(CqlSessionAstraTest.class);
4139

4240
private static AstraClient client;
43-
41+
42+
/** Test constant. */
43+
public static final String TEST_NAMESPACE = "java";
44+
45+
4446
@BeforeAll
4547
public static void config() {
4648

@@ -50,7 +52,7 @@ public static void config() {
5052
// Connect the client to the new created DB
5153
client = AstraClient.builder()
5254
.withToken(client.getToken().get())
53-
.withCqlKeyspace(ApiDocumentTest.TEST_NAMESPACE)
55+
.withCqlKeyspace(TEST_NAMESPACE)
5456
.withDatabaseId(dbId)
5557
.withDatabaseRegion(AstraTestUtils.TEST_REGION)
5658
.build();

‎stargate-sdk-commons/pom.xml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,8 @@
1818
<dependencies>
1919

2020
<dependency>
21-
<groupId>ch.qos.logback</groupId>
22-
<artifactId>logback-classic</artifactId>
23-
</dependency>
24-
25-
<dependency>
26-
<groupId>ch.qos.logback</groupId>
27-
<artifactId>logback-core</artifactId>
21+
<groupId>org.slf4j</groupId>
22+
<artifactId>slf4j-api</artifactId>
2823
</dependency>
2924

3025
<dependency>

‎stargate-sdk-commons/src/main/java/com/datastax/stargate/sdk/ManagedServiceDatacenter.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,4 +108,13 @@ public ApiTokenProvider getTokenProvider() {
108108
return tokenProvider;
109109
}
110110

111+
@Override
112+
public String toString() {
113+
return "ManagedServiceDatacenter{" +
114+
"available=" + available +
115+
", datacenterName='" + datacenterName + '\'' +
116+
", tokenProvider=" + tokenProvider +
117+
", stargateNodesLB=" + stargateNodesLB +
118+
'}';
119+
}
111120
}

‎stargate-sdk-commons/src/main/java/com/datastax/stargate/sdk/ManagedServiceDeployment.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,4 +168,11 @@ public Set<String> getAvailableDatacenters() {
168168
.collect(Collectors.toSet());
169169
}
170170

171+
@Override
172+
public String toString() {
173+
return "ManagedServiceDeployment{" +
174+
"datacenters=" + datacenters +
175+
", currentDatacenter='" + currentDatacenter + '\'' +
176+
'}';
177+
}
171178
}

‎stargate-sdk-commons/src/main/java/com/datastax/stargate/sdk/Service.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,4 +91,5 @@ public String getHealthCheckEndpoint() {
9191
public void setHealthCheckEndpoint(String healthCheckEndpoint) {
9292
this.healthCheckEndpoint = healthCheckEndpoint;
9393
}
94+
9495
}

‎stargate-sdk-commons/src/main/java/com/datastax/stargate/sdk/utils/CompletableFutures.java‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
package com.datastax.stargate.sdk.utils;
2+
3+
import java.util.List;
4+
import java.util.concurrent.*;
5+
import java.util.concurrent.atomic.AtomicInteger;
6+
import java.util.function.Supplier;
7+
8+
/**
9+
* Utilities to work with Async functions.
10+
*/
11+
public class CompletableFutures {
12+
13+
public static <T> CompletionStage<Void> allDone(List<CompletionStage<T>> inputs) {
14+
CompletableFuture<Void> result = new CompletableFuture<>();
15+
if (inputs.isEmpty()) {
16+
result.complete(null);
17+
} else {
18+
final int todo = inputs.size();
19+
final AtomicInteger done = new AtomicInteger();
20+
for (CompletionStage<?> input : inputs) {
21+
input.whenComplete(
22+
(v, error) -> {
23+
if (done.incrementAndGet() == todo) {
24+
result.complete(null);
25+
}
26+
});
27+
}
28+
}
29+
return result;
30+
}
31+
}

‎stargate-sdk-docapi/pom.xml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
<dependencies>
1515

16+
<!-- HTTP CLIENT -->
1617
<dependency>
1718
<groupId>com.datastax.stargate</groupId>
1819
<artifactId>stargate-sdk-httpclient</artifactId>
@@ -25,6 +26,27 @@
2526
<artifactId>org.everit.json.schema</artifactId>
2627
</dependency>
2728

29+
<dependency>
30+
<groupId>org.junit.jupiter</groupId>
31+
<artifactId>junit-jupiter-api</artifactId>
32+
<scope>test</scope>
33+
</dependency>
34+
<dependency>
35+
<groupId>org.junit.jupiter</groupId>
36+
<artifactId>junit-jupiter-engine</artifactId>
37+
<scope>test</scope>
38+
</dependency>
39+
<dependency>
40+
<groupId>org.junit.platform</groupId>
41+
<artifactId>junit-platform-runner</artifactId>
42+
<scope>test</scope>
43+
</dependency>
44+
<dependency>
45+
<groupId>org.slf4j</groupId>
46+
<artifactId>slf4j-nop</artifactId>
47+
<scope>test</scope>
48+
</dependency>
49+
2850
</dependencies>
2951

3052

0 commit comments

Comments
 (0)