googleapis
diff --git a/‎google-cloud-spanner/clirr-ignored-differences.xml
Lines changed: 32 additions & 0 deletions b/‎google-cloud-spanner/clirr-ignored-differences.xml
Lines changed: 32 additions & 0 deletions
diff --git a/‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractResultSet.java
Lines changed: 11 additions & 0 deletions b/‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractResultSet.java
Lines changed: 11 additions & 0 deletions
diff --git a/‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractStructReader.java
Lines changed: 35 additions & 0 deletions b/‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractStructReader.java
Lines changed: 35 additions & 0 deletions
diff --git a/‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/ForwardingStructReader.java
Lines changed: 25 additions & 0 deletions b/‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/ForwardingStructReader.java
Lines changed: 25 additions & 0 deletions
diff --git a/‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/GrpcStruct.java
Lines changed: 28 additions & 0 deletions b/‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/GrpcStruct.java
Lines changed: 28 additions & 0 deletions
diff --git a/‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/ResultSets.java
Lines changed: 21 additions & 0 deletions b/‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/ResultSets.java
Lines changed: 21 additions & 0 deletions
diff --git a/‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/Struct.java
Lines changed: 15 additions & 0 deletions b/‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/Struct.java
Lines changed: 15 additions & 0 deletions
@@ -566,6 +566,38 @@
     <method>java.util.List getFloat32Array()</method>
   </difference>
 
+  <!-- UUID -->
+  <difference>
+    <differenceType>7012</differenceType>
+    <className>com/google/cloud/spanner/StructReader</className>
+    <method>java.util.UUID getUuid(int)</method>
+  </difference>
+  <difference>
+    <differenceType>7012</differenceType>
+    <className>com/google/cloud/spanner/StructReader</className>
+    <method>java.util.UUID getUuid(java.lang.String)</method>
+  </difference>
+  <difference>
+    <differenceType>7012</differenceType>
+    <className>com/google/cloud/spanner/StructReader</className>
+    <method>java.util.List getUuidList(int)</method>
+  </difference>
+  <difference>
+    <differenceType>7012</differenceType>
+    <className>com/google/cloud/spanner/StructReader</className>
+    <method>java.util.List getUuidList(java.lang.String)</method>
+  </difference>
+  <difference>
+    <differenceType>7013</differenceType>
+    <className>com/google/cloud/spanner/Value</className>
+    <method>java.util.UUID getUuid()</method>
+  </difference>
+  <difference>
+    <differenceType>7013</differenceType>
+    <className>com/google/cloud/spanner/Value</className>
+    <method>java.util.List getUuidArray()</method>
+  </difference>
+
   <!-- INTERVAL -->
   <difference>
     <differenceType>7012</differenceType>
 
@@ -38,6 +38,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
+import java.util.UUID;
 import java.util.function.Function;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -434,6 +435,11 @@ protected Date getDateInternal(int columnIndex) {
     return currRow().getDateInternal(columnIndex);
   }
 
+  @Override
+  protected UUID getUuidInternal(int columnIndex) {
+    return currRow().getUuidInternal(columnIndex);
+  }
+
   @Override
   protected Interval getIntervalInternal(int columnIndex) {
     return currRow().getIntervalInternal(columnIndex);
@@ -531,6 +537,11 @@ protected List<Date> getDateListInternal(int columnIndex) {
     return currRow().getDateListInternal(columnIndex);
   }
 
+  @Override
+  protected List<UUID> getUuidListInternal(int columnIndex) {
+    return currRow().getUuidListInternal(columnIndex);
+  }
+
   @Override
   protected List<Interval> getIntervalListInternal(int columnIndex) {
     return currRow().getIntervalListInternal(columnIndex);
 
@@ -28,6 +28,7 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.UUID;
 import java.util.function.Function;
 
 /**
@@ -67,6 +68,10 @@ protected String getPgJsonbInternal(int columnIndex) {
 
   protected abstract Date getDateInternal(int columnIndex);
 
+  protected UUID getUuidInternal(int columnIndex) {
+    throw new UnsupportedOperationException("Not implemented");
+  }
+
   protected Interval getIntervalInternal(int columnIndex) {
     throw new UnsupportedOperationException("Not implemented");
   }
@@ -132,6 +137,10 @@ protected List<String> getPgJsonbListInternal(int columnIndex) {
 
   protected abstract List<Date> getDateListInternal(int columnIndex);
 
+  protected List<UUID> getUuidListInternal(int columnIndex) {
+    throw new UnsupportedOperationException("Not implemented");
+  }
+
   protected List<Interval> getIntervalListInternal(int columnIndex) {
     throw new UnsupportedOperationException("Not implemented");
   }
@@ -307,6 +316,19 @@ public Date getDate(String columnName) {
     return getDateInternal(columnIndex);
   }
 
+  @Override
+  public UUID getUuid(int columnIndex) {
+    checkNonNullOfType(columnIndex, Type.uuid(), columnIndex);
+    return getUuidInternal(columnIndex);
+  }
+
+  @Override
+  public UUID getUuid(String columnName) {
+    final int columnIndex = getColumnIndex(columnName);
+    checkNonNullOfType(columnIndex, Type.uuid(), columnName);
+    return getUuidInternal(columnIndex);
+  }
+
   @Override
   public Interval getInterval(int columnIndex) {
     checkNonNullOfType(columnIndex, Type.interval(), columnIndex);
@@ -604,6 +626,19 @@ public List<Date> getDateList(String columnName) {
     return getDateListInternal(columnIndex);
   }
 
+  @Override
+  public List<UUID> getUuidList(int columnIndex) {
+    checkNonNullOfType(columnIndex, Type.array(Type.uuid()), columnIndex);
+    return getUuidListInternal(columnIndex);
+  }
+
+  @Override
+  public List<UUID> getUuidList(String columnName) {
+    final int columnIndex = getColumnIndex(columnName);
+    checkNonNullOfType(columnIndex, Type.array(Type.uuid()), columnName);
+    return getUuidListInternal(columnIndex);
+  }
+
   @Override
   public List<Interval> getIntervalList(int columnIndex) {
     checkNonNullOfType(columnIndex, Type.array(Type.interval()), columnIndex);
 
@@ -26,6 +26,7 @@
 import com.google.protobuf.ProtocolMessageEnum;
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.UUID;
 import java.util.function.Function;
 
 /** Forwarding implements of StructReader */
@@ -231,6 +232,18 @@ public Date getDate(String columnName) {
     return delegate.get().getDate(columnName);
   }
 
+  @Override
+  public UUID getUuid(int columnIndex) {
+    checkValidState();
+    return delegate.get().getUuid(columnIndex);
+  }
+
+  @Override
+  public UUID getUuid(String columnName) {
+    checkValidState();
+    return delegate.get().getUuid(columnName);
+  }
+
   @Override
   public Interval getInterval(int columnIndex) {
     checkValidState();
@@ -421,6 +434,18 @@ public List<Date> getDateList(String columnName) {
     return delegate.get().getDateList(columnName);
   }
 
+  @Override
+  public List<UUID> getUuidList(int columnIndex) {
+    checkValidState();
+    return delegate.get().getUuidList(columnIndex);
+  }
+
+  @Override
+  public List<UUID> getUuidList(String columnName) {
+    checkValidState();
+    return delegate.get().getUuidList(columnName);
+  }
+
   @Override
   public List<Interval> getIntervalList(int columnIndex) {
     checkValidState();
 
@@ -49,6 +49,7 @@
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import java.util.UUID;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -131,6 +132,9 @@ private Object writeReplace() {
         case DATE:
           builder.set(fieldName).to((Date) value);
           break;
+        case UUID:
+          builder.set(fieldName).to((UUID) value);
+          break;
         case INTERVAL:
           builder.set(fieldName).to((Interval) value);
           break;
@@ -187,6 +191,9 @@ private Object writeReplace() {
             case DATE:
               builder.set(fieldName).toDateArray((Iterable<Date>) value);
               break;
+            case UUID:
+              builder.set(fieldName).toUuidArray((Iterable<UUID>) value);
+              break;
             case INTERVAL:
               builder.set(fieldName).toIntervalArray((Iterable<Interval>) value);
               break;
@@ -304,6 +311,9 @@ private static Object decodeValue(Type fieldType, com.google.protobuf.Value prot
       case DATE:
         checkType(fieldType, proto, KindCase.STRING_VALUE);
         return Date.parseDate(proto.getStringValue());
+      case UUID:
+        checkType(fieldType, proto, KindCase.STRING_VALUE);
+        return UUID.fromString(proto.getStringValue());
       case INTERVAL:
         checkType(fieldType, proto, KindCase.STRING_VALUE);
         return Interval.parseFromString(proto.getStringValue());
@@ -356,6 +366,7 @@ static Object decodeArrayValue(Type elementType, ListValue listValue) {
       case BYTES:
       case TIMESTAMP:
       case DATE:
+      case UUID:
       case INTERVAL:
       case STRUCT:
       case PROTO:
@@ -513,6 +524,12 @@ protected Date getDateInternal(int columnIndex) {
     return (Date) rowData.get(columnIndex);
   }
 
+  @Override
+  protected UUID getUuidInternal(int columnIndex) {
+    ensureDecoded(columnIndex);
+    return (UUID) rowData.get(columnIndex);
+  }
+
   @Override
   protected Interval getIntervalInternal(int columnIndex) {
     ensureDecoded(columnIndex);
@@ -640,6 +657,8 @@ protected Value getValueInternal(int columnIndex) {
         return Value.timestamp(isNull ? null : getTimestampInternal(columnIndex));
       case DATE:
         return Value.date(isNull ? null : getDateInternal(columnIndex));
+      case UUID:
+        return Value.uuid(isNull ? null : getUuidInternal(columnIndex));
       case INTERVAL:
         return Value.interval(isNull ? null : getIntervalInternal(columnIndex));
       case STRUCT:
@@ -682,6 +701,8 @@ protected Value getValueInternal(int columnIndex) {
             return Value.timestampArray(isNull ? null : getTimestampListInternal(columnIndex));
           case DATE:
             return Value.dateArray(isNull ? null : getDateListInternal(columnIndex));
+          case UUID:
+            return Value.uuidArray(isNull ? null : getUuidListInternal(columnIndex));
           case INTERVAL:
             return Value.intervalArray(isNull ? null : getIntervalListInternal(columnIndex));
           case STRUCT:
@@ -867,6 +888,13 @@ protected List<Date> getDateListInternal(int columnIndex) {
     return Collections.unmodifiableList((List<Date>) rowData.get(columnIndex));
   }
 
+  @Override
+  @SuppressWarnings("unchecked") // We know ARRAY<UUID> produces a List<UUID>.
+  protected List<UUID> getUuidListInternal(int columnIndex) {
+    ensureDecoded(columnIndex);
+    return Collections.unmodifiableList((List<UUID>) rowData.get(columnIndex));
+  }
+
   @Override
   @SuppressWarnings("unchecked") // We know ARRAY<Interval> produces a List<Interval>.
   protected List<Interval> getIntervalListInternal(int columnIndex) {
 
@@ -35,6 +35,7 @@
 import com.google.spanner.v1.ResultSetStats;
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.UUID;
 import java.util.function.Function;
 
 /** Utility methods for working with {@link com.google.cloud.spanner.ResultSet}. */
@@ -326,6 +327,16 @@ public Date getDate(String columnName) {
       return getCurrentRowAsStruct().getDate(columnName);
     }
 
+    @Override
+    public UUID getUuid(int columnIndex) {
+      return getCurrentRowAsStruct().getUuid(columnIndex);
+    }
+
+    @Override
+    public UUID getUuid(String columnName) {
+      return getCurrentRowAsStruct().getUuid(columnName);
+    }
+
     @Override
     public Interval getInterval(int columnIndex) {
       return getCurrentRowAsStruct().getInterval(columnIndex);
@@ -518,6 +529,16 @@ public List<Date> getDateList(String columnName) {
       return getCurrentRowAsStruct().getDateList(columnName);
     }
 
+    @Override
+    public List<UUID> getUuidList(int columnIndex) {
+      return getCurrentRowAsStruct().getUuidList(columnIndex);
+    }
+
+    @Override
+    public List<UUID> getUuidList(String columnName) {
+      return getCurrentRowAsStruct().getUuidList(columnName);
+    }
+
     @Override
     public List<Interval> getIntervalList(int columnIndex) {
       return getCurrentRowAsStruct().getIntervalList(columnIndex);
 
@@ -36,6 +36,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.UUID;
 import java.util.function.Function;
 import javax.annotation.concurrent.Immutable;
 
@@ -226,6 +227,11 @@ protected Date getDateInternal(int columnIndex) {
       return values.get(columnIndex).getDate();
     }
 
+    @Override
+    protected UUID getUuidInternal(int columnIndex) {
+      return values.get(columnIndex).getUuid();
+    }
+
     @Override
     protected Interval getIntervalInternal(int columnIndex) {
       return values.get(columnIndex).getInterval();
@@ -339,6 +345,11 @@ protected List<Date> getDateListInternal(int columnIndex) {
       return values.get(columnIndex).getDateArray();
     }
 
+    @Override
+    protected List<UUID> getUuidListInternal(int columnIndex) {
+      return values.get(columnIndex).getUuidArray();
+    }
+
     @Override
     protected List<Interval> getIntervalListInternal(int columnIndex) {
       return values.get(columnIndex).getIntervalArray();
@@ -430,6 +441,8 @@ private Object getAsObject(int columnIndex) {
         return getTimestampInternal(columnIndex);
       case DATE:
         return getDateInternal(columnIndex);
+      case UUID:
+        return getUuidInternal(columnIndex);
       case INTERVAL:
         return getIntervalInternal(columnIndex);
       case STRUCT:
@@ -463,6 +476,8 @@ private Object getAsObject(int columnIndex) {
             return getTimestampListInternal(columnIndex);
           case DATE:
             return getDateListInternal(columnIndex);
+          case UUID:
+            return getUuidListInternal(columnIndex);
           case INTERVAL:
             return getIntervalListInternal(columnIndex);
           case STRUCT: