changes as per review

Author: asthamohta

google-cloud-spanner/clirr-ignored-differences.xml

@@ -58,6 +58,6 @@
   <difference>
     <differenceType>7012</differenceType>
     <className>com/google/cloud/spanner/spi/v1/SpannerRpc</className>
-    <method>com.google.api.gax.longrunning.OperationFuture copyBackUp(com.google.cloud.spanner.BackupId, com.google.cloud.spanner.Backup)</method>
+    <method>com.google.api.gax.longrunning.OperationFuture copyBackup(com.google.cloud.spanner.BackupId, com.google.cloud.spanner.Backup)</method>
   </difference>
 </differences>

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

@@ -28,8 +28,9 @@
 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 java.util.List;
+
 import javax.annotation.Nullable;
+import java.util.List;
 
 /** Client to do admin operations on a Cloud Spanner Database. */
 public interface DatabaseAdminClient {
@@ -234,7 +235,7 @@ default OperationFuture<Backup, CopyBackupMetadata> copyBackup(
    *     .setEncryptionConfig(encryptionConfig)
    *     .build();
    *
-   * OperationFuture<Backup, CopyBackupMetadata> op = dbAdminClient.copyBackUp(sourceBackupId, destinationBackup);
+   * OperationFuture<Backup, CopyBackupMetadata> op = dbAdminClient.copyBackup(sourceBackupId, destinationBackup);
    * Backup copiedBackup = op.get();
    * }</pre>
    *

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

@@ -32,11 +32,7 @@
 import com.google.longrunning.Operation;
 import com.google.protobuf.Empty;
 import com.google.protobuf.FieldMask;
-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.RestoreDatabaseMetadata;
-import com.google.spanner.admin.database.v1.UpdateDatabaseDdlMetadata;
+import com.google.spanner.admin.database.v1.*;
 import java.util.List;
 import java.util.UUID;
 import javax.annotation.Nullable;
@@ -185,7 +181,7 @@ public OperationFuture<Backup, CopyBackupMetadata> copyBackup(
     Preconditions.checkNotNull(destinationBackup);
 
     final OperationFuture<com.google.spanner.admin.database.v1.Backup, CopyBackupMetadata>
-        rawOperationFuture = rpc.copyBackUp(sourceBackupId, destinationBackup);
+        rawOperationFuture = rpc.copyBackup(sourceBackupId, destinationBackup);
 
     return new OperationFutureImpl<>(
         rawOperationFuture.getPollingFuture(),

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

@@ -1268,7 +1268,7 @@ public OperationFuture<Backup, CreateBackupMetadata> createBackup(
   }
 
   @Override
-  public OperationFuture<Backup, CopyBackupMetadata> copyBackUp(
+  public OperationFuture<Backup, CopyBackupMetadata> copyBackup(
       BackupId sourceBackupId, final com.google.cloud.spanner.Backup destinationBackup)
       throws SpannerException {
     Preconditions.checkNotNull(sourceBackupId);

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

@@ -221,7 +221,7 @@ OperationFuture<Backup, CreateBackupMetadata> createBackup(
    *     source backup.
    * @return the operation that monitors the backup creation.
    */
-  default OperationFuture<Backup, CopyBackupMetadata> copyBackUp(
+  default OperationFuture<Backup, CopyBackupMetadata> copyBackup(
       BackupId sourceBackupId, com.google.cloud.spanner.Backup destinationBackup) {
     throw new UnsupportedOperationException("Unimplemented");
   }

google-cloud-spanner/src/test/java/com/google/cloud/spanner/BackupTest.java

@@ -16,12 +16,6 @@
 
 package com.google.cloud.spanner;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static org.mockito.MockitoAnnotations.initMocks;
-
 import com.google.cloud.Identity;
 import com.google.cloud.Policy;
 import com.google.cloud.Role;
@@ -31,15 +25,21 @@
 import com.google.cloud.spanner.encryption.EncryptionInfo;
 import com.google.rpc.Code;
 import com.google.rpc.Status;
-import java.util.Arrays;
-import java.util.Collections;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 
+import java.util.Collections;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.mockito.MockitoAnnotations.initMocks;
+
 @RunWith(JUnit4.class)
 public class BackupTest {
 
@@ -313,7 +313,7 @@ private Backup createBackup() {
             .setState(com.google.spanner.admin.database.v1.Backup.State.CREATING)
             .setMaxExpireTime(
                 com.google.protobuf.Timestamp.newBuilder().setSeconds(3000L).setNanos(3000).build())
-            .addAllReferencingBackups(Arrays.asList(REFERENCING_BACKUP_NAME))
+            .addAllReferencingBackups(Collections.singletonList(REFERENCING_BACKUP_NAME))
             .build();
     return Backup.fromProto(proto, dbClient);
   }
@@ -331,7 +331,7 @@ private Backup copyBackup() {
             .setState(com.google.spanner.admin.database.v1.Backup.State.CREATING)
             .setMaxExpireTime(
                 com.google.protobuf.Timestamp.newBuilder().setSeconds(3000L).setNanos(3000).build())
-            .addAllReferencingBackups(Arrays.asList(REFERENCING_BACKUP_NAME))
+            .addAllReferencingBackups(Collections.singletonList(REFERENCING_BACKUP_NAME))
             .build();
     return Backup.fromProto(proto, dbClient);
   }

google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseAdminClientImplTest.java

@@ -470,7 +470,7 @@ public void copyBackupWithParams() throws Exception {
             .newBackupBuilder(BackupId.of(PROJECT_ID, INSTANCE_ID, BK_ID))
             .setExpireTime(t)
             .build();
-    when(rpc.copyBackUp(BackupId.of(PROJECT_ID, INSTANCE_ID, SOURCE_BK), backup))
+    when(rpc.copyBackup(BackupId.of(PROJECT_ID, INSTANCE_ID, SOURCE_BK), backup))
         .thenReturn(rawOperationFuture);
     OperationFuture<com.google.cloud.spanner.Backup, CopyBackupMetadata> op =
         client.copyBackup(INSTANCE_ID, SOURCE_BK, BK_ID, t);
@@ -498,7 +498,7 @@ public void copyBackupWithBackupObject() throws ExecutionException, InterruptedE
             .build();
     BackupId sourceBackupId = BackupId.of(PROJECT_ID, INSTANCE_ID, BK_ID);
 
-    when(rpc.copyBackUp(sourceBackupId, requestBackup)).thenReturn(rawOperationFuture);
+    when(rpc.copyBackup(sourceBackupId, requestBackup)).thenReturn(rawOperationFuture);
 
     final OperationFuture<com.google.cloud.spanner.Backup, CopyBackupMetadata> op =
         client.copyBackup(sourceBackupId, requestBackup);
@@ -523,7 +523,7 @@ public void copyEncryptedBackup() throws ExecutionException, InterruptedExceptio
             .setEncryptionConfig(EncryptionConfigs.customerManagedEncryption(KMS_KEY_NAME))
             .build();
     BackupId sourceBackupId = BackupId.of(PROJECT_ID, INSTANCE_ID, BK_ID);
-    when(rpc.copyBackUp(sourceBackupId, backup)).thenReturn(rawOperationFuture);
+    when(rpc.copyBackup(sourceBackupId, backup)).thenReturn(rawOperationFuture);
     final OperationFuture<com.google.cloud.spanner.Backup, CopyBackupMetadata> op =
         client.copyBackup(sourceBackupId, backup);
     assertThat(op.isDone()).isTrue();