fix tests and fmt

Author: SiyaoIsHiding

query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/delete/DeleteSelectorTest.java

@@ -22,7 +22,7 @@
 import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.deleteFrom;
 import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.literal;
 
-import java.util.Arrays;
+import com.datastax.oss.driver.api.core.data.CqlVector;
 import org.junit.Test;
 
 public class DeleteSelectorTest {
@@ -41,8 +41,8 @@ public void should_generate_vector_deletion() {
             deleteFrom("foo")
                 .column("v")
                 .whereColumn("k")
-                .isEqualTo(literal(Arrays.asList(0.1, 0.2))))
-        .hasCql("DELETE v FROM foo WHERE k=[0.1,0.2]");
+                .isEqualTo(literal(CqlVector.newInstance(0.1, 0.2))))
+        .hasCql("DELETE v FROM foo WHERE k=[0.1, 0.2]");
   }
 
   @Test

query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/insert/RegularInsertTest.java

@@ -23,10 +23,10 @@
 import static com.datastax.oss.driver.api.querybuilder.QueryBuilder.literal;
 import static org.assertj.core.api.Assertions.catchThrowable;
 
+import com.datastax.oss.driver.api.core.data.CqlVector;
 import com.datastax.oss.driver.api.querybuilder.term.Term;
 import com.datastax.oss.driver.internal.querybuilder.insert.DefaultInsert;
 import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap;
-import java.util.Arrays;
 import java.util.Map;
 import org.junit.Test;
 
@@ -44,8 +44,8 @@ public void should_generate_column_assignments() {
 
   @Test
   public void should_generate_vector_literals() {
-    assertThat(insertInto("foo").value("a", literal(Arrays.asList(0.1, 0.2, 0.3))))
-        .hasCql("INSERT INTO foo (a) VALUES ([0.1,0.2,0.3])");
+    assertThat(insertInto("foo").value("a", literal(CqlVector.newInstance(0.1, 0.2, 0.3))))
+        .hasCql("INSERT INTO foo (a) VALUES ([0.1, 0.2, 0.3])");
   }
 
   @Test

query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/AlterTableTest.java

@@ -111,12 +111,7 @@ public void should_generate_alter_table_with_no_compression() {
 
   @Test
   public void should_generate_alter_table_with_vector() {
-    assertThat(
-            alterTable("bar")
-                .alterColumn(
-                    "v",
-                    DataTypes.custom(
-                        "org.apache.cassandra.db.marshal.VectorType(org.apache.cassandra.db.marshal.FloatType,3)")))
-        .hasCql("ALTER TABLE bar ALTER v TYPE VECTOR<FLOAT, 3>");
+    assertThat(alterTable("bar").alterColumn("v", DataTypes.vectorOf(DataTypes.FLOAT, 3)))
+        .hasCql("ALTER TABLE bar ALTER v TYPE vector<float, 3>");
   }
 }

query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/AlterTypeTest.java

@@ -21,7 +21,6 @@
 import static com.datastax.oss.driver.api.querybuilder.SchemaBuilder.alterType;
 
 import com.datastax.oss.driver.api.core.type.DataTypes;
-import com.datastax.oss.driver.internal.core.type.DefaultVectorType;
 import org.junit.Test;
 
 public class AlterTypeTest {
@@ -57,7 +56,7 @@ public void should_generate_alter_table_with_rename_three_columns() {
 
   @Test
   public void should_generate_alter_type_with_vector() {
-    assertThat(alterType("foo", "bar").alterField("vec", new DefaultVectorType(DataTypes.FLOAT, 3)))
-        .hasCql("ALTER TYPE foo.bar ALTER vec TYPE VECTOR<FLOAT, 3>");
+    assertThat(alterType("foo", "bar").alterField("vec", DataTypes.vectorOf(DataTypes.FLOAT, 3)))
+        .hasCql("ALTER TYPE foo.bar ALTER vec TYPE vector<float, 3>");
   }
 }

query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/CreateTableTest.java

@@ -27,7 +27,6 @@
 import com.datastax.oss.driver.api.querybuilder.SchemaBuilder.RowsPerPartition;
 import com.datastax.oss.driver.api.querybuilder.schema.compaction.TimeWindowCompactionStrategy.CompactionWindowUnit;
 import com.datastax.oss.driver.api.querybuilder.schema.compaction.TimeWindowCompactionStrategy.TimestampResolution;
-import com.datastax.oss.driver.internal.core.type.DefaultVectorType;
 import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap;
 import java.nio.charset.StandardCharsets;
 import org.junit.Test;
@@ -321,7 +320,7 @@ public void should_generate_vector_column() {
     assertThat(
             createTable("foo")
                 .withPartitionKey("k", DataTypes.INT)
-                .withColumn("v", new DefaultVectorType(DataTypes.FLOAT, 3)))
-        .hasCql("CREATE TABLE foo (k int PRIMARY KEY,v VECTOR<FLOAT, 3>)");
+                .withColumn("v", DataTypes.vectorOf(DataTypes.FLOAT, 3)))
+        .hasCql("CREATE TABLE foo (k int PRIMARY KEY,v vector<float, 3>)");
   }
 }

query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/CreateTypeTest.java

@@ -22,7 +22,6 @@
 import static com.datastax.oss.driver.api.querybuilder.SchemaBuilder.udt;
 
 import com.datastax.oss.driver.api.core.type.DataTypes;
-import com.datastax.oss.driver.internal.core.type.DefaultVectorType;
 import org.junit.Test;
 
 public class CreateTypeTest {
@@ -90,7 +89,7 @@ public void should_create_type_with_vector() {
     assertThat(
             createType("ks1", "type")
                 .withField("c1", DataTypes.INT)
-                .withField("vec", new DefaultVectorType(DataTypes.FLOAT, 3)))
-        .hasCql("CREATE TYPE ks1.type (c1 int,vec VECTOR<FLOAT, 3>)");
+                .withField("vec", DataTypes.vectorOf(DataTypes.FLOAT, 3)))
+        .hasCql("CREATE TYPE ks1.type (c1 int,vec vector<float, 3>)");
   }
 }