feat: Update dependencies Java Driver (#218)

msmygit · Madhavan · web-flow · commit 5ade2b176045 · 2025-12-24T11:34:05.000-05:00
* Update dependencies C* 3.x,4.x,DSE,Java Driver * Update with CqlVector enhancements * updates to vector * gradle build changes * Temporarily re-introduce other compiler args to test * Revert "Temporarily re-introduce other compiler args to test" This reverts commit 0cfbb81. --------- Co-authored-by: Madhavan <cxo@ibm.com>
diff --git a/agent-c3/build.gradle b/agent-c3/build.gradle
@@ -47,8 +47,8 @@ dependencies {
         exclude group: 'io.netty'
     }
 
-    testImplementation "com.datastax.oss:java-driver-core:${ossDriverVersion}"
-    testImplementation "com.datastax.oss:java-driver-query-builder:${ossDriverVersion}"
+    testImplementation "org.apache.cassandra:java-driver-core:${ossDriverVersion}"
+    testImplementation "org.apache.cassandra:java-driver-query-builder:${ossDriverVersion}"
 
     testImplementation "org.testcontainers:testcontainers:${testContainersVersion}"
     testImplementation project(':testcontainers')
diff --git a/agent-c4/build.gradle b/agent-c4/build.gradle
@@ -54,8 +54,8 @@ dependencies {
         exclude group: 'io.netty'
     }
 
-    testImplementation "com.datastax.oss:java-driver-core:${ossDriverVersion}"
-    testImplementation "com.datastax.oss:java-driver-query-builder:${ossDriverVersion}"
+    testImplementation "org.apache.cassandra:java-driver-core:${ossDriverVersion}"
+    testImplementation "org.apache.cassandra:java-driver-query-builder:${ossDriverVersion}"
 
     testImplementation "org.testcontainers:testcontainers:${testContainersVersion}"
     testImplementation project(':testcontainers')
diff --git a/agent-dse4/build.gradle b/agent-dse4/build.gradle
@@ -53,8 +53,8 @@ dependencies {
         exclude group: 'io.netty'
     }
 
-    testImplementation "com.datastax.oss:java-driver-core:${ossDriverVersion}"
-    testImplementation "com.datastax.oss:java-driver-query-builder:${ossDriverVersion}"
+    testImplementation "org.apache.cassandra:java-driver-core:${ossDriverVersion}"
+    testImplementation "org.apache.cassandra:java-driver-query-builder:${ossDriverVersion}"
 
     testImplementation "org.testcontainers:testcontainers:${testContainersVersion}"
     testImplementation project(':testcontainers')
diff --git a/connector/build.gradle b/connector/build.gradle
@@ -13,6 +13,7 @@ task versionTxt()  {
 
 compileJava {
     dependsOn versionTxt
+    options.compilerArgs = ['-Xlint:none']
 }
 
 compileTestJava {
@@ -33,8 +34,8 @@ dependencies {
     implementation project(':commons')
     implementation("com.github.ben-manes.caffeine:caffeine:${caffeineVersion}")
     implementation("io.vavr:vavr:${vavrVersion}")
-    implementation "com.datastax.oss:java-driver-core:${ossDriverVersion}"
-    implementation "com.datastax.oss:java-driver-query-builder:${ossDriverVersion}"
+    implementation "org.apache.cassandra:java-driver-core:${ossDriverVersion}"
+    implementation "org.apache.cassandra:java-driver-query-builder:${ossDriverVersion}"
     implementation("org.apache.kafka:connect-api:${kafkaVersion}")
     implementation("com.google.guava:guava:${guavaVersion}")
     implementation("com.datastax.oss:messaging-connectors-commons-core:${messagingConnectorsCommonsVersion}")
@@ -46,6 +47,16 @@ dependencies {
     compileOnly("${pulsarGroup}:pulsar-io-core:${pulsarVersion}")
     implementation(platform("com.fasterxml.jackson:jackson-bom:${jacksonBomVersion}"))
 
+    configurations.all {
+        resolutionStrategy {
+            force "io.netty:netty-handler:${nettyVersion}"
+            force "io.netty:netty-transport-native-epoll:${nettyVersion}"
+            force "io.netty:netty-transport-native-unix-common:${nettyVersion}"
+            force "io.netty:netty-codec-haproxy:${nettyVersion}"
+            force "io.netty:netty-tcnative-boringssl-static:${nettyTcNativeVersion}"
+        }
+    }
+
     constraints {
         implementation("ch.qos.logback:logback-classic:${logbackVersion}")
         implementation("com.github.jnr:jnr-posix:${jnrVersion}")
@@ -62,7 +73,7 @@ dependencies {
     testAnnotationProcessor "org.projectlombok:lombok:${lombokVersion}"
 
 
-    testImplementation("com.datastax.oss:dsbulk-tests:1.6.0")
+    testImplementation("com.datastax.oss:dsbulk-tests:${dsbulkVersion}")
     testImplementation("org.reactivestreams:reactive-streams:1.0.3")
     testImplementation("org.junit.jupiter:junit-jupiter-params:5.7.2")
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.2")
diff --git a/connector/src/main/java/com/datastax/oss/pulsar/source/converters/AbstractNativeConverter.java b/connector/src/main/java/com/datastax/oss/pulsar/source/converters/AbstractNativeConverter.java
@@ -23,7 +23,7 @@
 import com.datastax.oss.driver.api.core.metadata.schema.ColumnMetadata;
 import com.datastax.oss.driver.api.core.metadata.schema.KeyspaceMetadata;
 import com.datastax.oss.driver.api.core.metadata.schema.TableMetadata;
-import com.datastax.oss.driver.api.core.type.CqlVectorType;
+import com.datastax.oss.driver.api.core.type.VectorType;
 import com.datastax.oss.driver.api.core.type.DataType;
 import com.datastax.oss.driver.api.core.type.ListType;
 import com.datastax.oss.driver.api.core.type.MapType;
@@ -80,7 +80,7 @@ public AbstractNativeConverter(KeyspaceMetadata ksm, TableMetadata tm, List<Colu
                             log.info("Add collection schema {}={}", field.name(), collectionSchema);
                             break;
                         case ProtocolConstants.DataType.CUSTOM:
-                            if (cm.getType() instanceof CqlVectorType) {
+                            if (cm.getType() instanceof VectorType) {
                                 Schema vectorSchema = dataTypeSchema(ksm, cm.getType());
                                 subSchemas.put(field.name(), vectorSchema);
                                 log.info("Add vector schema {}={}", field.name(), vectorSchema);
@@ -139,7 +139,7 @@ boolean isSupportedCqlType(DataType dataType) {
             case ProtocolConstants.DataType.MAP:
                 return true;
             case ProtocolConstants.DataType.CUSTOM:
-                return dataType instanceof CqlVectorType;
+                return dataType instanceof VectorType;
             case ProtocolConstants.DataType.TUPLE:
                 return true;
         }
@@ -210,14 +210,14 @@ Schema dataTypeSchema(KeyspaceMetadata ksm, DataType dataType) {
             case ProtocolConstants.DataType.MAP:
                 MapType mapType = (MapType) dataType;
                 return org.apache.avro.Schema.createMap(dataTypeSchema(ksm, mapType.getValueType()));
-            case ProtocolConstants.DataType.CUSTOM:
-                if (dataType instanceof CqlVectorType) {
-                    CqlVectorType vectorType = (CqlVectorType) dataType;
-                    return org.apache.avro.Schema.createArray(dataTypeSchema(ksm, vectorType.getSubtype()));
-                }
             case ProtocolConstants.DataType.TUPLE:
                 TupleType tupleType = (TupleType) dataType;
                 return buildTupleSchema(ksm, dataType.asCql(false, true), tupleType, true);
+            case ProtocolConstants.DataType.CUSTOM:
+                if (dataType instanceof VectorType) {
+                    VectorType vectorType = (VectorType) dataType;
+                    return org.apache.avro.Schema.createArray(dataTypeSchema(ksm, vectorType.getElementType()));
+                }
             default:
                 throw new UnsupportedOperationException("Ignoring unsupported type=" + dataType.asCql(false, true));
         }
diff --git a/connector/src/main/java/com/datastax/oss/pulsar/source/converters/NativeAvroConverter.java b/connector/src/main/java/com/datastax/oss/pulsar/source/converters/NativeAvroConverter.java
@@ -26,7 +26,7 @@
 import com.datastax.oss.driver.api.core.metadata.schema.ColumnMetadata;
 import com.datastax.oss.driver.api.core.metadata.schema.KeyspaceMetadata;
 import com.datastax.oss.driver.api.core.metadata.schema.TableMetadata;
-import com.datastax.oss.driver.api.core.type.CqlVectorType;
+import com.datastax.oss.driver.api.core.type.VectorType;
 import com.datastax.oss.driver.api.core.type.DataType;
 import com.datastax.oss.driver.api.core.type.ListType;
 import com.datastax.oss.driver.api.core.type.MapType;
@@ -169,12 +169,13 @@ public byte[] toConnectData(Row row) {
                     }
                     break;
                     case ProtocolConstants.DataType.CUSTOM: {
-                        if (cm.getType() instanceof CqlVectorType) {
+                        if (cm.getType() instanceof VectorType) {
                             Schema vectorSchema = subSchemas.get(fieldName);
-                            CqlVector<?> vector = row.getCqlVector(fieldName);
+                            VectorType vectorType = (VectorType) cm.getType();
+                            CqlVector<?> vector = row.getVector(fieldName, CodecRegistry.DEFAULT.codecFor(vectorType.getElementType()).getJavaType().getRawType());
                             log.debug("field={} vectorSchema={} vectorValue={}", fieldName, vectorSchema, vector);
                             List<Object> vectorValue = new ArrayList<>();
-                            vector.getValues().forEach(vectorValue::add);
+                            vector.forEach(vectorValue::add);
                             genericRecordBuilder.put(fieldName, buildArrayValue(vectorSchema, vectorValue));
                         }
                     }
@@ -307,6 +308,19 @@ GenericRecord buildUDTValue(Schema udtSchema, UdtValue udtValue) {
                             genericRecord.put(field.toString(), mapValue);
                         }
                         break;
+                    case ProtocolConstants.DataType.CUSTOM: {
+                            if (udtValue.getType(field) instanceof VectorType) {
+                                VectorType vectorType = (VectorType) udtValue.getType(field);
+                                CqlVector<?> vector = udtValue.getVector(field, CodecRegistry.DEFAULT.codecFor(vectorType.getElementType()).getJavaType().getRawType());
+                                String path = typeName + "." + field.toString();
+                                Schema elementSchema = subSchemas.get(path);
+                                List<Object> vectorValue = new ArrayList<>();
+                                vector.forEach(vectorValue::add);
+                                log.debug("path={} elementSchema={} vectorType={} vectorValue={}", path, elementSchema, vectorType, vectorValue);
+                                genericRecord.put(field.toString(), buildArrayValue(elementSchema, vectorValue));
+                            }
+                        }
+                        break;
                     default:
                         log.debug("Ignoring unsupported type field name={} type={}", field, dataType.asCql(false, true));
                 }
diff --git a/connector/src/main/java/com/datastax/oss/pulsar/source/converters/NativeJsonConverter.java b/connector/src/main/java/com/datastax/oss/pulsar/source/converters/NativeJsonConverter.java
@@ -340,6 +340,7 @@ public static JsonNode toJson(GenericRecord genericRecord) {
     }
 
 
+    @Override
     public boolean isSupportedCqlType(DataType dataType) {
         switch (dataType.getProtocolCode()) {
             case ProtocolConstants.DataType.ASCII:
diff --git a/gradle.properties b/gradle.properties
@@ -9,7 +9,7 @@ releasesRepoUrl=https://repo.datastax.com/artifactory/datastax-public-releases-l
 # deps version
 avroVersion=1.11.4
 lombokVersion=1.18.20
-ossDriverVersion=4.16.0
+ossDriverVersion=4.19.2
 cassandra3Version=3.11.10
 cassandra4Version=4.0.4
 dse4Version=6.8.23
@@ -45,4 +45,4 @@ cdc_total_space_in_mb=70
 dockerRepo=myrepo/
 
 # CDC backfilling Client
-dsbulkVersion=1.10.0
+dsbulkVersion=1.11.0
diff --git a/testcontainers/build.gradle b/testcontainers/build.gradle
@@ -5,7 +5,7 @@ plugins {
 }
 
 tasks.withType(JavaCompile) {
-    options.compilerArgs += '-Xlint:none'
+    options.compilerArgs = ['-Xlint:none']
 }
 
 lombok {
@@ -38,7 +38,7 @@ dependencies {
 
     implementation("org.apache.avro:avro:${avroVersion}")
     implementation("commons-io:commons-io:2.8.0")
-    implementation("com.datastax.oss:java-driver-core:${ossDriverVersion}") {
+    implementation("org.apache.cassandra:java-driver-core:${ossDriverVersion}") {
         // fasterxml 2.12 not compatible for com.github.docker-java
         exclude group: 'com.fasterxml.jackson.core', module: 'jackson-core'
         exclude group: 'com.fasterxml.jackson.core', module: 'jackson-databind'

Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,8 @@ dependencies {`
`47`	`47`	`exclude group: 'io.netty'`
`48`	`48`	`}`
`49`	`49`
`50`		`- testImplementation "com.datastax.oss:java-driver-core:${ossDriverVersion}"`
`51`		`- testImplementation "com.datastax.oss:java-driver-query-builder:${ossDriverVersion}"`
	`50`	`+ testImplementation "org.apache.cassandra:java-driver-core:${ossDriverVersion}"`
	`51`	`+ testImplementation "org.apache.cassandra:java-driver-query-builder:${ossDriverVersion}"`
`52`	`52`
`53`	`53`	`testImplementation "org.testcontainers:testcontainers:${testContainersVersion}"`
`54`	`54`	`testImplementation project(':testcontainers')`
Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,8 @@ dependencies {`
`54`	`54`	`exclude group: 'io.netty'`
`55`	`55`	`}`
`56`	`56`
`57`		`- testImplementation "com.datastax.oss:java-driver-core:${ossDriverVersion}"`
`58`		`- testImplementation "com.datastax.oss:java-driver-query-builder:${ossDriverVersion}"`
	`57`	`+ testImplementation "org.apache.cassandra:java-driver-core:${ossDriverVersion}"`
	`58`	`+ testImplementation "org.apache.cassandra:java-driver-query-builder:${ossDriverVersion}"`
`59`	`59`
`60`	`60`	`testImplementation "org.testcontainers:testcontainers:${testContainersVersion}"`
`61`	`61`	`testImplementation project(':testcontainers')`
Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,8 @@ dependencies {`
`53`	`53`	`exclude group: 'io.netty'`
`54`	`54`	`}`
`55`	`55`
`56`		`- testImplementation "com.datastax.oss:java-driver-core:${ossDriverVersion}"`
`57`		`- testImplementation "com.datastax.oss:java-driver-query-builder:${ossDriverVersion}"`
	`56`	`+ testImplementation "org.apache.cassandra:java-driver-core:${ossDriverVersion}"`
	`57`	`+ testImplementation "org.apache.cassandra:java-driver-query-builder:${ossDriverVersion}"`
`58`	`58`
`59`	`59`	`testImplementation "org.testcontainers:testcontainers:${testContainersVersion}"`
`60`	`60`	`testImplementation project(':testcontainers')`
Original file line number	Diff line number	Diff line change
`@@ -340,6 +340,7 @@ public static JsonNode toJson(GenericRecord genericRecord) {`
`340`	`340`	`}`
`341`	`341`
`342`	`342`
	`343`	`+ @Override`
`343`	`344`	`public boolean isSupportedCqlType(DataType dataType) {`
`344`	`345`	`switch (dataType.getProtocolCode()) {`
`345`	`346`	`case ProtocolConstants.DataType.ASCII:`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ plugins {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`tasks.withType(JavaCompile) {`
`8`		`- options.compilerArgs += '-Xlint:none'`
	`8`	`+ options.compilerArgs = ['-Xlint:none']`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`lombok {`
`@@ -38,7 +38,7 @@ dependencies {`
`38`	`38`
`39`	`39`	`implementation("org.apache.avro:avro:${avroVersion}")`
`40`	`40`	`implementation("commons-io:commons-io:2.8.0")`
`41`		`- implementation("com.datastax.oss:java-driver-core:${ossDriverVersion}") {`
	`41`	`+ implementation("org.apache.cassandra:java-driver-core:${ossDriverVersion}") {`
`42`	`42`	`// fasterxml 2.12 not compatible for com.github.docker-java`
`43`	`43`	`exclude group: 'com.fasterxml.jackson.core', module: 'jackson-core'`
`44`	`44`	`exclude group: 'com.fasterxml.jackson.core', module: 'jackson-databind'`