Skip to content

Commit 75cc724

Browse files
clunclun
committed
ok
1 parent 0ffc7fa commit 75cc724

File tree

28 files changed

+2218
-17
lines changed

28 files changed

+2218
-17
lines changed

‎astra-db-java/pom.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,35 +20,35 @@
2020
<!-- Third Party Libraries -->
2121
<devops-sdk.version>1.2.7</devops-sdk.version>
2222
<slf4j.version>2.0.9</slf4j.version>
23-
<logback.version>1.5.3</logback.version>
24-
<jackson.version>2.17.0</jackson.version>
25-
<lombok.version>1.18.32</lombok.version>
23+
<logback.version>1.5.6</logback.version>
24+
<jackson.version>2.17.2</jackson.version>
25+
<lombok.version>1.18.34</lombok.version>
2626
<retry4j.version>0.15.0</retry4j.version>
2727
<awaitility.version>4.2.1</awaitility.version>
2828
<mockwebserver.version>4.12.0</mockwebserver.version>
2929
<uuid-generator.version>5.0.0</uuid-generator.version>
3030

3131
<!-- Test -->
3232
<test.skipped>false</test.skipped>
33-
<assertj.version>3.25.3</assertj.version>
34-
<junit-jupiter.version>5.10.2</junit-jupiter.version>
33+
<assertj.version>3.26.3</assertj.version>
34+
<junit-jupiter.version>5.10.3</junit-jupiter.version>
3535

3636
<!-- Maven -->
3737
<maven.plugin.compiler.source>11</maven.plugin.compiler.source>
3838
<maven.plugin.compiler.target>11</maven.plugin.compiler.target>
3939
<version.maven.plugin.compiler>3.13.0</version.maven.plugin.compiler>
4040
<version.maven.plugin.coveralls>4.3.0</version.maven.plugin.coveralls>
41-
<version.maven.plugin.dependency>3.6.1</version.maven.plugin.dependency>
42-
<version.maven.plugin.enforcer>3.4.1</version.maven.plugin.enforcer>
43-
<version.maven.plugin.gpg>3.2.2</version.maven.plugin.gpg>
44-
<version.maven.plugin.jacoco>0.8.11</version.maven.plugin.jacoco>
45-
<version.maven.plugin.javadoc>3.6.3</version.maven.plugin.javadoc>
46-
<version.maven.plugin.jar>3.3.0</version.maven.plugin.jar>
41+
<version.maven.plugin.dependency>3.7.1</version.maven.plugin.dependency>
42+
<version.maven.plugin.enforcer>3.5.0</version.maven.plugin.enforcer>
43+
<version.maven.plugin.gpg>3.2.4</version.maven.plugin.gpg>
44+
<version.maven.plugin.jacoco>0.8.12</version.maven.plugin.jacoco>
45+
<version.maven.plugin.javadoc>3.8.0</version.maven.plugin.javadoc>
46+
<version.maven.plugin.jar>3.4.2</version.maven.plugin.jar>
4747
<version.maven.plugin.license>2.4.0</version.maven.plugin.license>
48-
<version.maven.plugin.nexus>1.6.13</version.maven.plugin.nexus>
49-
<version.maven.plugin.release>3.0.1</version.maven.plugin.release>
48+
<version.maven.plugin.nexus>1.7.0</version.maven.plugin.nexus>
49+
<version.maven.plugin.release>3.1.1</version.maven.plugin.release>
5050
<version.maven.plugin.resources>3.3.1</version.maven.plugin.resources>
51-
<version.maven.plugin.source>3.3.0</version.maven.plugin.source>
51+
<version.maven.plugin.source>3.3.1</version.maven.plugin.source>
5252
<version.maven.plugin.surefire>3.2.5</version.maven.plugin.surefire>
5353

5454
</properties>

‎astra-db-java/src/main/java/com/datastax/astra/client/model/EmbeddingProvider.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,9 @@ public static class Parameter {
151151
private String defaultValue;
152152
private Validation validation;
153153
private String help;
154+
private String displayName;
155+
private String hint;
156+
154157
/**
155158
* Default constructor.
156159
*/

‎astra-db-java/src/test/java/com/datastax/astra/test/integration/AbstractCollectionITTest.java

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
import com.datastax.astra.client.model.DeleteOneOptions;
99
import com.datastax.astra.client.model.DistinctIterable;
1010
import com.datastax.astra.client.model.Document;
11+
import com.datastax.astra.client.model.Filter;
12+
import com.datastax.astra.client.model.Filters;
1113
import com.datastax.astra.client.model.FindIterable;
1214
import com.datastax.astra.client.model.FindOneAndReplaceOptions;
1315
import com.datastax.astra.client.model.FindOneAndUpdateOptions;
@@ -324,6 +326,23 @@ public void testDistinct() {
324326
assertThat(distinctList).hasSize(7);
325327
}
326328

329+
@Test
330+
public void shouldTestFindOnEmptyResultList() {
331+
getCollectionSimple().deleteAll();
332+
// Find All
333+
List<Document> okDoc = getCollectionSimple().find().all();
334+
assertThat(okDoc).isEmpty();
335+
336+
Filter filter = Filters.eq("userId", UUID.randomUUID());
337+
FindOptions options = new FindOptions().projection(include("transactionHash"));
338+
List<Document> docs = getCollectionSimple().find(filter, options).all();
339+
assertThat(docs).isEmpty();
340+
341+
//DistinctIterable<Document, Integer> dis = getCollectionSimple().distinct("indice", Integer.class);
342+
//List<Integer> distinctList = dis.all();
343+
//assertThat(distinctList).hasSize(0);
344+
}
345+
327346
@Test
328347
public void testDistinctIter() {
329348
// Given a collection with 25 items

‎astra-db-java/src/test/java/com/datastax/astra/test/integration/prod_vectorize/AstraProdVectorizeITTest.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
import com.datastax.astra.test.integration.AbstractVectorizeITTest;
55
import com.dtsx.astra.sdk.db.domain.CloudProviderType;
66
import com.dtsx.astra.sdk.utils.AstraEnvironment;
7+
import lombok.Data;
8+
import org.junit.jupiter.api.Disabled;
79
import org.junit.jupiter.api.Test;
810
import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
911

@@ -13,6 +15,8 @@
1315
* Testing Vectorize in DEV
1416
*/
1517
@EnabledIfEnvironmentVariable(named = "ASTRA_DB_APPLICATION_TOKEN", matches = "Astra.*")
18+
@Disabled
19+
1620
public class AstraProdVectorizeITTest extends AbstractVectorizeITTest {
1721

1822
// @Override

‎examples/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<parent>
1111
<groupId>com.datastax.astra</groupId>
1212
<artifactId>astra-db-java-parent</artifactId>
13-
<version>1.3.1-SNAPSHOT</version>
13+
<version>1.4.1-SNAPSHOT</version>
1414
</parent>
1515

1616
<dependencies>

‎langchain4j-astradb/pom.xml

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
<groupId>com.datastax.astra</groupId>
7+
<artifactId>langchain4j-astradb</artifactId>
8+
<name>LangChain4j :: Integration :: AstraDB</name>
9+
<description>Some dependencies have a "Public Domain" license</description>
10+
<version>1.4.1-SNAPSHOT</version>
11+
12+
<properties>
13+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
14+
<maven.compiler.release>11</maven.compiler.release>
15+
<logback.version>1.5.6</logback.version>
16+
<jackson.version>2.17.2</jackson.version>
17+
<lombok.version>1.18.34</lombok.version>
18+
<assertj.version>3.26.3</assertj.version>
19+
<junit-jupiter.version>5.10.3</junit-jupiter.version>
20+
<astra-db-java.version>1.4.0</astra-db-java.version>
21+
<langchain4j.version>0.33.0</langchain4j.version>
22+
</properties>
23+
24+
<dependencyManagement>
25+
<dependencies>
26+
<dependency>
27+
<groupId>dev.langchain4j</groupId>
28+
<artifactId>langchain4j-parent</artifactId>
29+
<version>${langchain4j.version}</version>
30+
<scope>import</scope>
31+
<type>pom</type>
32+
</dependency>
33+
</dependencies>
34+
</dependencyManagement>
35+
36+
<dependencies>
37+
38+
<!-- ASTRA DB DATA API -->
39+
<dependency>
40+
<groupId>com.datastax.astra</groupId>
41+
<artifactId>astra-db-java</artifactId>
42+
<version>${astra-db-java.version}</version>
43+
</dependency>
44+
45+
<dependency>
46+
<groupId>org.projectlombok</groupId>
47+
<artifactId>lombok</artifactId>
48+
<version>${lombok.version}</version>
49+
<scope>provided</scope>
50+
</dependency>
51+
52+
<dependency>
53+
<groupId>dev.langchain4j</groupId>
54+
<artifactId>langchain4j-core</artifactId>
55+
<version>${langchain4j.version}</version>
56+
</dependency>
57+
58+
<!-- Enforce Jackson Latest to support @Unwrapped -->
59+
<dependency>
60+
<groupId>com.fasterxml.jackson.core</groupId>
61+
<artifactId>jackson-core</artifactId>
62+
<version>${jackson.version}</version>
63+
</dependency>
64+
65+
<dependency>
66+
<groupId>dev.langchain4j</groupId>
67+
<artifactId>langchain4j-core</artifactId>
68+
<classifier>tests</classifier>
69+
<version>${langchain4j.version}</version>
70+
<type>test-jar</type>
71+
<scope>test</scope>
72+
</dependency>
73+
<!-- Same embeddings model to keep the 1% -->
74+
<dependency>
75+
<groupId>dev.langchain4j</groupId>
76+
<artifactId>langchain4j-embeddings-all-minilm-l6-v2-q</artifactId>
77+
<version>${langchain4j.version}</version>
78+
<scope>test</scope>
79+
</dependency>
80+
<dependency>
81+
<groupId>dev.langchain4j</groupId>
82+
<artifactId>langchain4j</artifactId>
83+
<version>${langchain4j.version}</version>
84+
<scope>test</scope>
85+
</dependency>
86+
<dependency>
87+
<groupId>dev.langchain4j</groupId>
88+
<artifactId>langchain4j-open-ai</artifactId>
89+
<version>${langchain4j.version}</version>
90+
<scope>test</scope>
91+
</dependency>
92+
<dependency>
93+
<groupId>org.junit.jupiter</groupId>
94+
<artifactId>junit-jupiter-engine</artifactId>
95+
<version>${junit-jupiter.version}</version>
96+
<scope>test</scope>
97+
</dependency>
98+
<dependency>
99+
<groupId>org.assertj</groupId>
100+
<artifactId>assertj-core</artifactId>
101+
<version>${assertj.version}</version>
102+
<scope>test</scope>
103+
</dependency>
104+
<dependency>
105+
<groupId>ch.qos.logback</groupId>
106+
<artifactId>logback-classic</artifactId>
107+
<version>${logback.version}</version>
108+
<scope>test</scope>
109+
</dependency>
110+
</dependencies>
111+
112+
<build>
113+
<plugins>
114+
<plugin>
115+
<groupId>org.honton.chas</groupId>
116+
<artifactId>license-maven-plugin</artifactId>
117+
<configuration>
118+
<skipCompliance>true</skipCompliance>
119+
</configuration>
120+
</plugin>
121+
</plugins>
122+
</build>
123+
124+
</project>

0 commit comments

Comments
 (0)