Add support for any type in vectors

Also: fix test in SqlTimestampCodecTest and prepare version 4.15.0

Author: maximevw

Diff for: CHANGELOG.md

@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to 
 [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [4.15.0] - 2025-04-20
 ### Added
 - Add support for the following special CQL commands in `CassandraStatement`:
   - `SOURCE <filename>`
@@ -13,6 +13,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
   set on a pre-existing connection.
 ### Changed
 - Update Java Driver for Apache Cassandra® to version 4.19.0.
+- Allow any type in `vector` since it's now supported by the Java Driver for Apache Cassandra® (see the
+  [related issue](https://datastax-oss.atlassian.net/browse/JAVA-3143)).
 - Update Apache Commons IO to version 2.19.0.
 - Update Jackson dependencies to version 2.18.3.
 - Update Semver4j to version 5.6.0.

Diff for: README.md

@@ -137,6 +137,22 @@ public class HelloCassandra {
 }
 ```
 
+Alternatively, you can also obtain a connection using a `CassandraDataSource` instance:
+```java
+public class HelloCassandra {
+    public static void main(final String[] args) {
+        final List<ContactPoint> contactPoints = Arrays.asList(
+                ContactPoint.of("host1", 9042),
+                ContactPoint.of("host2", 9042),
+                ContactPoint.of("host3", 9042));
+        final CassandraDataSource dataSource = new CassandraDataSource(contactPoints, "keyspace");
+        dataSource.setLocalDataCenter("DC1");
+        // Use setters on dataSource instance to specify additional properties of the connection.
+        final Connection connection = dataSource.getConnection();
+    }
+}
+```
+
 For further details about configuration and usage of the driver, please refer to the 
 [full documentation](https://github.com/ing-bank/cassandra-jdbc-wrapper/wiki/Documentation).
 

Diff for: src/main/java/com/ing/data/cassandra/jdbc/CassandraPreparedStatement.java

@@ -89,7 +89,6 @@
 import static com.ing.data.cassandra.jdbc.utils.ErrorConstants.TOO_MANY_QUERIES;
 import static com.ing.data.cassandra.jdbc.utils.ErrorConstants.UNSUPPORTED_CONVERSION_TO_JSON;
 import static com.ing.data.cassandra.jdbc.utils.ErrorConstants.UNSUPPORTED_JDBC_TYPE;
-import static com.ing.data.cassandra.jdbc.utils.ErrorConstants.VECTOR_ELEMENTS_NOT_NUMBERS;
 import static com.ing.data.cassandra.jdbc.utils.JsonUtil.getObjectMapper;
 import static com.ing.data.cassandra.jdbc.utils.WarningConstants.INVALID_ARRAY_IMPLEMENTATION;
 import static com.ing.data.cassandra.jdbc.utils.WarningConstants.PREPARED_STATEMENT_CLOSING_FAILED;
@@ -711,12 +710,7 @@ public final void setObject(final int parameterIndex, final Object x, final int
                         (DefaultVectorType) getBoundStatementVariableDefinitions().get(parameterIndex - 1).getType();
                     final Class<?> itemsClass = DataTypeEnum.fromCqlTypeName(vectorType.getElementType()
                         .asCql(false, false)).javaType;
-                    if (Number.class.isAssignableFrom(itemsClass)) {
-                        this.boundStatement = this.boundStatement.setVector(parameterIndex - 1, vector,
-                            itemsClass.asSubclass(Number.class));
-                    } else {
-                        throw new SQLException(VECTOR_ELEMENTS_NOT_NUMBERS);
-                    }
+                    this.boundStatement = this.boundStatement.setVector(parameterIndex - 1, vector, itemsClass);
                 } else if (x instanceof java.net.InetAddress) {
                     this.boundStatement = this.boundStatement.setInetAddress(parameterIndex - 1, (InetAddress) x);
                 } else if (List.class.isAssignableFrom(x.getClass())) {

Diff for: src/main/java/com/ing/data/cassandra/jdbc/CassandraResultSet.java

@@ -107,7 +107,6 @@
 import static com.ing.data.cassandra.jdbc.utils.ErrorConstants.UNSUPPORTED_JSON_TYPE_CONVERSION;
 import static com.ing.data.cassandra.jdbc.utils.ErrorConstants.UNSUPPORTED_TYPE_CONVERSION;
 import static com.ing.data.cassandra.jdbc.utils.ErrorConstants.VALID_LABELS;
-import static com.ing.data.cassandra.jdbc.utils.ErrorConstants.VECTOR_ELEMENTS_NOT_NUMBERS;
 import static com.ing.data.cassandra.jdbc.utils.ErrorConstants.WAS_CLOSED_RS;
 import static com.ing.data.cassandra.jdbc.utils.JsonUtil.getObjectMapper;
 import static com.ing.data.cassandra.jdbc.utils.UdtUtil.udtValueUsingFormattedContents;
@@ -1537,11 +1536,7 @@ public CqlVector<?> getVector(final int columnIndex) throws SQLException {
             final VectorType vectorType = (VectorType) getCqlDataType(columnIndex);
             final Class<?> elementClass = Class.forName(fromDataType(vectorType.getElementType()).asJavaClass()
                 .getCanonicalName());
-            if (Number.class.isAssignableFrom(elementClass)) {
-                return this.currentRow.getVector(columnIndex - 1, elementClass.asSubclass(Number.class));
-            } else {
-                throw new SQLException(VECTOR_ELEMENTS_NOT_NUMBERS);
-            }
+            return this.currentRow.getVector(columnIndex - 1, elementClass);
         } catch (ClassNotFoundException e) {
             LOG.warn(GET_VECTOR_FAILED, e);
         }
@@ -1555,11 +1550,7 @@ public CqlVector<?> getVector(final String columnLabel) throws SQLException {
             final VectorType vectorType = (VectorType) getCqlDataType(columnLabel);
             final Class<?> elementClass = Class.forName(fromDataType(vectorType.getElementType()).asJavaClass()
                 .getCanonicalName());
-            if (Number.class.isAssignableFrom(elementClass)) {
-                return this.currentRow.getVector(columnLabel, elementClass.asSubclass(Number.class));
-            } else {
-                throw new SQLException(VECTOR_ELEMENTS_NOT_NUMBERS);
-            }
+            return this.currentRow.getVector(columnLabel, elementClass);
         } catch (ClassNotFoundException e) {
             LOG.warn(GET_VECTOR_FAILED, e);
         }

Diff for: src/main/java/com/ing/data/cassandra/jdbc/utils/ErrorConstants.java

@@ -267,12 +267,6 @@ public final class ErrorConstants {
      */
     public static final String SSL_CONFIG_FAILED = "Unable to configure SSL: %s.";
 
-    /**
-     * Error message used in any SQL exception thrown when the method {@link CassandraResultSet#getVector(int)} or
-     * {@link CassandraResultSet#getVector(String)} is invoked on a column containing an invalid CQL vector.
-     */
-    public static final String VECTOR_ELEMENTS_NOT_NUMBERS = "Vector elements are not numbers.";
-
     /**
      * Error message used in any SQL exception thrown when the target JDBC type specified in the method
      * {@link CassandraPreparedStatement#setObject(int, Object, int)} and its variants is not supported.

Diff for: src/test/java/com/ing/data/cassandra/jdbc/VectorsUnitTest.java

@@ -42,11 +42,12 @@ static void finalizeSetUpTests() throws Exception {
     void givenVectorInsertStatement_whenExecute_insertExpectedValues() throws Exception {
         final Statement statement = sqlConnection.createStatement();
 
-        final String insert = "INSERT INTO vectors_test (keyValue, intsVector, floatsVector) "
-            + "VALUES(1, [4, 6, 8], [2.1, 3.7, 9.0, 5.5]);";
+        final String insert = "INSERT INTO vectors_test (keyValue, intsVector, floatsVector, asciiVector) "
+            + "VALUES(1, [4, 6, 8], [2.1, 3.7, 9.0, 5.5], ['abc', 'def', 'ghi']);";
         statement.executeUpdate(insert);
 
-        final ResultSet resultSet = statement.executeQuery("SELECT * FROM vectors_test WHERE keyValue = 1;");
+        final ResultSet resultSet = statement.executeQuery(
+            "SELECT keyValue, intsVector, floatsVector, asciiVector FROM vectors_test WHERE keyValue = 1;");
         resultSet.next();
 
         assertThat(resultSet, is(instanceOf(CassandraResultSet.class)));
@@ -57,12 +58,17 @@ void givenVectorInsertStatement_whenExecute_insertExpectedValues() throws Except
         assertEquals(4, intsVector.get(0));
         assertEquals(6, intsVector.get(1));
         assertEquals(8, intsVector.get(2));
-        final CqlVector<?> floatsVector = ((CassandraResultSet) resultSet).getVector(2);
+        final CqlVector<?> floatsVector = ((CassandraResultSet) resultSet).getVector(3);
         assertEquals(4, floatsVector.size());
         assertEquals(2.1f, floatsVector.get(0));
         assertEquals(3.7f, floatsVector.get(1));
         assertEquals(9.0f, floatsVector.get(2));
         assertEquals(5.5f, floatsVector.get(3));
+        final CqlVector<?> asciiVector = ((CassandraResultSet) resultSet).getVector("asciiVector");
+        assertEquals(3, asciiVector.size());
+        assertEquals("abc", asciiVector.get(0));
+        assertEquals("def", asciiVector.get(1));
+        assertEquals("ghi", asciiVector.get(2));
 
         statement.close();
     }

Diff for: src/test/java/com/ing/data/cassandra/jdbc/codec/SqlTimestampCodecTest.java

@@ -16,13 +16,16 @@
 import com.datastax.oss.driver.api.core.ProtocolVersion;
 import com.datastax.oss.driver.api.core.type.DataTypes;
 import com.datastax.oss.driver.api.core.type.reflect.GenericType;
+import com.datastax.oss.driver.internal.core.type.codec.TimestampCodec;
 import com.datastax.oss.driver.internal.core.util.Strings;
 import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.Test;
 
 import java.nio.ByteBuffer;
 import java.sql.Timestamp;
 import java.time.Instant;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
 
 import static com.ing.data.cassandra.jdbc.codec.SqlTimestampCodec.DEFAULT_TIMESTAMP_FORMAT;
@@ -82,7 +85,8 @@ void givenNullOrEmptyValue_whenParse_returnNull() {
 
     @Test
     void givenNonNullValue_whenParse_returnExpectedValue() {
-        assertEquals(NOW_SQL_TS, sut.parse(Strings.quote(String.valueOf(NOW_SQL_TS))));
+        final String formattedTimestamp = DEFAULT_TIMESTAMP_FORMAT.format(NOW_INSTANT.atZone(ZoneId.systemDefault()));
+        assertEquals(NOW_SQL_TS, sut.parse(Strings.quote(formattedTimestamp)));
     }
 
     @Test

Diff for: src/test/resources/initEmbeddedCassandra.cql

@@ -309,7 +309,8 @@ USE test_keyspace_vect;
 CREATE TABLE vectors_test (
 keyValue int PRIMARY KEY,
 intsVector vector<int, 3>,
-floatsVector vector<float, 4>);
+floatsVector vector<float, 4>,
+asciiVector vector<ascii, 3>);
 
 CREATE TABLE IF NOT EXISTS pet_supply_vectors (
     product_id     TEXT PRIMARY KEY,