Skip to content

Commit 547c473

Browse files
clunclun
committed
Compilation ok
1 parent c08ac94 commit 547c473

19 files changed

+123
-87
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.datastax.astra.client;
22

33
import com.datastax.astra.internal.astra.AstraApiEndpoint;
4-
import com.datastax.astra.internal.astra.AstraDBDatabaseAdmin;
4+
import com.datastax.astra.internal.AstraDBDatabaseAdmin;
55
import com.datastax.astra.internal.utils.Assert;
66
import com.dtsx.astra.sdk.db.AstraDBOpsClient;
77
import com.dtsx.astra.sdk.db.DbOpsClient;

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

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public class Collection<DOC> extends AbstractCommandRunner {
102102
private final Database database;
103103

104104
/** Api Endpoint for the Database. */
105-
private final String apiEndpoint;
105+
private final String apiEndpointCollection;
106106

107107
/**
108108
* Full constructor.
@@ -119,7 +119,7 @@ protected Collection(Database db, String collectionName, Class<DOC> clazz) {
119119
this.collectionName = collectionName;
120120
this.database = db;
121121
this.documentClass = clazz;
122-
this.apiEndpoint = db.getApiEndpointDatabase() + "/" + collectionName;
122+
this.apiEndpointCollection = db.getApiEndpointDatabase() + "/" + collectionName;
123123
}
124124

125125
// ----------------------------
@@ -1213,10 +1213,18 @@ public BulkWriteResult bulkWrite(List<Command> commands, BulkWriteOptions option
12131213
return result;
12141214
}
12151215

1216+
// --- Required for the Command Runner ---
1217+
12161218
/** {@inheritDoc} */
12171219
@Override
12181220
protected String getApiEndpoint() {
1219-
return apiEndpoint;
1221+
return apiEndpointCollection;
1222+
}
1223+
1224+
/** {@inheritDoc} */
1225+
@Override
1226+
protected String getToken() {
1227+
return database.getToken();
12201228
}
12211229

12221230
/** {@inheritDoc} */

‎src/main/java/com/datastax/astra/client/DataApiClients.java renamed to ‎src/main/java/com/datastax/astra/client/DataAPIClients.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/**
66
* Initialization of the client in a Static way.
77
*/
8-
public class DataApiClients {
8+
public class DataAPIClients {
99

1010
/** Default endpoint. */
1111
public static final String DEFAULT_ENDPOINT = "http://localhost:8181";
@@ -22,7 +22,7 @@ public class DataApiClients {
2222
/**
2323
* Utility class, should not be instanced.
2424
*/
25-
private DataApiClients() {}
25+
private DataAPIClients() {}
2626

2727
/**
2828
* Create from an Endpoint only

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

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -57,17 +57,18 @@ public static DataAPIClientOptionsBuilder builder() {
5757
private DataAPIOptions(DataAPIClientOptionsBuilder builder) {
5858
this.apiVersion = builder.apiVersion;
5959
this.destination = builder.destination;
60-
this.httpClientOptions = HttpClientOptions.builder()
61-
.userAgentCallerName(builder.userAgentCallerName)
62-
.userAgentCallerVersion(builder.userAgentCallerVersion)
63-
.connectionRequestTimeoutInSeconds(builder.httpRequestTimeout)
64-
.responseTimeoutInSeconds(builder.httpConnectTimeout)
65-
.retryCount(builder.retryCount)
66-
.retryDelay(builder.retryDelay)
67-
.proxy(builder.httpProxy)
68-
.httpVersion(builder.httpVersion)
69-
.httpRedirect(builder.httpRedirect)
70-
.build();
60+
61+
HttpClientOptions httpClientOptions = new HttpClientOptions();
62+
httpClientOptions.setHttpVersion(builder.httpVersion);
63+
httpClientOptions.setHttpRedirect(builder.httpRedirect);
64+
httpClientOptions.setRetryCount(builder.retryCount);
65+
httpClientOptions.setRetryDelay(builder.retryDelay);
66+
httpClientOptions.setUserAgentCallerName(builder.userAgentCallerName);
67+
httpClientOptions.setUserAgentCallerVersion(builder.userAgentCallerVersion);
68+
httpClientOptions.setConnectionRequestTimeoutInSeconds(builder.httpRequestTimeout);
69+
httpClientOptions.setResponseTimeoutInSeconds(builder.httpConnectTimeout);
70+
httpClientOptions.setProxy(builder.httpProxy);
71+
this.httpClientOptions = httpClientOptions;
7172
}
7273

7374
public static class DataAPIClientOptionsBuilder {

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import com.datastax.astra.internal.AbstractCommandRunner;
99
import com.datastax.astra.internal.DataAPIDatabaseAdmin;
1010
import com.datastax.astra.internal.astra.AstraApiEndpoint;
11-
import com.datastax.astra.internal.astra.AstraDBDatabaseAdmin;
11+
import com.datastax.astra.internal.AstraDBDatabaseAdmin;
1212
import com.datastax.astra.internal.http.HttpClientOptions;
1313
import com.datastax.astra.internal.utils.JsonUtils;
1414
import lombok.Getter;
@@ -320,11 +320,21 @@ public void dropCollection(String collectionName) {
320320
log.info("Collection '" + green("{}") + "' has been deleted", collectionName);
321321
}
322322

323+
// --- Required for the Command Runner ---
324+
325+
/** {@inheritDoc} */
323326
@Override
324327
protected String getApiEndpoint() {
325328
return apiEndpointDatabase;
326329
}
327330

331+
/** {@inheritDoc} */
332+
@Override
333+
protected String getToken() {
334+
return null;
335+
}
336+
337+
/** {@inheritDoc} */
328338
@Override
329339
protected HttpClientOptions getHttpClientOptions() {
330340
return options.getHttpClientOptions();

‎src/main/java/com/datastax/astra/internal/AbstractCommandRunner.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public void deleteListener(String name) {
4646
}
4747

4848
protected synchronized RetryHttpClient getHttpClient() {
49-
if (httpClient != null) {
49+
if (httpClient == null) {
5050
httpClient = new RetryHttpClient(getHttpClientOptions());
5151
}
5252
return httpClient;
@@ -63,8 +63,7 @@ public ApiResponse runCommand(Command command) {
6363
try {
6464
// (Custom) Serialization
6565
String jsonCommand = JsonUtils.marshallForDataApi(command);
66-
67-
ApiResponseHttp httpRes = getHttpClient().POST(getApiEndpoint(), jsonCommand);
66+
ApiResponseHttp httpRes = getHttpClient().POST(getApiEndpoint(), getToken(), jsonCommand);
6867
executionInfo.withHttpResponse(httpRes);
6968

7069
ApiResponse jsonRes = JsonUtils.unmarshallBeanForDataApi(httpRes.getBody(), ApiResponse.class);
@@ -132,6 +131,8 @@ protected <DOC> DOC mapAsDocument(ApiResponse api, Class<DOC> documentClass) {
132131

133132
protected abstract String getApiEndpoint();
134133

134+
protected abstract String getToken();
135+
135136
protected abstract HttpClientOptions getHttpClientOptions();
136137

137138
}

‎src/main/java/com/datastax/astra/internal/astra/AstraDBDatabaseAdmin.java renamed to ‎src/main/java/com/datastax/astra/internal/AstraDBDatabaseAdmin.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
package com.datastax.astra.internal.astra;
1+
package com.datastax.astra.internal;
22

33
import com.datastax.astra.client.DataAPIOptions;
44
import com.datastax.astra.client.DatabaseAdmin;
5+
import com.datastax.astra.internal.astra.AstraApiEndpoint;
56
import com.dtsx.astra.sdk.db.AstraDBOpsClient;
67
import com.dtsx.astra.sdk.db.domain.Database;
78
import com.dtsx.astra.sdk.db.exception.DatabaseNotFoundException;

‎src/main/java/com/datastax/astra/internal/DataAPIDatabaseAdmin.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,15 @@ public void dropNamespace(String namespace) {
100100
log.info("Namespace '" + green("{}") + "' has been deleted", namespace);
101101
}
102102

103+
/** {@inheritDoc} */
103104
@Override
104105
protected String getApiEndpoint() {
105-
return apiEndPoint;
106+
return apiEndpointDatabase;
106107
}
107108

109+
/** {@inheritDoc} */
108110
@Override
109111
protected HttpClientOptions getHttpClientOptions() {
110-
return null;
112+
return options.getHttpClientOptions();
111113
}
112114
}

‎src/main/java/com/datastax/astra/internal/auth/StargateAuthenticationService.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.datastax.astra.internal.auth;
22

3+
import com.datastax.astra.client.DataAPIOptions;
34
import com.datastax.astra.internal.api.ApiConstants;
45
import com.datastax.astra.internal.http.HttpClientOptions;
56
import com.datastax.astra.internal.http.RetryHttpClient;
@@ -23,7 +24,7 @@
2324
public class StargateAuthenticationService implements TokenProvider, ApiConstants {
2425

2526
/** Simple Client. */
26-
public static RetryHttpClient httpClient = new RetryHttpClient(HttpClientOptions.builder().build());
27+
public static RetryHttpClient httpClient = new RetryHttpClient();
2728

2829
/** Default username for Cassandra. */
2930
public static final String DEFAULT_USERNAME = "cassandra";

‎src/main/java/com/datastax/astra/internal/http/HttpClientOptions.java

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
/**
1212
* Options to set up http Client.
1313
*/
14-
@Getter @Builder
14+
@Data
1515
public class HttpClientOptions {
1616

1717
/** Default user agent. */
@@ -30,39 +30,31 @@ public class HttpClientOptions {
3030
public static final int DEFAULT_RETRY_DELAY_MILLIS = 100;
3131

3232
/** Caller name in User agent. */
33-
@Builder.Default
3433
String userAgentCallerName = DEFAULT_USER_AGENT;
3534

3635
/** Caller version in User agent. */
37-
@Builder.Default
3836
String userAgentCallerVersion = HttpClientOptions.class.getPackage().getImplementationVersion() != null ?
3937
HttpClientOptions.class.getPackage().getImplementationVersion() : "dev";
4038

4139
/** Http Connection timeout. */
42-
@Builder.Default
4340
long connectionRequestTimeoutInSeconds = DEFAULT_CONNECT_TIMEOUT_SECONDS;
4441

4542
/** Http Connection timeout. */
46-
@Builder.Default
4743
long responseTimeoutInSeconds = DEFAULT_REQUEST_TIMEOUT_SECONDS;
4844

4945
/** Enable retry count. */
50-
@Builder.Default
5146
int retryCount = DEFAULT_RETRY_COUNT;
5247

5348
/** How much to wait in between 2 calls. */
54-
@Builder.Default
5549
int retryDelay = DEFAULT_RETRY_DELAY_MILLIS;
5650

5751
/** The http client could work through a proxy. */
5852
HttpProxy proxy;
5953

6054
/** Moving to HTTP/2. */
61-
@Builder.Default
6255
HttpClient.Version httpVersion = HttpClient.Version.HTTP_2;
6356

6457
/** Redirect */
65-
@Builder.Default
6658
HttpClient.Redirect httpRedirect = HttpClient.Redirect.NORMAL;
6759

6860
@Data @AllArgsConstructor

0 commit comments

Comments
 (0)