address PR reviews. use java util Optional. Consolidate two vector codec proxies. e.t.c

Author: SiyaoIsHiding

.python-version

@@ -0,0 +1 @@
+ccm-public

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

@@ -18,7 +18,6 @@
 package com.datastax.oss.driver.api.core.data;
 
 import com.datastax.oss.driver.api.core.type.codec.TypeCodec;
-import com.datastax.oss.driver.api.core.type.codec.registry.CodecRegistry;
 import com.datastax.oss.driver.internal.core.type.codec.ParseUtils;
 import com.datastax.oss.driver.shaded.guava.common.base.Preconditions;
 import com.datastax.oss.driver.shaded.guava.common.base.Predicates;
@@ -79,9 +78,7 @@ public static <V> CqlVector<V> newInstance(List<V> list) {
   }
 
   /**
-   * Create a new CqlVector instance from the specified string representation. Note that this method
-   * is intended to mirror {@link #toString()}; passing this method the output from a <code>toString
-   * </code> call on some CqlVector should return a CqlVector that is equal to the origin instance.
+   * Create a new CqlVector instance from the specified string representation.
    *
    * @param str a String representation of a CqlVector
    * @param subtypeCodec
@@ -90,7 +87,7 @@ public static <V> CqlVector<V> newInstance(List<V> list) {
   public static <V> CqlVector<V> from(@NonNull String str, @NonNull TypeCodec<V> subtypeCodec) {
     Preconditions.checkArgument(str != null, "Cannot create CqlVector from null string");
     Preconditions.checkArgument(!str.isEmpty(), "Cannot create CqlVector from empty string");
-    if (str == null || str.isEmpty() || str.equalsIgnoreCase("NULL")) return null;
+    if (str.equalsIgnoreCase("NULL")) return null;
 
     int idx = ParseUtils.skipSpaces(str, 0);
     if (str.charAt(idx++) != '[')
@@ -102,7 +99,7 @@ public static <V> CqlVector<V> from(@NonNull String str, @NonNull TypeCodec<V> s
     idx = ParseUtils.skipSpaces(str, idx);
 
     if (str.charAt(idx) == ']') {
-      return null;
+      return new CqlVector<>(new ArrayList<>());
     }
 
     List<V> list = new ArrayList<>();
@@ -231,11 +228,17 @@ public int hashCode() {
     return Objects.hash(list);
   }
 
+  /**
+   * Only works if the inner type of the vector is a Number. Will throw otherwise.
+   *
+   * @return the string representation
+   */
   @Override
   public String toString() {
     if (this.list.isEmpty()) return "[]";
-    TypeCodec<T> subcodec = CodecRegistry.DEFAULT.codecFor(list.get(0));
-    return this.list.stream().map(subcodec::format).collect(Collectors.joining(", ", "[", "]"));
+    return this.list.stream()
+        .map(ele -> ele.toString())
+        .collect(Collectors.joining(", ", "[", "]"));
   }
 
   /**

core/src/main/java/com/datastax/oss/driver/api/core/type/codec/TypeCodec.java

@@ -24,11 +24,11 @@
 import com.datastax.oss.driver.api.core.metadata.schema.AggregateMetadata;
 import com.datastax.oss.driver.api.core.type.DataType;
 import com.datastax.oss.driver.api.core.type.reflect.GenericType;
-import com.datastax.oss.driver.shaded.guava.common.base.Optional;
 import com.datastax.oss.driver.shaded.guava.common.base.Preconditions;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 import java.nio.ByteBuffer;
+import java.util.Optional;
 
 /**
  * Manages the two-way conversion between a CQL type and a Java type.
@@ -238,6 +238,6 @@ default boolean accepts(@NonNull DataType cqlType) {
 
   @NonNull
   default Optional<Integer> serializedSize() {
-    return Optional.absent();
+    return Optional.empty();
   }
 }

core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/BigIntCodec.java

@@ -22,10 +22,10 @@
 import com.datastax.oss.driver.api.core.type.DataTypes;
 import com.datastax.oss.driver.api.core.type.codec.PrimitiveLongCodec;
 import com.datastax.oss.driver.api.core.type.reflect.GenericType;
-import com.datastax.oss.driver.shaded.guava.common.base.Optional;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 import java.nio.ByteBuffer;
+import java.util.Optional;
 import net.jcip.annotations.ThreadSafe;
 
 @ThreadSafe

core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/BlobCodec.java

@@ -22,7 +22,6 @@
 import com.datastax.oss.driver.api.core.type.DataTypes;
 import com.datastax.oss.driver.api.core.type.codec.TypeCodec;
 import com.datastax.oss.driver.api.core.type.reflect.GenericType;
-import com.datastax.oss.driver.shaded.guava.common.base.Optional;
 import com.datastax.oss.protocol.internal.util.Bytes;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
@@ -84,10 +83,4 @@ public ByteBuffer parse(@Nullable String value) {
         ? null
         : Bytes.fromHexString(value);
   }
-
-  @NonNull
-  @Override
-  public Optional<Integer> serializedSize() {
-    return Optional.absent();
-  }
 }

core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/BooleanCodec.java

@@ -22,10 +22,10 @@
 import com.datastax.oss.driver.api.core.type.DataTypes;
 import com.datastax.oss.driver.api.core.type.codec.PrimitiveBooleanCodec;
 import com.datastax.oss.driver.api.core.type.reflect.GenericType;
-import com.datastax.oss.driver.shaded.guava.common.base.Optional;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 import java.nio.ByteBuffer;
+import java.util.Optional;
 import net.jcip.annotations.ThreadSafe;
 
 @ThreadSafe

core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/CounterCodec.java

@@ -19,7 +19,6 @@
 
 import com.datastax.oss.driver.api.core.type.DataType;
 import com.datastax.oss.driver.api.core.type.DataTypes;
-import com.datastax.oss.driver.shaded.guava.common.base.Optional;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import net.jcip.annotations.ThreadSafe;
 
@@ -30,10 +29,4 @@ public class CounterCodec extends BigIntCodec {
   public DataType getCqlType() {
     return DataTypes.COUNTER;
   }
-
-  @NonNull
-  @Override
-  public Optional<Integer> serializedSize() {
-    return Optional.absent();
-  }
 }

core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/CqlDurationCodec.java

@@ -24,7 +24,6 @@
 import com.datastax.oss.driver.api.core.type.codec.TypeCodec;
 import com.datastax.oss.driver.api.core.type.reflect.GenericType;
 import com.datastax.oss.driver.internal.core.type.util.VIntCoding;
-import com.datastax.oss.driver.shaded.guava.common.base.Optional;
 import com.datastax.oss.driver.shaded.guava.common.io.ByteArrayDataOutput;
 import com.datastax.oss.driver.shaded.guava.common.io.ByteStreams;
 import com.datastax.oss.protocol.internal.util.Bytes;
@@ -116,10 +115,4 @@ public CqlDuration parse(@Nullable String value) {
         ? null
         : CqlDuration.from(value);
   }
-
-  @NonNull
-  @Override
-  public Optional<Integer> serializedSize() {
-    return Optional.absent();
-  }
 }

core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/DateCodec.java

@@ -26,7 +26,6 @@
 import com.datastax.oss.driver.api.core.type.codec.TypeCodecs;
 import com.datastax.oss.driver.api.core.type.reflect.GenericType;
 import com.datastax.oss.driver.internal.core.util.Strings;
-import com.datastax.oss.driver.shaded.guava.common.base.Optional;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 import java.nio.ByteBuffer;
@@ -153,10 +152,4 @@ private static int cqlDateToDaysSinceEpoch(long raw) {
 
   private static final long MAX_CQL_LONG_VALUE = ((1L << 32) - 1);
   private static final long EPOCH_AS_CQL_LONG = (1L << 31);
-
-  @NonNull
-  @Override
-  public Optional<Integer> serializedSize() {
-    return Optional.absent();
-  }
 }

core/src/main/java/com/datastax/oss/driver/internal/core/type/codec/DecimalCodec.java

@@ -22,7 +22,6 @@
 import com.datastax.oss.driver.api.core.type.DataTypes;
 import com.datastax.oss.driver.api.core.type.codec.TypeCodec;
 import com.datastax.oss.driver.api.core.type.reflect.GenericType;
-import com.datastax.oss.driver.shaded.guava.common.base.Optional;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 import java.math.BigDecimal;
@@ -108,10 +107,4 @@ public BigDecimal parse(@Nullable String value) {
           String.format("Cannot parse decimal value from \"%s\"", value));
     }
   }
-
-  @NonNull
-  @Override
-  public Optional<Integer> serializedSize() {
-    return Optional.absent();
-  }
 }