review changes

Author: asthamohta

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

@@ -21,9 +21,10 @@
 import com.google.cloud.spanner.encryption.BackupEncryptionConfig;
 import com.google.cloud.spanner.encryption.EncryptionInfo;
 import com.google.spanner.admin.database.v1.Database;
+
+import javax.annotation.Nullable;
 import java.util.List;
 import java.util.Objects;
-import javax.annotation.Nullable;
 
 /** Represents a Cloud Spanner database backup. */
 public class BackupInfo {
@@ -100,7 +101,7 @@ protected Builder setMaxExpireTime(Timestamp maxExpireTime) {
      *
      * <p>Returns the names of the destination backups being created by copying this source backup.
      */
-    protected Builder addAllReferencingBackups(List<String> referencingBackup) {
+    protected Builder addAllReferencingBackups(List<String> referencingBackups) {
       throw new UnsupportedOperationException("Unimplemented");
     }
   }
@@ -116,7 +117,7 @@ abstract static class BuilderImpl extends Builder {
     private EncryptionInfo encryptionInfo;
     private com.google.spanner.admin.database.v1.Backup proto;
     private Timestamp maxExpireTime;
-    private List<String> referencingBackup;
+    private List<String> referencingBackups;
 
     BuilderImpl(BackupId id) {
       this.id = Preconditions.checkNotNull(id);
@@ -133,7 +134,7 @@ abstract static class BuilderImpl extends Builder {
       this.encryptionInfo = other.encryptionInfo;
       this.proto = other.proto;
       this.maxExpireTime = other.maxExpireTime;
-      this.referencingBackup = other.referencingBackup;
+      this.referencingBackups = other.referencingBackups;
     }
 
     @Override
@@ -188,14 +189,14 @@ Builder setProto(@Nullable com.google.spanner.admin.database.v1.Backup proto) {
     }
 
     @Override
-    public Builder setMaxExpireTime(Timestamp maxExpireTime) {
+    protected Builder setMaxExpireTime(Timestamp maxExpireTime) {
       this.maxExpireTime = Preconditions.checkNotNull(maxExpireTime);
       return this;
     }
 
     @Override
-    public Builder addAllReferencingBackups(List<String> referencingBackup) {
-      this.referencingBackup = Preconditions.checkNotNull(referencingBackup);
+    protected Builder addAllReferencingBackups(List<String> referencingBackups) {
+      this.referencingBackups = Preconditions.checkNotNull(referencingBackups);
       return this;
     }
   }
@@ -220,7 +221,7 @@ public enum State {
   private final EncryptionInfo encryptionInfo;
   private final com.google.spanner.admin.database.v1.Backup proto;
   private final Timestamp maxExpireTime;
-  private final List<String> referencingBackup;
+  private final List<String> referencingBackups;
 
   BackupInfo(BuilderImpl builder) {
     this.id = builder.id;
@@ -233,7 +234,7 @@ public enum State {
     this.database = builder.database;
     this.proto = builder.proto;
     this.maxExpireTime = builder.maxExpireTime;
-    this.referencingBackup = builder.referencingBackup;
+    this.referencingBackups = builder.referencingBackups;
   }
 
   /** Returns the backup id. */
@@ -301,8 +302,8 @@ public Timestamp getMaxExpireTime() {
    * Returns the names of the destination backups being created by copying this source backup {@link
    * Backup}.
    */
-  public List<String> getReferencingBackup() {
-    return referencingBackup;
+  public List<String> getReferencingBackups() {
+    return referencingBackups;
   }
 
   @Override
@@ -323,7 +324,7 @@ public boolean equals(Object o) {
         && Objects.equals(versionTime, that.versionTime)
         && Objects.equals(database, that.database)
         && Objects.equals(maxExpireTime, that.maxExpireTime)
-        && Objects.equals(referencingBackup, that.referencingBackup);
+        && Objects.equals(referencingBackups, that.referencingBackups);
   }
 
   @Override
@@ -338,7 +339,7 @@ public int hashCode() {
         versionTime,
         database,
         maxExpireTime,
-        referencingBackup);
+        referencingBackups);
   }
 
   @Override
@@ -354,6 +355,6 @@ public String toString() {
         versionTime,
         database,
         maxExpireTime,
-        referencingBackup);
+        referencingBackups);
   }
 }

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

@@ -22,9 +22,15 @@
 import com.google.cloud.Timestamp;
 import com.google.cloud.spanner.Options.ListOption;
 import com.google.longrunning.Operation;
-import com.google.spanner.admin.database.v1.*;
-import java.util.List;
+import com.google.spanner.admin.database.v1.CopyBackupMetadata;
+import com.google.spanner.admin.database.v1.CreateBackupMetadata;
+import com.google.spanner.admin.database.v1.CreateDatabaseMetadata;
+import com.google.spanner.admin.database.v1.CreateDatabaseRequest;
+import com.google.spanner.admin.database.v1.RestoreDatabaseMetadata;
+import com.google.spanner.admin.database.v1.UpdateDatabaseDdlMetadata;
+
 import javax.annotation.Nullable;
+import java.util.List;
 
 /** Client to do admin operations on a Cloud Spanner Database. */
 public interface DatabaseAdminClient {
@@ -206,8 +212,8 @@ default OperationFuture<Backup, CopyBackupMetadata> copyBackup(
   }
 
   /**
-   * Creates a copy of backup from an existing backup in Cloud Spanner. Any configuration options in
-   * the {@link Backup} instance will be included in the {@link
+   * Creates a copy of backup from an existing backup in Cloud Spanner in the same instance. Any
+   * configuration options in the {@link Backup} instance will be included in the {@link
    * com.google.spanner.admin.database.v1.CopyBackupRequest}.
    *
    * <p>The expire time of the new backup must be set and be at least 6 hours and at most 366 days

google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/SpannerRpc.java

@@ -39,10 +39,11 @@
 import com.google.spanner.admin.instance.v1.InstanceConfig;
 import com.google.spanner.admin.instance.v1.UpdateInstanceMetadata;
 import com.google.spanner.v1.*;
+import org.threeten.bp.Duration;
+
+import javax.annotation.Nullable;
 import java.util.List;
 import java.util.Map;
-import javax.annotation.Nullable;
-import org.threeten.bp.Duration;
 
 /**
  * Abstracts remote calls to the Cloud Spanner service. Typically end-consumer code will never use