Skip to content

Commit 2f378c7

Browse files
clunclun
committed
Merge update
1 parent d0cdd1b commit 2f378c7

File tree

60 files changed

+3126
-101
lines changed

Some content is hidden

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

60 files changed

+3126
-101
lines changed

‎astra-archetype-spring/pom.xml‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎astra-sdk-archetypes/pom.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<groupId>com.datastax.astra</groupId>
5+
<artifactId>astra-sdk-archetypes</artifactId>
6+
<version>0.5.1-SNAPSHOT</version>
7+
<packaging>pom</packaging>
8+
<name>+ astra-sdk-archetypes</name>
9+
10+
<modules>
11+
</modules>
12+
13+
</project>

‎astra-sdk-devops/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<artifactId>astra-sdk-parent</artifactId>
99
<groupId>com.datastax.astra</groupId>
10-
<version>0.6-SNAPSHOT</version>
10+
<version>0.5.1-SNAPSHOT</version>
1111
</parent>
1212

1313
<dependencies>

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,17 @@ public Stream<Database> findByName(String name) {
109109
return findAllNonTerminated().filter(db->name.equals(db.getInfo().getName()));
110110
}
111111

112+
/**
113+
* Retrieve frist DB from its name.
114+
* @param name
115+
* name
116+
* @return
117+
* if the db exists or not
118+
*/
119+
public Optional<Database> findFirstByName(String name) {
120+
return findByName(name).findFirst();
121+
}
122+
112123
/**
113124
* Find a database from its id.
114125
*

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ public class DatabaseCreationBuilder {
4545
/** Keyspace name in database */
4646
protected String keyspace;
4747

48+
/** Option to enable the vector preview. */
49+
protected boolean vector = false;
50+
4851
/** */
4952
protected int capacityUnits = 1;
5053

@@ -129,6 +132,17 @@ public DatabaseCreationBuilder capacityUnit(int unit) {
129132
return this;
130133
}
131134

135+
/**
136+
* Enable Vector.
137+
*
138+
* @return
139+
* database creation request
140+
*/
141+
public DatabaseCreationBuilder withVector() {
142+
this.vector = true;
143+
return this;
144+
}
145+
132146
/**
133147
* Build the immutable beans.
134148
*

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ public class DatabaseCreationRequest {
4848
/** Keyspace name in database */
4949
private String keyspace;
5050

51+
/** Enable Vector preview for the db. */
52+
private String engineType = null;
53+
5154
/**
5255
* CapacityUnits is the amount of space available (horizontal scaling)
5356
* for the database. For free tier the max CU's is 1, and 100
@@ -73,6 +76,9 @@ public DatabaseCreationRequest(DatabaseCreationBuilder builder) {
7376
this.name = builder.name;
7477
this.region = builder.region;
7578
this.tier = builder.tier;
79+
if (builder.vector) {
80+
this.engineType = "cc";
81+
}
7682
}
7783

7884
/**
@@ -145,6 +151,15 @@ public String getRegion() {
145151
return region;
146152
}
147153

154+
/**
155+
* Gets engineType
156+
*
157+
* @return value of engineType
158+
*/
159+
public String getEngineType() {
160+
return engineType;
161+
}
162+
148163
/** {@inheritDoc} */
149164
@Override
150165
public String toString() {

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

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ public class DatabaseInfo {
5555

5656
/** Region refers to the cloud region.. */
5757
private String region;
58+
59+
/** Set the Engine type in use (dse or cc). */
60+
private String engineType;
5861

5962
/** Additional keyspaces names in database. */
6063
private Set<String> additionalKeyspaces;
@@ -230,6 +233,23 @@ public String getTier() {
230233
public void setTier(String tier) {
231234
this.tier = tier;
232235
}
233-
234236

237+
/**
238+
* Gets engineType
239+
*
240+
* @return value of engineType
241+
*/
242+
public String getEngineType() {
243+
return engineType;
244+
}
245+
246+
/**
247+
* Set value for engineType
248+
*
249+
* @param engineType
250+
* new value for engineType
251+
*/
252+
public void setEngineType(String engineType) {
253+
this.engineType = engineType;
254+
}
235255
}

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@
1515
public abstract class AbstractDevopsApiTest {
1616

1717
/** Test Constants. */
18-
public static final String SDK_TEST_DB_NAME = "sdk_java_test";
18+
public static final String SDK_TEST_DB_NAME = "sdk_java_test_serverless";
19+
20+
/** Test Constants. */
21+
public static final String SDK_TEST_DB_VECTOR_NAME = "sdk_java_test_vector";
1922

2023
/** Test Constants. */
2124
public static final String SDK_TEST_DB_REGION = "us-east1";

‎astra-sdk-devops/src/test/java/com/dtsx/astra/sdk/db/DatabasesClientTest.java‎

Lines changed: 44 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
11
package com.dtsx.astra.sdk.db;
22

33
import com.dtsx.astra.sdk.AbstractDevopsApiTest;
4-
import com.dtsx.astra.sdk.db.domain.*;
4+
import com.dtsx.astra.sdk.db.domain.CloudProviderType;
5+
import com.dtsx.astra.sdk.db.domain.Database;
6+
import com.dtsx.astra.sdk.db.domain.DatabaseCreationRequest;
7+
import com.dtsx.astra.sdk.db.domain.DatabaseStatusType;
58
import com.dtsx.astra.sdk.utils.TestUtils;
6-
import org.junit.jupiter.api.*;
9+
import org.junit.jupiter.api.Assertions;
10+
import org.junit.jupiter.api.DisplayName;
11+
import org.junit.jupiter.api.MethodOrderer;
12+
import org.junit.jupiter.api.Order;
13+
import org.junit.jupiter.api.Test;
14+
import org.junit.jupiter.api.TestMethodOrder;
715

8-
import java.time.LocalDateTime;
9-
import java.time.ZoneOffset;
1016
import java.util.Optional;
1117

1218
/**
@@ -47,7 +53,9 @@ public void shouldCreateServerlessDb() {
4753
// When
4854
TestUtils.waitForDbStatus(getDatabasesClient().database(dbId), DatabaseStatusType.ACTIVE, 500);
4955
// Then
50-
Assertions.assertEquals(DatabaseStatusType.ACTIVE, getDatabasesClient().database(dbId).get().getStatus());
56+
Database db = getDatabasesClient().database(dbId).get();
57+
Assertions.assertEquals(DatabaseStatusType.ACTIVE, db.getStatus());
58+
Assertions.assertEquals("cc", db.getInfo().getEngineType());
5159
}
5260

5361
@Test
@@ -80,6 +88,35 @@ public void shouldCreateAClassicDb() {
8088

8189
@Test
8290
@Order(5)
91+
@DisplayName("Create a DB with vector preview enabled")
92+
public void shouldCreateServerlessWithVector() {
93+
String dbId;
94+
Optional<Database> optDb = getDatabasesClient().findFirstByName(SDK_TEST_DB_VECTOR_NAME);
95+
if (!optDb.isPresent()) {
96+
dbId = getDatabasesClient().create(DatabaseCreationRequest
97+
.builder()
98+
.name(SDK_TEST_DB_VECTOR_NAME)
99+
.keyspace(SDK_TEST_KEYSPACE)
100+
.cloudRegion(SDK_TEST_DB_REGION)
101+
.withVector()
102+
.build());
103+
} else {
104+
dbId = optDb.get().getId();
105+
}
106+
// Then
107+
Assertions.assertTrue(getDatabasesClient().findById(dbId).isPresent());
108+
Assertions.assertNotNull(getDatabasesClient().database(dbId).get());
109+
Assertions.assertTrue(getDatabasesClient().findByName(SDK_TEST_DB_VECTOR_NAME).count() > 0);
110+
// When
111+
TestUtils.waitForDbStatus(getDatabasesClient().database(dbId), DatabaseStatusType.ACTIVE, 500);
112+
// Then
113+
Database finalDb = getDatabasesClient().database(dbId).get();
114+
Assertions.assertEquals(DatabaseStatusType.ACTIVE, finalDb.getStatus());
115+
Assertions.assertEquals("cc", finalDb.getInfo().getEngineType());
116+
}
117+
118+
@Test
119+
@Order(6)
83120
@DisplayName("Find database by its name")
84121
public void shouldFindDatabaseByNameTest() {
85122
Assertions.assertThrows(IllegalArgumentException.class, () -> getDatabasesClient().databaseByName(""));
@@ -97,7 +134,7 @@ public void shouldFindDatabaseByNameTest() {
97134
}
98135

99136
@Test
100-
@Order(6)
137+
@Order(7)
101138
@DisplayName("Find database by id")
102139
public void shouldFindDatabaseByIdTest() {
103140
// --> Getting a valid id
@@ -123,7 +160,7 @@ public void shouldFindDatabaseByIdTest() {
123160
}
124161

125162
@Test
126-
@Order(7)
163+
@Order(8)
127164
@DisplayName("Find accessLists")
128165
public void shouldFindAllAccessLists() {
129166
getDatabasesClient()

‎astra-sdk-pulsar/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>com.datastax.astra</groupId>
1010
<artifactId>astra-sdk-parent</artifactId>
11-
<version>0.6-SNAPSHOT</version>
11+
<version>0.5.1-SNAPSHOT</version>
1212
</parent>
1313

1414
<dependencies>

0 commit comments

Comments
 (0)