From aa2f11ec75c2dcbc7ec00c5dc2f274dfd8f54197 Mon Sep 17 00:00:00 2001
From: Thiago Nunes <thiagotnunes@google.com>
Date: Fri, 15 Jan 2021 12:37:35 +1100
Subject: [PATCH] chore: refactors / addresses pr comments

---
 .../java/com/google/cloud/spanner/BackupInfo.java     |  2 +-
 .../main/java/com/google/cloud/spanner/Database.java  | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/BackupInfo.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/BackupInfo.java
index 0435d32e80..199e6ae2ae 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/BackupInfo.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/BackupInfo.java
@@ -100,7 +100,7 @@ public Builder setExpireTime(Timestamp expireTime) {
 
     @Override
     public Builder setVersionTime(Timestamp versionTime) {
-      this.versionTime = Preconditions.checkNotNull(versionTime);
+      this.versionTime = versionTime;
       return this;
     }
 
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Database.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Database.java
index 92b5510061..a442ad2399 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Database.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Database.java
@@ -119,16 +119,13 @@ public OperationFuture<Backup, CreateBackupMetadata> backup(Backup backup) {
         backup.getInstanceId().equals(getId().getInstanceId()),
         "The instance of the backup must be equal to the instance of this database.");
 
-    final BackupInfo.Builder backupBuilder =
+    return dbClient.createBackup(
         dbClient
             .newBackupBuilder(backup.getId())
             .setDatabase(getId())
-            .setExpireTime(backup.getExpireTime());
-    if (backup.getVersionTime() != null) {
-      backupBuilder.setVersionTime(backup.getVersionTime());
-    }
-
-    return dbClient.createBackup(backupBuilder.build());
+            .setExpireTime(backup.getExpireTime())
+            .setVersionTime(backup.getVersionTime())
+            .build());
   }
 
   /**