removing samples

Author: asthamohta

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

@@ -16,6 +16,8 @@
 
 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;
@@ -26,8 +28,6 @@
 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}.

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

@@ -21,10 +21,9 @@
 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 {

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

@@ -16,6 +16,12 @@
 
 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;
@@ -25,22 +31,15 @@
 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.Arrays;
-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 {
 

samples/pom.xml

@@ -33,24 +33,6 @@
     <module>snippets</module>
   </modules>
 
-  <dependencies>
-  <dependency>
-    <groupId>com.google.cloud</groupId>
-    <artifactId>google-cloud-spanner</artifactId>
-    <version>6.19.1-SNAPSHOT</version>
-  </dependency>
-  <!-- [END spanner_install_with_bom] -->
-  <dependency>
-    <groupId>com.google.api.grpc</groupId>
-    <artifactId>grpc-google-cloud-spanner-admin-database-v1</artifactId>
-    <version>6.19.1-SNAPSHOT</version>
-  </dependency>
-  <dependency>
-    <groupId>com.google.api.grpc</groupId>
-    <artifactId>proto-google-cloud-spanner-admin-database-v1</artifactId>
-    <version>6.19.1-SNAPSHOT</version>
-  </dependency>
-  </dependencies>
   <build>
     <plugins>
       <plugin>
@@ -71,4 +53,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
+</project> 

samples/snippets/pom.xml

@@ -44,19 +44,8 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-spanner</artifactId>
-      <version>6.19.1-SNAPSHOT</version>
     </dependency>
     <!-- [END spanner_install_with_bom] -->
-    <dependency>
-      <groupId>com.google.api.grpc</groupId>
-      <artifactId>grpc-google-cloud-spanner-admin-database-v1</artifactId>
-      <version>6.19.1-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>com.google.api.grpc</groupId>
-      <artifactId>proto-google-cloud-spanner-admin-database-v1</artifactId>
-      <version>6.19.1-SNAPSHOT</version>
-    </dependency>
 
     <dependency>
       <groupId>io.opencensus</groupId>

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

@@ -56,14 +56,12 @@
 import com.google.common.io.BaseEncoding;
 import com.google.longrunning.Operation;
 import com.google.protobuf.InvalidProtocolBufferException;
-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.OptimizeRestoredDatabaseMetadata;
 import com.google.spanner.admin.database.v1.RestoreDatabaseMetadata;
 import com.google.spanner.admin.database.v1.UpdateDatabaseDdlMetadata;
 import com.google.spanner.v1.ExecuteSqlRequest.QueryOptions;
-import java.lang.Math;
 import java.math.BigDecimal;
 import java.time.Instant;
 import java.util.ArrayList;
@@ -1661,18 +1659,21 @@ static void cancelCreateBackup(
   // [END spanner_cancel_backup_create]
 
   // [START spanner_list_backup_operations]
-  static void listBackupOperations(
-          InstanceAdminClient instanceAdminClient, DatabaseId databaseId, BackupId backupId) {
+  static void listBackupOperations(InstanceAdminClient instanceAdminClient, DatabaseId databaseId) {
     Instance instance = instanceAdminClient.getInstance(databaseId.getInstanceId().getInstance());
     // Get create backup operations for the sample database.
+    Timestamp last24Hours = Timestamp.ofTimeSecondsAndNanos(TimeUnit.SECONDS.convert(
+        TimeUnit.HOURS.convert(Timestamp.now().getSeconds(), TimeUnit.SECONDS) - 24,
+        TimeUnit.HOURS), 0);
     String filter =
         String.format(
-            "(metadata.@type:type.googleapis.com/google.spanner.admin.database.v1.CreateBackupMetadata) "
-                + "AND (metadata.database:%s)",
-            databaseId.getName());
-    Page<Operation> createBackupOperations = instance.listBackupOperations(Options.filter(filter));
-    System.out.println("Create Backup Operations:");
-    for (Operation op : createBackupOperations.iterateAll()) {
+            "(metadata.database:%s) AND "
+                + "(metadata.@type:type.googleapis.com/"
+                + "google.spanner.admin.database.v1.CreateBackupMetadata) AND "
+                + "(metadata.progress.start_time > \"%s\")",
+            databaseId.getName(), last24Hours);
+    Page<Operation> operations = instance.listBackupOperations(Options.filter(filter));
+    for (Operation op : operations.iterateAll()) {
       try {
         CreateBackupMetadata metadata = op.getMetadata().unpack(CreateBackupMetadata.class);
         System.out.println(
@@ -1686,30 +1687,6 @@ static void listBackupOperations(
         System.err.println(e.getMessage());
       }
     }
-
-    // Get copy backup operations for the sample database.
-    filter =
-            String.format(
-                    "(metadata.@type:type.googleapis.com/"
-                            + "google.spanner.admin.database.v1.CopyBackupMetadata) "
-                            + "AND (metadata.source_backup:%s)",
-                    backupId.getName());
-    Page<Operation>  copyBackupOperations = instance.listBackupOperations(Options.filter(filter));
-    System.out.println("Copy Backup Operations:");
-    for (Operation op : copyBackupOperations.iterateAll()) {
-      try {
-        CopyBackupMetadata copyBackupMetadata = op.getMetadata().unpack(CopyBackupMetadata.class);
-        System.out.println(
-                String.format(
-                        "Copy Backup %s on backup %s pending: %d%% complete",
-                        copyBackupMetadata.getName(),
-                        copyBackupMetadata.getSourceBackup(),
-                        copyBackupMetadata.getProgress().getProgressPercent()));
-      } catch (InvalidProtocolBufferException e) {
-        // The returned operation does not contain CopyBackupMetadata.
-        System.err.println(e.getMessage());
-      }
-    }
   }
   // [END spanner_list_backup_operations]
 
@@ -1863,11 +1840,6 @@ 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();
-
     System.out.println(String.format(
         "Updating expire time of backup [%s] to %s...",
         backupId.toString(),
@@ -2076,7 +2048,7 @@ static void run(
             BackupId.of(backup.getInstanceId(), backup.getBackup() + "_cancel"));
         break;
       case "listbackupoperations":
-        listBackupOperations(instanceAdminClient, database, backup);
+        listBackupOperations(instanceAdminClient, database);
         break;
       case "listdatabaseoperations":
         listDatabaseOperations(instanceAdminClient, dbAdminClient, database.getInstanceId());
@@ -2172,14 +2144,14 @@ static void printUsageAndExit() {
     System.err.println("    SpannerExample querywithqueryoptions my-instance example-db");
     System.err.println("    SpannerExample createbackup my-instance example-db");
     System.err.println("    SpannerExample listbackups my-instance example-db");
-    System.err.println("    SpannerExample listbackupoperations my-instance example-db backup-id");
+    System.err.println("    SpannerExample listbackupoperations my-instance example-db");
     System.err.println("    SpannerExample listdatabaseoperations my-instance example-db");
     System.err.println("    SpannerExample restorebackup my-instance example-db");
     System.exit(1);
   }
 
   public static void main(String[] args) throws Exception {
-    if (args.length != 3 && args.length != 4) {
+    if (args.length != 3) {
       printUsageAndExit();
     }
     // [START init_client]
@@ -2203,9 +2175,6 @@ public static void main(String[] args) throws Exception {
           String.format(
               "%s_%02d",
               db.getDatabase(), LocalDate.now().get(ChronoField.ALIGNED_WEEK_OF_YEAR));
-      if( args.length == 4) {
-        backupName = args[3];
-      }
       BackupId backup = BackupId.of(db.getInstanceId(), backupName);
 
       // [START init_client]