fmt

Author: SiyaoIsHiding

core/src/main/java/com/datastax/oss/driver/api/core/data/CqlVector.java

@@ -96,7 +96,7 @@ public static <V> CqlVector<V> from(@NonNull String str, @NonNull TypeCodec<V> s
     if (str.charAt(idx++) != '[')
       throw new IllegalArgumentException(
           String.format(
-              "Cannot parse list value from \"%s\", at character %d expecting '[' but got '%c'",
+              "Cannot parse vector value from \"%s\", at character %d expecting '[' but got '%c'",
               str, idx, str.charAt(idx)));
 
     idx = ParseUtils.skipSpaces(str, idx);
@@ -113,7 +113,8 @@ public static <V> CqlVector<V> from(@NonNull String str, @NonNull TypeCodec<V> s
       } catch (IllegalArgumentException e) {
         throw new IllegalArgumentException(
             String.format(
-                "Cannot parse list value from \"%s\", invalid CQL value at character %d", str, idx),
+                "Cannot parse vector value from \"%s\", invalid CQL value at character %d",
+                str, idx),
             e);
       }
 
@@ -125,13 +126,13 @@ public static <V> CqlVector<V> from(@NonNull String str, @NonNull TypeCodec<V> s
       if (str.charAt(idx++) != ',')
         throw new IllegalArgumentException(
             String.format(
-                "Cannot parse list value from \"%s\", at character %d expecting ',' but got '%c'",
+                "Cannot parse vector value from \"%s\", at character %d expecting ',' but got '%c'",
                 str, idx, str.charAt(idx)));
 
       idx = ParseUtils.skipSpaces(str, idx);
     }
     throw new IllegalArgumentException(
-        String.format("Malformed list value \"%s\", missing closing ']'", str));
+        String.format("Malformed vector value \"%s\", missing closing ']'", str));
   }
 
   private final List<T> list;

core/src/test/java/com/datastax/oss/driver/api/core/data/CqlVectorTest.java

@@ -25,7 +25,9 @@
 import com.datastax.oss.driver.api.core.type.codec.TypeCodecs;
 import com.datastax.oss.driver.api.core.type.codec.registry.CodecRegistry;
 import com.datastax.oss.driver.internal.SerializationHelper;
-import com.datastax.oss.driver.shaded.guava.common.collect.Iterators;
+import com.tngtech.java.junit.dataprovider.DataProvider;
+import com.tngtech.java.junit.dataprovider.DataProviderRunner;
+import com.tngtech.java.junit.dataprovider.UseDataProvider;
 import java.io.ByteArrayInputStream;
 import java.io.ObjectInputStream;
 import java.io.ObjectStreamException;
@@ -37,10 +39,6 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.stream.Collectors;
-
-import com.tngtech.java.junit.dataprovider.DataProvider;
-import com.tngtech.java.junit.dataprovider.DataProviderRunner;
-import com.tngtech.java.junit.dataprovider.UseDataProvider;
 import org.apache.commons.codec.DecoderException;
 import org.apache.commons.codec.binary.Hex;
 import org.assertj.core.util.Lists;
@@ -54,11 +52,11 @@ public class CqlVectorTest {
 
   @DataProvider
   public static Object[][] dataProvider() {
-    return new Object[][]{
-            {new Float[]{1.0f, 2.5f}},
-            {new LocalTime[]{LocalTime.of(1, 2), LocalTime.of(3, 4)}},
-            {new List[]{Arrays.asList(1, 2), Arrays.asList(3, 4)}},
-            {new CqlVector[]{CqlVector.newInstance("a", "bc"), CqlVector.newInstance("d", "ef")}}
+    return new Object[][] {
+      {new Float[] {1.0f, 2.5f}},
+      {new LocalTime[] {LocalTime.of(1, 2), LocalTime.of(3, 4)}},
+      {new List[] {Arrays.asList(1, 2), Arrays.asList(3, 4)}},
+      {new CqlVector[] {CqlVector.newInstance("a", "bc"), CqlVector.newInstance("d", "ef")}}
     };
   }
 
@@ -143,7 +141,7 @@ public void should_build_empty_vector() {
 
   @Test
   @UseDataProvider("dataProvider")
-  public <T> void  should_behave_mostly_like_a_list(T[] vals) {
+  public <T> void should_behave_mostly_like_a_list(T[] vals) {
     CqlVector<T> vector = CqlVector.newInstance(vals);
     assertThat(vector.get(0)).isEqualTo(vals[0]);
     vector.set(0, vals[1]);

core/src/test/java/com/datastax/oss/driver/internal/core/type/codec/VectorCodecTest.java

@@ -24,7 +24,6 @@
 import com.datastax.oss.driver.api.core.data.CqlVector;
 import com.datastax.oss.driver.api.core.type.DataType;
 import com.datastax.oss.driver.api.core.type.DataTypes;
-import com.datastax.oss.driver.api.core.type.VectorType;
 import com.datastax.oss.driver.api.core.type.codec.TypeCodec;
 import com.datastax.oss.driver.api.core.type.codec.TypeCodecs;
 import com.datastax.oss.driver.api.core.type.codec.registry.CodecRegistry;
@@ -33,8 +32,6 @@
 import com.tngtech.java.junit.dataprovider.DataProvider;
 import com.tngtech.java.junit.dataprovider.DataProviderRunner;
 import com.tngtech.java.junit.dataprovider.UseDataProvider;
-
-import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.time.LocalTime;
 import java.util.HashMap;
@@ -43,7 +40,7 @@
 import org.junit.runner.RunWith;
 
 @RunWith(DataProviderRunner.class)
-public class VectorCodecTest  {
+public class VectorCodecTest {
 
   @DataProvider
   public static Object[][] dataProvider() {
@@ -228,15 +225,17 @@ public void should_accept_generic_type(
 
   @Test
   @UseDataProvider("dataProvider")
-  public void should_accept_raw_type(DataType dataType, Object[] values, String formatted, ByteBuffer bytes) {
+  public void should_accept_raw_type(
+      DataType dataType, Object[] values, String formatted, ByteBuffer bytes) {
     TypeCodec<CqlVector<Object>> codec = getCodec(dataType);
     assertThat(codec.accepts(CqlVector.class)).isTrue();
     assertThat(codec.accepts(Integer.class)).isFalse();
   }
 
   @Test
   @UseDataProvider("dataProvider")
-  public void should_accept_object(DataType dataType, Object[] values, String formatted, ByteBuffer bytes) {
+  public void should_accept_object(
+      DataType dataType, Object[] values, String formatted, ByteBuffer bytes) {
     TypeCodec<CqlVector<Object>> codec = getCodec(dataType);
     CqlVector<?> vector = CqlVector.newInstance(values);
     assertThat(codec.accepts(vector)).isTrue();
@@ -254,8 +253,9 @@ public void should_handle_null_and_empty() {
     assertThat(codec.parse("")).isNull();
     assertThat(codec.parse(null)).isNull();
     assertThatThrownBy(() -> codec.encode(CqlVector.newInstance(), ProtocolVersion.DEFAULT))
-            .isInstanceOf(IllegalArgumentException.class);
+        .isInstanceOf(IllegalArgumentException.class);
   }
+
   private static TypeCodec<CqlVector<Object>> getCodec(DataType dataType) {
     return TypeCodecs.vectorOf(
         DataTypes.vectorOf(dataType, 2), CodecRegistry.DEFAULT.codecFor(dataType));