samples: fixes spanner samples tests

thiagotnunes · thiagotnunes · commit 972be534ae4f · 2021-03-09T14:37:40.000+11:00
diff --git a/samples/snippets/src/main/java/com/example/spanner/SpannerSample.java b/samples/snippets/src/main/java/com/example/spanner/SpannerSample.java
@@ -1892,8 +1892,7 @@ static void run(
       InstanceAdminClient instanceAdminClient,
       String command,
       DatabaseId database,
-      BackupId backup,
-      Timestamp versionTime) {
+      BackupId backup) {
     switch (command) {
       case "createdatabase":
         createDatabase(dbAdminClient, database);
@@ -2055,7 +2054,7 @@ static void run(
         queryWithQueryOptions(dbClient);
         break;
       case "createbackup":
-        createBackup(dbAdminClient, database, backup, versionTime);
+        createBackup(dbAdminClient, database, backup, getVersionTime(dbClient));
         break;
       case "cancelcreatebackup":
         cancelCreateBackup(
@@ -2090,6 +2089,17 @@ static void run(
     }
   }
 
+  static Timestamp getVersionTime(DatabaseClient dbClient) {
+    // Generates a version time for the backup
+    Timestamp versionTime;
+    try (ResultSet resultSet = dbClient.singleUse()
+        .executeQuery(Statement.of("SELECT CURRENT_TIMESTAMP()"))) {
+      resultSet.next();
+      versionTime = resultSet.getTimestamp(0);
+    }
+    return versionTime;
+  }
+
   static void printUsageAndExit() {
     System.err.println("Usage:");
     System.err.println("    SpannerExample <command> <instance_id> <database_id>");
@@ -2189,15 +2199,7 @@ public static void main(String[] args) throws Exception {
       // Use client here...
       // [END init_client]
 
-      // Generates a version time for the backup
-      Timestamp versionTime;
-      try (ResultSet resultSet = dbClient.singleUse()
-          .executeQuery(Statement.of("SELECT CURRENT_TIMESTAMP()"))) {
-        resultSet.next();
-        versionTime = resultSet.getTimestamp(0);
-      }
-
-      run(dbClient, dbAdminClient, instanceAdminClient, command, db, backup, versionTime);
+      run(dbClient, dbAdminClient, instanceAdminClient, command, db, backup);
       // [START init_client]
     } finally {
       spanner.close();
diff --git a/samples/snippets/src/test/java/com/example/spanner/SpannerSampleIT.java b/samples/snippets/src/test/java/com/example/spanner/SpannerSampleIT.java
@@ -439,4 +439,4 @@ private static Pattern getTestDbIdPattern(String baseDbId) {
   static String formatForTest(String name) {
     return name + "-" + UUID.randomUUID().toString().substring(0, DBID_LENGTH);
   }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -439,4 +439,4 @@ private static Pattern getTestDbIdPattern(String baseDbId) {`
`439`	`439`	`static String formatForTest(String name) {`
`440`	`440`	`return name + "-" + UUID.randomUUID().toString().substring(0, DBID_LENGTH);`
`441`	`441`	`}`
`442`		`-}`
	`442`	`+}`