From ef50e69a743a9a6563a98f6000f22afcd7f3dda3 Mon Sep 17 00:00:00 2001
From: Hanzhen Yi <hzyi@google.com>
Date: Mon, 16 Apr 2018 16:26:13 -0700
Subject: [PATCH] Documentation and format

---
 .../com/google/cloud/spanner/SpannerImpl.java | 35 ++++++++++++-------
 .../spanner/ServerStreamingStashCallable.java |  5 ++-
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerImpl.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerImpl.java
index be04e796b9d1..5883dcb3ca6f 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerImpl.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerImpl.java
@@ -1056,13 +1056,15 @@ ResultSet executeQueryInternalWithOptions(
           new ResumableStreamIterator(MAX_BUFFERED_CHUNKS, QUERY) {
             @Override
             CloseableIterator<PartialResultSet> startStream(@Nullable ByteString resumeToken) {
-              return new CloseableServerStreamIterator<PartialResultSet>(rpc.executeQuery(
-                  resumeToken == null
-                      ? request
-                      : request.toBuilder().setResumeToken(resumeToken).build(),
-                  null,
-                  session.options));
-
+              return new CloseableServerStreamIterator<PartialResultSet>(
+                  rpc.executeQuery(
+                      resumeToken == null
+                          ? request
+                          : request.toBuilder().setResumeToken(resumeToken).build(),
+                      null,
+                      session.options));
+
+              // TODO(hzyi): make resume work
               // Let resume fail for now. Gapic has its own resume, but in order not 
               // to introduce too much change at a time, we decide to plumb up
               // ServerStream first and then figure out how to make resume work
@@ -1165,13 +1167,15 @@ ResultSet readInternalWithOptions(
           new ResumableStreamIterator(MAX_BUFFERED_CHUNKS, READ) {
             @Override
             CloseableIterator<PartialResultSet> startStream(@Nullable ByteString resumeToken) {
-              return new CloseableServerStreamIterator<PartialResultSet>(rpc.read(
-                resumeToken == null
-                    ? request
-                    : request.toBuilder().setResumeToken(resumeToken).build(),
-                null,
-                session.options));
+              return new CloseableServerStreamIterator<PartialResultSet>(
+                  rpc.read(
+                      resumeToken == null
+                          ? request
+                          : request.toBuilder().setResumeToken(resumeToken).build(),
+                      null,
+                      session.options));
               
+              // TODO(hzyi): make resume work
               // Let resume fail for now. Gapic has its own resume, but in order not 
               // to introduce too much change at a time, we decide to plumb up
               // ServerStream first and then figure out how to make resume work
@@ -2310,6 +2314,11 @@ public T next() {
       }
     }
 
+    @Override
+    public void remove() {
+      throw new UnsupportedOperationException("Not supported: remove.");
+    }
+
     @Override
     public void close(@Nullable String message) {
       try {
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ServerStreamingStashCallable.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ServerStreamingStashCallable.java
index 026d10f95cf0..da46231eea50 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ServerStreamingStashCallable.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ServerStreamingStashCallable.java
@@ -18,7 +18,6 @@
 
 import com.google.api.gax.rpc.ApiCallContext;
 import com.google.api.gax.rpc.ResponseObserver;
-import com.google.api.gax.rpc.ServerStream;
 import com.google.api.gax.rpc.ServerStreamingCallable;
 import com.google.api.gax.rpc.StreamController;
 import com.google.common.base.Preconditions;
@@ -28,6 +27,10 @@
 import java.util.Queue;
 import java.util.concurrent.CancellationException;
 
+/**
+ * TODO(hzyi): convert this class into a general utility class
+ * This class is copied from gax and is used for testing ServerStream only.
+ */
 public class ServerStreamingStashCallable<RequestT, ResponseT>
       extends ServerStreamingCallable<RequestT, ResponseT> {
   private List<ResponseT> responseList;