feat: adding max expire time and get referencing database support

Author: asthamohta

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

@@ -16,8 +16,6 @@
 
 package com.google.cloud.spanner;
 
-import static com.google.common.base.Preconditions.checkArgument;
-
 import com.google.api.client.util.Preconditions;
 import com.google.api.gax.longrunning.OperationFuture;
 import com.google.api.gax.paging.Page;
@@ -28,6 +26,8 @@
 import com.google.spanner.admin.database.v1.CreateBackupMetadata;
 import com.google.spanner.admin.database.v1.RestoreDatabaseMetadata;
 
+import static com.google.common.base.Preconditions.checkArgument;
+
 /**
  * Represents a Cloud Spanner database backup. {@code Backup} adds a layer of service related
  * functionality over {@code BackupInfo}.
@@ -183,6 +183,8 @@ static Backup fromProto(
         .setDatabase(DatabaseId.of(proto.getDatabase()))
         .setEncryptionInfo(EncryptionInfo.fromProtoOrNull(proto.getEncryptionInfo()))
         .setProto(proto)
+        .setMaxExpireTime(Timestamp.fromProto(proto.getMaxExpireTime()))
+        .setReferencingBackup(proto.getReferencingBackupsList())
         .build();
   }
 

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

@@ -20,9 +20,11 @@
 import com.google.cloud.Timestamp;
 import com.google.cloud.spanner.encryption.BackupEncryptionConfig;
 import com.google.cloud.spanner.encryption.EncryptionInfo;
+import com.google.protobuf.ProtocolStringList;
 import com.google.spanner.admin.database.v1.Database;
-import java.util.Objects;
+
 import javax.annotation.Nullable;
+import java.util.Objects;
 
 /** Represents a Cloud Spanner database backup. */
 public class BackupInfo {
@@ -84,6 +86,9 @@ public abstract static class Builder {
 
     /** Builds the backup from this builder. */
     public abstract Backup build();
+
+    protected abstract Builder setMaxExpireTime(Timestamp maxExpireTime);
+    protected abstract Builder setReferencingBackup(ProtocolStringList referencingBackup);
   }
 
   abstract static class BuilderImpl extends Builder {
@@ -96,6 +101,8 @@ abstract static class BuilderImpl extends Builder {
     private BackupEncryptionConfig encryptionConfig;
     private EncryptionInfo encryptionInfo;
     private com.google.spanner.admin.database.v1.Backup proto;
+    private Timestamp maxExpireTime;
+    private ProtocolStringList referencingBackup;
 
     BuilderImpl(BackupId id) {
       this.id = Preconditions.checkNotNull(id);
@@ -111,6 +118,8 @@ abstract static class BuilderImpl extends Builder {
       this.encryptionConfig = other.encryptionConfig;
       this.encryptionInfo = other.encryptionInfo;
       this.proto = other.proto;
+      this.maxExpireTime = other.maxExpireTime;
+      this.referencingBackup = other.referencingBackup;
     }
 
     @Override
@@ -163,6 +172,19 @@ Builder setProto(@Nullable com.google.spanner.admin.database.v1.Backup proto) {
       this.proto = proto;
       return this;
     }
+
+    @Override
+    public Builder setMaxExpireTime(Timestamp maxExpireTime) {
+      this.maxExpireTime = Preconditions.checkNotNull(maxExpireTime);
+      return this;
+    }
+
+
+    @Override
+    public Builder setReferencingBackup(ProtocolStringList referencingBackup) {
+      this.referencingBackup = Preconditions.checkNotNull(referencingBackup);
+      return this;
+    }
   }
 
   /** State of the backup. */
@@ -184,6 +206,8 @@ public enum State {
   private final BackupEncryptionConfig encryptionConfig;
   private final EncryptionInfo encryptionInfo;
   private final com.google.spanner.admin.database.v1.Backup proto;
+  private final Timestamp maxExpireTime;
+  private final ProtocolStringList referencingBackup;
 
   BackupInfo(BuilderImpl builder) {
     this.id = builder.id;
@@ -195,6 +219,8 @@ public enum State {
     this.versionTime = builder.versionTime;
     this.database = builder.database;
     this.proto = builder.proto;
+    this.maxExpireTime = builder.maxExpireTime;
+    this.referencingBackup = builder.referencingBackup;
   }
 
   /** Returns the backup id. */
@@ -253,6 +279,14 @@ public DatabaseId getDatabase() {
     return proto;
   }
 
+  public Timestamp getMaxExpireTime() {
+    return maxExpireTime;
+  }
+
+  public ProtocolStringList getReferencingBackup() {
+    return referencingBackup;
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -269,26 +303,30 @@ public boolean equals(Object o) {
         && Objects.equals(encryptionInfo, that.encryptionInfo)
         && Objects.equals(expireTime, that.expireTime)
         && Objects.equals(versionTime, that.versionTime)
-        && Objects.equals(database, that.database);
+        && Objects.equals(database, that.database)
+        && Objects.equals(maxExpireTime, that.maxExpireTime)
+        && Objects.equals(referencingBackup, that.referencingBackup);
   }
 
   @Override
   public int hashCode() {
     return Objects.hash(
-        id, state, size, encryptionConfig, encryptionInfo, expireTime, versionTime, database);
+        id, state, size, encryptionConfig, encryptionInfo, expireTime, versionTime, database, maxExpireTime, referencingBackup);
   }
 
   @Override
   public String toString() {
     return String.format(
-        "Backup[%s, %s, %d, %s, %s, %s, %s, %s]",
+        "Backup[%s, %s, %d, %s, %s, %s, %s, %s, %s, %s]",
         id.getName(),
         state,
         size,
         encryptionConfig,
         encryptionInfo,
         expireTime,
         versionTime,
-        database);
+        database,
+        maxExpireTime,
+        referencingBackup);
   }
 }

samples/snippets/src/main/java/com/example/spanner/SpannerSample.java

@@ -1842,6 +1842,8 @@ static void updateBackup(DatabaseAdminClient dbAdminClient, BackupId backupId) {
             TimeUnit.SECONDS.toMicros(backup.getExpireTime().getSeconds())
                 + TimeUnit.NANOSECONDS.toMicros(backup.getExpireTime().getNanos())
                 + TimeUnit.DAYS.toMicros(30L));
+    // New Expire Time must be less than Max Expire Time
+    expireTime = expireTime.compareTo(backup.getMaxExpireTime())<0?expireTime:backup.getMaxExpireTime();
     int timeDiff = expireTime.compareTo(backup.getExpireTime());
     Timestamp newExpireTime = (timeDiff < 0) ? expireTime : backup.getExpireTime();