Skip to content

Commit 6a88791

Browse files
Martin7-1Martin7-1
committed
YugabyteDB: migrate to JDK17 syntax and disable actual llm IT
1 parent d726f36 commit 6a88791

File tree

5 files changed

+69
-72
lines changed

5 files changed

+69
-72
lines changed

‎embedding-stores/langchain4j-community-yugabytedb/src/main/java/dev/langchain4j/community/store/embedding/yugabytedb/ColumnMetadataHandler.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@ public String columnDefinitionsString() {
6060
sb.append(",");
6161
}
6262
}
63-
String result = sb.toString();
64-
return result;
63+
return sb.toString();
6564
}
6665

6766
@Override
@@ -104,9 +103,9 @@ public int setMetadata(PreparedStatement upsertStmt, int parameterInitialIndex,
104103
Object value = metadataMap.get(columnName);
105104

106105
// Special handling for UUID type
107-
if (value instanceof String && "uuid".equalsIgnoreCase(columnDef.getType())) {
106+
if (value instanceof String string && "uuid".equalsIgnoreCase(columnDef.getType())) {
108107
try {
109-
value = java.util.UUID.fromString((String) value);
108+
value = java.util.UUID.fromString(string);
110109
} catch (IllegalArgumentException e) {
111110
// It's a string but not a valid UUID. Let the DB handle the error.
112111
}

‎embedding-stores/langchain4j-community-yugabytedb/src/main/java/dev/langchain4j/community/store/embedding/yugabytedb/YugabyteDBFilterMapper.java‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -31,30 +31,30 @@ abstract class YugabyteDBFilterMapper {
3131
Object.class, "text");
3232

3333
public String map(Filter filter) {
34-
if (filter instanceof ContainsString) {
35-
return mapContains((ContainsString) filter);
36-
} else if (filter instanceof IsEqualTo) {
37-
return mapEqual((IsEqualTo) filter);
38-
} else if (filter instanceof IsNotEqualTo) {
39-
return mapNotEqual((IsNotEqualTo) filter);
40-
} else if (filter instanceof IsGreaterThan) {
41-
return mapGreaterThan((IsGreaterThan) filter);
42-
} else if (filter instanceof IsGreaterThanOrEqualTo) {
43-
return mapGreaterThanOrEqual((IsGreaterThanOrEqualTo) filter);
44-
} else if (filter instanceof IsLessThan) {
45-
return mapLessThan((IsLessThan) filter);
46-
} else if (filter instanceof IsLessThanOrEqualTo) {
47-
return mapLessThanOrEqual((IsLessThanOrEqualTo) filter);
48-
} else if (filter instanceof IsIn) {
49-
return mapIn((IsIn) filter);
50-
} else if (filter instanceof IsNotIn) {
51-
return mapNotIn((IsNotIn) filter);
52-
} else if (filter instanceof And) {
53-
return mapAnd((And) filter);
54-
} else if (filter instanceof Not) {
55-
return mapNot((Not) filter);
56-
} else if (filter instanceof Or) {
57-
return mapOr((Or) filter);
34+
if (filter instanceof ContainsString string) {
35+
return mapContains(string);
36+
} else if (filter instanceof IsEqualTo to3) {
37+
return mapEqual(to3);
38+
} else if (filter instanceof IsNotEqualTo to2) {
39+
return mapNotEqual(to2);
40+
} else if (filter instanceof IsGreaterThan than1) {
41+
return mapGreaterThan(than1);
42+
} else if (filter instanceof IsGreaterThanOrEqualTo to1) {
43+
return mapGreaterThanOrEqual(to1);
44+
} else if (filter instanceof IsLessThan than) {
45+
return mapLessThan(than);
46+
} else if (filter instanceof IsLessThanOrEqualTo to) {
47+
return mapLessThanOrEqual(to);
48+
} else if (filter instanceof IsIn in1) {
49+
return mapIn(in1);
50+
} else if (filter instanceof IsNotIn in) {
51+
return mapNotIn(in);
52+
} else if (filter instanceof And and) {
53+
return mapAnd(and);
54+
} else if (filter instanceof Not not) {
55+
return mapNot(not);
56+
} else if (filter instanceof Or or) {
57+
return mapOr(or);
5858
} else {
5959
throw new UnsupportedOperationException(
6060
"Unsupported filter type: " + filter.getClass().getName());

‎embedding-stores/langchain4j-community-yugabytedb/src/main/java/dev/langchain4j/community/store/embedding/yugabytedb/YugabyteDBMetadataFilterMapper.java‎

Lines changed: 38 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -56,18 +56,18 @@ public int setFilterParameters(PreparedStatement statement, Filter filter, int s
5656
int paramIndex = startIndex;
5757

5858
for (Object param : result.parameters()) {
59-
if (param instanceof String) {
60-
statement.setString(paramIndex, (String) param);
61-
} else if (param instanceof Integer) {
62-
statement.setInt(paramIndex, (Integer) param);
63-
} else if (param instanceof Long) {
64-
statement.setLong(paramIndex, (Long) param);
65-
} else if (param instanceof Double) {
66-
statement.setDouble(paramIndex, (Double) param);
67-
} else if (param instanceof Float) {
68-
statement.setFloat(paramIndex, (Float) param);
69-
} else if (param instanceof Boolean) {
70-
statement.setBoolean(paramIndex, (Boolean) param);
59+
if (param instanceof String string) {
60+
statement.setString(paramIndex, string);
61+
} else if (param instanceof Integer integer) {
62+
statement.setInt(paramIndex, integer);
63+
} else if (param instanceof Long long1) {
64+
statement.setLong(paramIndex, long1);
65+
} else if (param instanceof Double double1) {
66+
statement.setDouble(paramIndex, double1);
67+
} else if (param instanceof Float float1) {
68+
statement.setFloat(paramIndex, float1);
69+
} else if (param instanceof Boolean boolean1) {
70+
statement.setBoolean(paramIndex, boolean1);
7171
} else if (param instanceof UUID) {
7272
statement.setObject(paramIndex, param);
7373
} else {
@@ -80,30 +80,30 @@ public int setFilterParameters(PreparedStatement statement, Filter filter, int s
8080
}
8181

8282
private FilterResult mapFilter(Filter filter) {
83-
if (filter instanceof ContainsString) {
84-
return mapContainsString((ContainsString) filter);
85-
} else if (filter instanceof IsEqualTo) {
86-
return mapIsEqualTo((IsEqualTo) filter);
87-
} else if (filter instanceof IsNotEqualTo) {
88-
return mapIsNotEqualTo((IsNotEqualTo) filter);
89-
} else if (filter instanceof IsGreaterThan) {
90-
return mapIsGreaterThan((IsGreaterThan) filter);
91-
} else if (filter instanceof IsGreaterThanOrEqualTo) {
92-
return mapIsGreaterThanOrEqualTo((IsGreaterThanOrEqualTo) filter);
93-
} else if (filter instanceof IsLessThan) {
94-
return mapIsLessThan((IsLessThan) filter);
95-
} else if (filter instanceof IsLessThanOrEqualTo) {
96-
return mapIsLessThanOrEqualTo((IsLessThanOrEqualTo) filter);
97-
} else if (filter instanceof IsIn) {
98-
return mapIsIn((IsIn) filter);
99-
} else if (filter instanceof IsNotIn) {
100-
return mapIsNotIn((IsNotIn) filter);
101-
} else if (filter instanceof And) {
102-
return mapAnd((And) filter);
103-
} else if (filter instanceof Or) {
104-
return mapOr((Or) filter);
105-
} else if (filter instanceof Not) {
106-
return mapNot((Not) filter);
83+
if (filter instanceof ContainsString string) {
84+
return mapContainsString(string);
85+
} else if (filter instanceof IsEqualTo to3) {
86+
return mapIsEqualTo(to3);
87+
} else if (filter instanceof IsNotEqualTo to2) {
88+
return mapIsNotEqualTo(to2);
89+
} else if (filter instanceof IsGreaterThan than1) {
90+
return mapIsGreaterThan(than1);
91+
} else if (filter instanceof IsGreaterThanOrEqualTo to1) {
92+
return mapIsGreaterThanOrEqualTo(to1);
93+
} else if (filter instanceof IsLessThan than) {
94+
return mapIsLessThan(than);
95+
} else if (filter instanceof IsLessThanOrEqualTo to) {
96+
return mapIsLessThanOrEqualTo(to);
97+
} else if (filter instanceof IsIn in1) {
98+
return mapIsIn(in1);
99+
} else if (filter instanceof IsNotIn in) {
100+
return mapIsNotIn(in);
101+
} else if (filter instanceof And and) {
102+
return mapAnd(and);
103+
} else if (filter instanceof Or or) {
104+
return mapOr(or);
105+
} else if (filter instanceof Not not) {
106+
return mapNot(not);
107107
} else {
108108
throw new UnsupportedOperationException(
109109
"Unsupported filter type: " + filter.getClass().getSimpleName());
@@ -250,12 +250,8 @@ private FilterResult mapOr(Or filter) {
250250

251251
String clause = String.format("(%s OR %s)", left.sqlClause(), right.sqlClause());
252252
List<Object> params = new ArrayList<>();
253-
for (Object param : left.parameters()) {
254-
params.add(param);
255-
}
256-
for (Object param : right.parameters()) {
257-
params.add(param);
258-
}
253+
params.addAll(left.parameters());
254+
params.addAll(right.parameters());
259255

260256
return new FilterResult(clause, params);
261257
}

‎embedding-stores/langchain4j-community-yugabytedb/src/test/java/dev/langchain4j/community/store/embedding/yugabytedb/MetadataStorageConfigTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ void jsonHandlerCreationNoError() {
6363
// Should not throw an exception
6464
assertDoesNotThrow(() -> {
6565
MetadataHandler handler = MetadataHandlerFactory.create(config);
66-
assertThat(handler).isNotNull();
67-
assertThat(handler).isInstanceOf(JsonMetadataHandler.class);
66+
assertThat(handler)
67+
.isInstanceOf(JsonMetadataHandler.class);
6868
});
6969
}
7070

‎embedding-stores/langchain4j-community-yugabytedb/src/test/java/dev/langchain4j/community/store/embedding/yugabytedb/YugabyteDBWithActualLLMIT.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
* <p>
4848
* Note: These tests will make actual API calls and may incur costs.
4949
*/
50+
@EnabledIfEnvironmentVariable(named = "YUGABYTEDB_IT_WITH_ACTUAL_LLM", matches = ".+")
5051
class YugabyteDBWithActualLLMIT extends YugabyteDBTestBase {
5152

5253
private static final Logger logger = LoggerFactory.getLogger(YugabyteDBWithActualLLMIT.class);
@@ -489,6 +490,7 @@ void should_demonstrate_rag_context_quality() {
489490
*/
490491
@Nested
491492
@Testcontainers
493+
@EnabledIfEnvironmentVariable(named = "YUGABYTEDB_IT_WITH_ACTUAL_LLM", matches = ".+")
492494
static class SmartDriverLLMIT {
493495

494496
private static final Logger smartLogger = LoggerFactory.getLogger(SmartDriverLLMIT.class);

0 commit comments

Comments
 (0)