chore: cleanup

Author: olavloite

google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractResultSet.java

@@ -716,8 +716,7 @@ protected BigDecimal getBigDecimalInternal(int columnIndex) {
 
     @Override
     protected String getStringInternal(int columnIndex) {
-      Object value = rowData.get(columnIndex);
-      return value == null ? null : value.toString();
+      return (String) rowData.get(columnIndex);
     }
 
     @Override
@@ -781,8 +780,9 @@ protected Value getValueInternal(int columnIndex) {
         case STRUCT:
           return Value.struct(isNull ? null : getStructInternal(columnIndex));
         case UNRECOGNIZED:
-          return Value.untyped(
-              isNull ? NULL_VALUE : (com.google.protobuf.Value) rowData.get(columnIndex));
+          return Value.unrecognized(
+              isNull ? NULL_VALUE : (com.google.protobuf.Value) rowData.get(columnIndex),
+              columnType);
         case ARRAY:
           final Type elementType = columnType.getArrayElementType();
           switch (elementType.getCode()) {

google-cloud-spanner/src/main/java/com/google/cloud/spanner/Value.java

@@ -100,7 +100,16 @@ public abstract class Value implements Serializable {
    * @param value the non-null proto value (a {@link NullValue} is allowed)
    */
   public static Value untyped(com.google.protobuf.Value value) {
-    return new UntypedValueImpl(Preconditions.checkNotNull(value));
+    return new ProtoBackedValueImpl(Preconditions.checkNotNull(value), null);
+  }
+
+  /** Returns a generic Value backed by a protobuf value. This is used for unrecognized types. */
+  static Value unrecognized(com.google.protobuf.Value value, Type type) {
+    Preconditions.checkArgument(
+        type.getCode() == Code.UNRECOGNIZED
+            || type.getCode() == Code.ARRAY
+                && type.getArrayElementType().getCode() == Code.UNRECOGNIZED);
+    return new ProtoBackedValueImpl(Preconditions.checkNotNull(value), type);
   }
 
   /**
@@ -1101,11 +1110,16 @@ final void checkNotNull() {
     }
   }
 
-  private static class UntypedValueImpl extends AbstractValue {
+  /**
+   * This {@link Value} implementation is backed by a generic protobuf Value instance. It is used
+   * for untyped Values that are created by users, and for values with an unrecognized types that
+   * coming from the backend.
+   */
+  private static class ProtoBackedValueImpl extends AbstractValue {
     private final com.google.protobuf.Value value;
 
-    private UntypedValueImpl(com.google.protobuf.Value value) {
-      super(value.hasNullValue(), null);
+    private ProtoBackedValueImpl(com.google.protobuf.Value value, @Nullable Type type) {
+      super(value.hasNullValue(), type);
       this.value = value;
     }
 
@@ -1182,7 +1196,7 @@ com.google.protobuf.Value valueToProto() {
 
     @Override
     boolean valueEquals(Value v) {
-      return ((UntypedValueImpl) v).value.equals(value);
+      return ((ProtoBackedValueImpl) v).value.equals(value);
     }
 
     @Override

google-cloud-spanner/src/main/java/com/google/cloud/spanner/ValueBinder.java

@@ -97,8 +97,8 @@ public R to(@Nullable String value) {
 
   /**
    * Binds to {@code Value.bytes(value)}. Use {@link #to(Value)} in combination with {@link
-   * Value#bytes(String)} if you already have the value that you want to bind in base64 format. This
-   * prevents unnecessary decoding and encoding of base64 strings.
+   * Value#bytesFromBase64(String)} if you already have the value that you want to bind in base64
+   * format. This prevents unnecessary decoding and encoding of base64 strings.
    */
   public R to(@Nullable ByteArray value) {
     return handle(Value.bytes(value));

google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITWriteTest.java

@@ -21,7 +21,9 @@
 import static com.google.cloud.spanner.Type.json;
 import static com.google.cloud.spanner.testing.EmulatorSpannerHelper.isUsingEmulator;
 import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeFalse;
@@ -42,6 +44,7 @@
 import com.google.cloud.spanner.ParallelIntegrationTest;
 import com.google.cloud.spanner.ResultSet;
 import com.google.cloud.spanner.SpannerException;
+import com.google.cloud.spanner.Statement;
 import com.google.cloud.spanner.Struct;
 import com.google.cloud.spanner.TimestampBound;
 import com.google.cloud.spanner.Value;
@@ -52,6 +55,7 @@
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Base64;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -431,6 +435,55 @@ public void writeBytes() {
     assertThat(row.getBytes(0)).isEqualTo(data);
   }
 
+  @Test
+  public void writeBytesAsString() {
+    Random random = new Random();
+    byte[] data = new byte[256];
+    random.nextBytes(data);
+    String base64 = Base64.getEncoder().encodeToString(data);
+    write(baseInsert().set("BytesValue").to(base64).build());
+    Struct row = readLastRow("BytesValue");
+    assertFalse(row.isNull(0));
+    assertArrayEquals(data, row.getBytes(0).toByteArray());
+    assertEquals(base64, row.getValue(0).getAsString());
+  }
+
+  @Test
+  public void writeBytesAsStringUsingDml() {
+    Random random = new Random();
+    byte[] data = new byte[256];
+    random.nextBytes(data);
+    String base64 = Base64.getEncoder().encodeToString(data);
+    Long updateCount =
+        client
+            .readWriteTransaction()
+            .run(
+                transaction ->
+                    transaction.executeUpdate(
+                        Statement.newBuilder(
+                                "insert into T (BytesValue, K) values ("
+                                    + queryParamString(1)
+                                    + ", "
+                                    + queryParamString(2)
+                                    + ")")
+                            .bind("p1")
+                            .to(Value.bytesFromBase64(base64))
+                            .bind("p2")
+                            .to(lastKey = uniqueString())
+                            .build()));
+    assertNotNull(updateCount);
+    assertEquals(1L, updateCount.longValue());
+
+    Struct row = readLastRow("BytesValue");
+    assertFalse(row.isNull(0));
+    assertArrayEquals(data, row.getBytes(0).toByteArray());
+    assertEquals(base64, row.getValue(0).getAsString());
+  }
+
+  String queryParamString(int index) {
+    return dialect.dialect == Dialect.GOOGLE_STANDARD_SQL ? "@p" + index : "$" + index;
+  }
+
   @Test
   public void writeBytesRandom() {
     // Pseudo-random test for byte encoding.  We explicitly set a random seed so that multiple