chore: merge and cleanup

googleapis · Mar 23, 2021 · 35f26ef · 35f26ef
1 parent f3f7e9a
commit 35f26ef
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 71 deletions.
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractReadContext.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractReadContext.java
@@ -640,8 +640,6 @@ ResultSet executeQueryInternalWithOptions(
           @Override
           CloseableIterator<PartialResultSet> startStream(@Nullable ByteString resumeToken) {
             GrpcStreamIterator stream = new GrpcStreamIterator(statement, prefetchChunks);
-            final ExecuteSqlRequest.Builder request =
-                getExecuteSqlRequestBuilder(statement, queryMode, options);
             if (partitionToken != null) {
               request.setPartitionToken(partitionToken);
             }

diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Options.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Options.java
@@ -176,7 +176,7 @@ void appendToOptions(Options options) {
       options.bufferRows = bufferRows;
     }
   }
-  
+
   static final class PriorityOption extends InternalOption
       implements ReadQueryUpdateTransactionOption {
     private final RpcPriority priority;

diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/BaseSessionPoolTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/BaseSessionPoolTest.java
@@ -68,11 +68,9 @@ SessionImpl mockSession() {
     when(session.writeWithOptions(any(Iterable.class)))
         .thenReturn(new CommitResponse(com.google.spanner.v1.CommitResponse.getDefaultInstance()));
     when(session.writeAtLeastOnceWithOptions(any(Iterable.class)))
-        .thenReturn(
-            CommitResponse.fromProto(com.google.spanner.v1.CommitResponse.getDefaultInstance()));
+        .thenReturn(new CommitResponse(com.google.spanner.v1.CommitResponse.getDefaultInstance()));
     when(session.writeAtLeastOnceWithOptions(any(Iterable.class)))
-        .thenReturn(
-            CommitResponse.fromProto(com.google.spanner.v1.CommitResponse.getDefaultInstance()));
+        .thenReturn(new CommitResponse(com.google.spanner.v1.CommitResponse.getDefaultInstance()));
     sessionIndex++;
     return session;
   }

diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java
@@ -46,8 +46,8 @@
 import com.google.cloud.spanner.AsyncTransactionManager.TransactionContextFuture;
 import com.google.cloud.spanner.MockSpannerServiceImpl.SimulatedExecutionTime;
 import com.google.cloud.spanner.MockSpannerServiceImpl.StatementResult;
-import com.google.cloud.spanner.Options.TransactionOption;
 import com.google.cloud.spanner.Options.RpcPriority;
+import com.google.cloud.spanner.Options.TransactionOption;
 import com.google.cloud.spanner.ReadContext.QueryAnalyzeMode;
 import com.google.cloud.spanner.SessionPool.PooledSessionFuture;
 import com.google.cloud.spanner.SpannerOptions.SpannerCallContextTimeoutConfigurator;
@@ -1704,7 +1704,7 @@ public void testTransactionManagerAsync_usesOptions() {
 
     verify(session).transactionManagerAsync(option);
   }
-  
+
   @Test
   public void testExecuteQueryWithPriority() {
     DatabaseClient client =
@@ -1938,56 +1938,4 @@ public ApiFuture<Void> apply(TransactionContext txn, Void input)
     assertNotNull(request.getRequestOptions());
     assertEquals(Priority.PRIORITY_HIGH, request.getRequestOptions().getPriority());
   }
-
-  @Test
-  public void testReadWriteTransaction_usesOptions() {
-    SessionPool pool = mock(SessionPool.class);
-    PooledSessionFuture session = mock(PooledSessionFuture.class);
-    when(pool.getSession()).thenReturn(session);
-    TransactionOption option = mock(TransactionOption.class);
-
-    DatabaseClientImpl client = new DatabaseClientImpl(pool);
-    client.readWriteTransaction(option);
-
-    verify(session).readWriteTransaction(option);
-  }
-
-  @Test
-  public void testTransactionManager_usesOptions() {
-    SessionPool pool = mock(SessionPool.class);
-    PooledSessionFuture session = mock(PooledSessionFuture.class);
-    when(pool.getSession()).thenReturn(session);
-    TransactionOption option = mock(TransactionOption.class);
-
-    DatabaseClientImpl client = new DatabaseClientImpl(pool);
-    client.transactionManager(option);
-
-    verify(session).transactionManager(option);
-  }
-
-  @Test
-  public void testRunAsync_usesOptions() {
-    SessionPool pool = mock(SessionPool.class);
-    PooledSessionFuture session = mock(PooledSessionFuture.class);
-    when(pool.getSession()).thenReturn(session);
-    TransactionOption option = mock(TransactionOption.class);
-
-    DatabaseClientImpl client = new DatabaseClientImpl(pool);
-    client.runAsync(option);
-
-    verify(session).runAsync(option);
-  }
-
-  @Test
-  public void testTransactionManagerAsync_usesOptions() {
-    SessionPool pool = mock(SessionPool.class);
-    PooledSessionFuture session = mock(PooledSessionFuture.class);
-    when(pool.getSession()).thenReturn(session);
-    TransactionOption option = mock(TransactionOption.class);
-
-    DatabaseClientImpl client = new DatabaseClientImpl(pool);
-    client.transactionManagerAsync(option);
-
-    verify(session).transactionManagerAsync(option);
-  }
 }
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OptionsTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OptionsTest.java
@@ -25,6 +25,7 @@
 import static org.junit.Assert.fail;
 
 import com.google.cloud.spanner.Options.RpcPriority;
+import com.google.spanner.v1.RequestOptions.Priority;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -279,7 +280,7 @@ public void testTransactionOptions_withCommitStatsAndOtherOptionHashCode() {
     Options option2 = Options.fromQueryOptions(Options.prefetchChunks(10));
     assertNotEquals(option2.hashCode(), option1.hashCode());
   }
-  
+
   @Test
   public void testTransactionOptionsPriority() {
     RpcPriority priority = RpcPriority.HIGH;
@@ -312,13 +313,6 @@ public void testUpdateOptionsPriority() {
     assertEquals("priority: " + priority + " ", options.toString());
   }
 
-  @Test
-  public void testTransactionOptionsEquality() {
-    Options option1 = Options.fromTransactionOptions();
-    Options option2 = Options.fromTransactionOptions();
-    assertTrue(option1.equals(option2));
-  }
-
   @Test
   public void testTransactionOptionsHashCode() {
     Options option1 = Options.fromTransactionOptions();
@@ -487,13 +481,13 @@ public void testFromUpdateOptions() {
     Options options = Options.fromUpdateOptions();
     assertThat(options.toString()).isEqualTo("");
   }
-  
+
   @Test
   public void testTransactionOptions() {
     RpcPriority prio = RpcPriority.HIGH;
     Options opts = Options.fromTransactionOptions(Options.priority(prio));
     assertThat(opts.toString()).isEqualTo("priority: " + prio + " ");
-    assertThat(opts.priority()).isEqualTo(prio.toProto());
+    assertThat(opts.priority()).isEqualTo(Priority.PRIORITY_HIGH);
   }
 
   @Test