Make Statement and TimestampBound serializable

Mairbek Khadikov · Mairbek Khadikov · commit afbd59a729be · 2017-05-08T17:11:35.000-07:00
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Statement.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Statement.java
@@ -21,6 +21,8 @@
 
 import com.google.cloud.spanner.ReadContext.QueryAnalyzeMode;
 import com.google.common.collect.ImmutableMap;
+
+import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
@@ -50,7 +52,9 @@
  *
  * <p>{@code Statement} instances are immutable.
  */
-public final class Statement {
+public final class Statement implements Serializable {
+  private static final long serialVersionUID = -1967958247625065259L;
+
   private final ImmutableMap<String, Value> parameters;
   private final String sql;
 
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TimestampBound.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TimestampBound.java
@@ -24,6 +24,8 @@
 import com.google.protobuf.Duration;
 import com.google.protobuf.util.Durations;
 import com.google.spanner.v1.TransactionOptions;
+
+import java.io.Serializable;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
@@ -115,10 +117,11 @@
  * @see Session#singleUseReadOnlyTransaction(TimestampBound)
  * @see Session#readOnlyTransaction(TimestampBound)
  */
-public final class TimestampBound {
+public final class TimestampBound implements Serializable {
   private static final TimestampBound STRONG_BOUND = new TimestampBound(Mode.STRONG, null, null);
   private static final TransactionOptions.ReadOnly STRONG_PROTO =
       TransactionOptions.ReadOnly.newBuilder().setStrong(true).build();
+  private static final long serialVersionUID = 9194565742651275731L;
 
   private final Mode mode;
   private final Timestamp timestamp;
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/StatementTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/StatementTest.java
@@ -16,6 +16,7 @@
 
 package com.google.cloud.spanner;
 
+import static com.google.common.testing.SerializableTester.reserializeAndAssert;
 import static com.google.common.truth.Truth.assertThat;
 
 import com.google.common.collect.ImmutableMap;
@@ -38,6 +39,7 @@ public void basic() {
     assertThat(stmt.getSql()).isEqualTo(sql);
     assertThat(stmt.getParameters()).isEmpty();
     assertThat(stmt.toString()).isEqualTo(sql);
+    reserializeAndAssert(stmt);
   }
 
   @Test
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TimestampBoundTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TimestampBoundTest.java
@@ -17,6 +17,7 @@
 package com.google.cloud.spanner;
 
 import static com.google.cloud.spanner.TimestampBound.Mode;
+import static com.google.common.testing.SerializableTester.reserializeAndAssert;
 import static com.google.common.truth.Truth.assertThat;
 
 import com.google.cloud.Timestamp;
@@ -37,6 +38,15 @@ public class TimestampBoundTest {
   private static final String TEST_TIME_ISO = "2015-10-12T15:14:54Z";
   @Rule public ExpectedException expectedException = ExpectedException.none();
 
+  @Test
+  public void serialization() throws Exception {
+    reserializeAndAssert(TimestampBound.strong());
+    reserializeAndAssert(TimestampBound.ofExactStaleness(10, TimeUnit.NANOSECONDS));
+    reserializeAndAssert(TimestampBound.ofMaxStaleness(100, TimeUnit.DAYS));
+    reserializeAndAssert(TimestampBound.ofMinReadTimestamp(Timestamp.now()));
+    reserializeAndAssert(TimestampBound.ofReadTimestamp(Timestamp.now()));
+  }
+
   @Test
   public void strong() {
     TimestampBound bound = TimestampBound.strong();
