Skip to content

Commit 6b4faac

Browse files
Addressed comments
1 parent fd061e1 commit 6b4faac

File tree

6 files changed

+15
-4
lines changed

6 files changed

+15
-4
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,7 @@ public ResultSetMetadata getMetadata() {
615615
return delegateResultSet.get().getMetadata();
616616
}
617617

618-
public boolean initiateStreaming(StreamMessageListener streamMessageListener) {
618+
boolean initiateStreaming(StreamMessageListener streamMessageListener) {
619619
return StreamingUtil.initiateStreaming(delegateResultSet.get(), streamMessageListener);
620620
}
621621

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

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package com.google.cloud.spanner;
1818

19+
import com.google.api.core.InternalApi;
1920
import com.google.common.base.Preconditions;
2021
import com.google.common.base.Supplier;
2122
import com.google.common.base.Suppliers;
@@ -105,6 +106,7 @@ public ResultSetMetadata getMetadata() {
105106
}
106107

107108
@Override
109+
@InternalApi
108110
public boolean initiateStreaming(AsyncResultSet.StreamMessageListener streamMessageListener) {
109111
return StreamingUtil.initiateStreaming(delegate.get(), streamMessageListener);
110112
}

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

+2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import static com.google.cloud.spanner.SpannerExceptionFactory.newSpannerException;
2020
import static com.google.common.base.Preconditions.checkState;
2121

22+
import com.google.api.core.InternalApi;
2223
import com.google.common.annotations.VisibleForTesting;
2324
import com.google.protobuf.Value;
2425
import com.google.spanner.v1.PartialResultSet;
@@ -125,6 +126,7 @@ public ResultSetMetadata getMetadata() {
125126
}
126127

127128
@Override
129+
@InternalApi
128130
public boolean initiateStreaming(AsyncResultSet.StreamMessageListener streamMessageListener) {
129131
return iterator.initiateStreaming(streamMessageListener);
130132
}

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import com.google.cloud.spanner.AbstractResultSet.CloseableIterator;
2121
import com.google.cloud.spanner.spi.v1.SpannerRpc;
2222
import com.google.common.annotations.VisibleForTesting;
23+
import com.google.common.base.Preconditions;
2324
import com.google.common.collect.AbstractIterator;
2425
import com.google.common.util.concurrent.Uninterruptibles;
2526
import com.google.spanner.v1.PartialResultSet;
@@ -68,8 +69,8 @@ protected final SpannerRpc.ResultStreamConsumer consumer() {
6869
return consumer;
6970
}
7071

71-
public void registerListener(AsyncResultSet.StreamMessageListener streamMessageListener) {
72-
this.streamMessageListener = streamMessageListener;
72+
void registerListener(AsyncResultSet.StreamMessageListener streamMessageListener) {
73+
this.streamMessageListener = Preconditions.checkNotNull(streamMessageListener);
7374
}
7475

7576
public void setCall(SpannerRpc.StreamingCall call, boolean withBeginTransaction) {

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

+3
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,15 @@
1616

1717
package com.google.cloud.spanner;
1818

19+
import com.google.api.core.InternalApi;
20+
1921
/** Streaming implementation of ResultSet that supports streaming of chunks */
2022
interface StreamingResultSet extends ResultSet {
2123

2224
/**
2325
* Returns the {@link boolean} for this {@link ResultSet}. This method will be used by
2426
* AsyncResultSet to initiate gRPC streaming
2527
*/
28+
@InternalApi
2629
boolean initiateStreaming(AsyncResultSet.StreamMessageListener streamMessageListener);
2730
}

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

+4-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@
1616

1717
package com.google.cloud.spanner;
1818

19-
class StreamingUtil {
19+
final class StreamingUtil {
20+
21+
private StreamingUtil() {}
22+
2023
static boolean initiateStreaming(
2124
ResultSet resultSet, AsyncResultSet.StreamMessageListener streamMessageListener) {
2225
if (resultSet instanceof StreamingResultSet) {

0 commit comments

Comments
 (0)