cleanup: fix formatting + tests

googleapis · Feb 8, 2021 · 3fd0ad2 · 3fd0ad2
1 parent cdf7ed7
commit 3fd0ad2
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 82 deletions.
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/DatabaseClient.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/DatabaseClient.java
@@ -318,8 +318,8 @@ CommitResponse writeAtLeastOnceWithOptions(
    *
    * <ul>
    *   <li>{@link Options#priority(com.google.cloud.spanner.Options.RpcPriority)}: The {@link
-   *       RpcPriority} to use for the commit request of the transaction. The priority will not
-   *       automatically be applied to any other requests on the transaction.
+   *       RpcPriority} to use for the commit request of the transaction. The priority will not be
+   *       applied to any other requests on the transaction.
    * </ul>
    */
   TransactionRunner readWriteTransaction(TransactionOption... options);
@@ -356,8 +356,8 @@ CommitResponse writeAtLeastOnceWithOptions(
    *
    * <ul>
    *   <li>{@link Options#priority(com.google.cloud.spanner.Options.RpcPriority)}: The {@link
-   *       RpcPriority} to use for the commit request of the transaction. The priority will not
-   *       automatically be applied to any other requests on the transaction.
+   *       RpcPriority} to use for the commit request of the transaction. The priority will not be
+   *       applied to any other requests on the transaction.
    * </ul>
    */
   TransactionManager transactionManager(TransactionOption... options);
@@ -397,8 +397,8 @@ CommitResponse writeAtLeastOnceWithOptions(
    *
    * <ul>
    *   <li>{@link Options#priority(com.google.cloud.spanner.Options.RpcPriority)}: The {@link
-   *       RpcPriority} to use for the commit request of the transaction. The priority will not
-   *       automatically be applied to any other requests on the transaction.
+   *       RpcPriority} to use for the commit request of the transaction. The priority will not be
+   *       applied to any other requests on the transaction.
    * </ul>
    */
   AsyncRunner runAsync(TransactionOption... options);
@@ -493,8 +493,8 @@ CommitResponse writeAtLeastOnceWithOptions(
    *
    * <ul>
    *   <li>{@link Options#priority(com.google.cloud.spanner.Options.RpcPriority)}: The {@link
-   *       RpcPriority} to use for the commit request of the transaction. The priority will not
-   *       automatically be applied to any other requests on the transaction.
+   *       RpcPriority} to use for the commit request of the transaction. The priority will not be
+   *       applied to any other requests on the transaction.
    * </ul>
    */
   AsyncTransactionManager transactionManagerAsync(TransactionOption... options);

diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionImpl.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionImpl.java
@@ -161,7 +161,7 @@ public CommitResponse writeAtLeastOnceWithOptions(
       Iterable<Mutation> mutations, TransactionOption... transactionOptions)
       throws SpannerException {
     setActive(null);
-    Options opts = Options.fromTransactionOptions(transactionOptions);
+    Options commitRequestOptions = Options.fromTransactionOptions(transactionOptions);
     List<com.google.spanner.v1.Mutation> mutationsProto = new ArrayList<>();
     Mutation.toProto(mutations, mutationsProto);
     final CommitRequest.Builder requestBuilder =
@@ -171,9 +171,9 @@ public CommitResponse writeAtLeastOnceWithOptions(
             .setSingleUseTransaction(
                 TransactionOptions.newBuilder()
                     .setReadWrite(TransactionOptions.ReadWrite.getDefaultInstance()));
-    if (opts.hasPriority()) {
+    if (commitRequestOptions.hasPriority()) {
       requestBuilder.setRequestOptions(
-          RequestOptions.newBuilder().setPriority(opts.priority()).build());
+          RequestOptions.newBuilder().setPriority(commitRequestOptions.priority()).build());
     }
     Span span = tracer.spanBuilder(SpannerImpl.COMMIT).startSpan();
     try (Scope s = tracer.withSpan(span)) {

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
@@ -172,22 +172,22 @@ public void tearDown() {
   }
 
   @Test
-  public void write() {
+  public void testWrite() {
     DatabaseClient client =
         spanner.getDatabaseClient(DatabaseId.of(TEST_PROJECT, TEST_INSTANCE, TEST_DATABASE));
     client.write(
         Arrays.asList(
             Mutation.newInsertBuilder("FOO").set("ID").to(1L).set("NAME").to("Bar").build()));
 
-    List<CommitRequest> commits = mockSpanner.getRequestsOfType(CommitRequest.class);
-    assertThat(commits).hasSize(1);
-    CommitRequest commit = commits.get(0);
+    List<CommitRequest> commitRequests = mockSpanner.getRequestsOfType(CommitRequest.class);
+    assertThat(commitRequests).hasSize(1);
+    CommitRequest commit = commitRequests.get(0);
     assertNotNull(commit.getRequestOptions());
     assertEquals(Priority.PRIORITY_UNSPECIFIED, commit.getRequestOptions().getPriority());
   }
 
   @Test
-  public void writewithoptions() {
+  public void testWriteWithOptions() {
     DatabaseClient client =
         spanner.getDatabaseClient(DatabaseId.of(TEST_PROJECT, TEST_INSTANCE, TEST_DATABASE));
     client.writeWithOptions(
@@ -203,34 +203,34 @@ public void writewithoptions() {
   }
 
   @Test
-  public void writeAtLeastOnce() {
+  public void testWriteAtLeastOnce() {
     DatabaseClient client =
         spanner.getDatabaseClient(DatabaseId.of(TEST_PROJECT, TEST_INSTANCE, TEST_DATABASE));
     client.writeAtLeastOnce(
         Arrays.asList(
             Mutation.newInsertBuilder("FOO").set("ID").to(1L).set("NAME").to("Bar").build()));
 
-    List<CommitRequest> commits = mockSpanner.getRequestsOfType(CommitRequest.class);
-    assertThat(commits).hasSize(1);
-    CommitRequest commit = commits.get(0);
+    List<CommitRequest> commitRequests = mockSpanner.getRequestsOfType(CommitRequest.class);
+    assertThat(commitRequests).hasSize(1);
+    CommitRequest commit = commitRequests.get(0);
     assertNotNull(commit.getSingleUseTransaction());
     assertTrue(commit.getSingleUseTransaction().hasReadWrite());
     assertNotNull(commit.getRequestOptions());
     assertEquals(Priority.PRIORITY_UNSPECIFIED, commit.getRequestOptions().getPriority());
   }
 
   @Test
-  public void writeAtLeastOnceWithOptions() {
+  public void testWriteAtLeastOnceWithOptions() {
     DatabaseClient client =
         spanner.getDatabaseClient(DatabaseId.of(TEST_PROJECT, TEST_INSTANCE, TEST_DATABASE));
     client.writeAtLeastOnceWithOptions(
         Arrays.asList(
             Mutation.newInsertBuilder("FOO").set("ID").to(1L).set("NAME").to("Bar").build()),
         Options.priority(RpcPriority.LOW));
 
-    List<CommitRequest> commits = mockSpanner.getRequestsOfType(CommitRequest.class);
-    assertThat(commits).hasSize(1);
-    CommitRequest commit = commits.get(0);
+    List<CommitRequest> commitRequests = mockSpanner.getRequestsOfType(CommitRequest.class);
+    assertThat(commitRequests).hasSize(1);
+    CommitRequest commit = commitRequests.get(0);
     assertNotNull(commit.getSingleUseTransaction());
     assertTrue(commit.getSingleUseTransaction().hasReadWrite());
     assertNotNull(commit.getRequestOptions());

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
@@ -228,48 +228,48 @@ public void queryEquality() {
 
   @Test
   public void testTransactionOptionsPriority() {
-    RpcPriority prio = RpcPriority.HIGH;
-    Options opts = Options.fromTransactionOptions(Options.priority(prio));
-    assertTrue(opts.hasPriority());
-    assertEquals("priority: " + prio + " ", opts.toString());
+    RpcPriority priority = RpcPriority.HIGH;
+    Options options = Options.fromTransactionOptions(Options.priority(priority));
+    assertTrue(options.hasPriority());
+    assertEquals("priority: " + priority + " ", options.toString());
   }
 
   @Test
   public void testQueryOptionsPriority() {
-    RpcPriority prio = RpcPriority.MEDIUM;
-    Options opts = Options.fromQueryOptions(Options.priority(prio));
-    assertTrue(opts.hasPriority());
-    assertEquals("priority: " + prio + " ", opts.toString());
+    RpcPriority priority = RpcPriority.MEDIUM;
+    Options options = Options.fromQueryOptions(Options.priority(priority));
+    assertTrue(options.hasPriority());
+    assertEquals("priority: " + priority + " ", options.toString());
   }
 
   @Test
   public void testReadOptionsPriority() {
-    RpcPriority prio = RpcPriority.LOW;
-    Options opts = Options.fromReadOptions(Options.priority(prio));
-    assertTrue(opts.hasPriority());
-    assertEquals("priority: " + prio + " ", opts.toString());
+    RpcPriority priority = RpcPriority.LOW;
+    Options options = Options.fromReadOptions(Options.priority(priority));
+    assertTrue(options.hasPriority());
+    assertEquals("priority: " + priority + " ", options.toString());
   }
 
   @Test
   public void testUpdateOptionsPriority() {
-    RpcPriority prio = RpcPriority.LOW;
-    Options opts = Options.fromUpdateOptions(Options.priority(prio));
-    assertTrue(opts.hasPriority());
-    assertEquals("priority: " + prio + " ", opts.toString());
+    RpcPriority priority = RpcPriority.LOW;
+    Options options = Options.fromUpdateOptions(Options.priority(priority));
+    assertTrue(options.hasPriority());
+    assertEquals("priority: " + priority + " ", options.toString());
   }
 
   @Test
   public void testTransactionOptionsEquality() {
-    Options o1 = Options.fromTransactionOptions();
-    Options o2 = Options.fromTransactionOptions();
-    assertTrue(o1.equals(o2));
+    Options option1 = Options.fromTransactionOptions();
+    Options option2 = Options.fromTransactionOptions();
+    assertTrue(option1.equals(option2));
   }
 
   @Test
   public void testTransactionOptionsHashCode() {
-    Options o1 = Options.fromTransactionOptions();
-    Options o2 = Options.fromTransactionOptions();
-    assertEquals(o1.hashCode(), o2.hashCode());
+    Options option1 = Options.fromTransactionOptions();
+    Options option2 = Options.fromTransactionOptions();
+    assertEquals(option1.hashCode(), option2.hashCode());
   }
 
   @Test
@@ -300,16 +300,16 @@ public void testTransactionOptionsWithPriorityHashCode() {
 
   @Test
   public void testUpdateOptionsEquality() {
-    Options o1 = Options.fromUpdateOptions();
-    Options o2 = Options.fromUpdateOptions();
-    assertTrue(o1.equals(o2));
+    Options option1 = Options.fromUpdateOptions();
+    Options option2 = Options.fromUpdateOptions();
+    assertTrue(option1.equals(option2));
   }
 
   @Test
   public void testUpdateOptionsHashCode() {
-    Options o1 = Options.fromUpdateOptions();
-    Options o2 = Options.fromUpdateOptions();
-    assertEquals(o1.hashCode(), o2.hashCode());
+    Options option1 = Options.fromUpdateOptions();
+    Options option2 = Options.fromUpdateOptions();
+    assertEquals(option1.hashCode(), option2.hashCode());
   }
 
   @Test
@@ -340,16 +340,16 @@ public void testUpdateOptionsWithPriorityHashCode() {
 
   @Test
   public void testQueryOptionsEquality() {
-    Options o1 = Options.fromQueryOptions();
-    Options o2 = Options.fromQueryOptions();
-    assertTrue(o1.equals(o2));
+    Options option1 = Options.fromQueryOptions();
+    Options option2 = Options.fromQueryOptions();
+    assertTrue(option1.equals(option2));
   }
 
   @Test
   public void testQueryOptionsHashCode() {
-    Options o1 = Options.fromQueryOptions();
-    Options o2 = Options.fromQueryOptions();
-    assertEquals(o1.hashCode(), o2.hashCode());
+    Options option1 = Options.fromQueryOptions();
+    Options option2 = Options.fromQueryOptions();
+    assertEquals(option1.hashCode(), option2.hashCode());
   }
 
   @Test
@@ -385,16 +385,16 @@ public void testQueryOptionsWithPriorityHashCode() {
 
   @Test
   public void testReadOptionsEquality() {
-    Options o1 = Options.fromReadOptions();
-    Options o2 = Options.fromReadOptions();
-    assertTrue(o1.equals(o2));
+    Options option1 = Options.fromReadOptions();
+    Options option2 = Options.fromReadOptions();
+    assertTrue(option1.equals(option2));
   }
 
   @Test
   public void testReadOptionsHashCode() {
-    Options o1 = Options.fromReadOptions();
-    Options o2 = Options.fromReadOptions();
-    assertEquals(o1.hashCode(), o2.hashCode());
+    Options option1 = Options.fromReadOptions();
+    Options option2 = Options.fromReadOptions();
+    assertEquals(option1.hashCode(), option2.hashCode());
   }
 
   @Test
@@ -430,7 +430,7 @@ public void testReadOptionsWithPriorityHashCode() {
 
   @Test
   public void testFromUpdateOptions() {
-    Options opts = Options.fromUpdateOptions();
-    assertThat(opts.toString()).isEqualTo("");
+    Options options = Options.fromUpdateOptions();
+    assertThat(options.toString()).isEqualTo("");
   }
 }
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitResponse.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitResponse.java
@@ -233,19 +233,12 @@ private CommitStats(
 
     public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
       return null;
-//      return com.google.spanner.v1.SpannerProto
-//          .internal_static_google_spanner_v1_CommitResponse_CommitStats_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return null;
-//      return com.google.spanner.v1.SpannerProto
-//          .internal_static_google_spanner_v1_CommitResponse_CommitStats_fieldAccessorTable
-//          .ensureFieldAccessorsInitialized(
-//              com.google.spanner.v1.CommitResponse.CommitStats.class,
-//              com.google.spanner.v1.CommitResponse.CommitStats.Builder.class);
     }
 
     public static final int MUTATION_COUNT_FIELD_NUMBER = 1;
@@ -448,19 +441,12 @@ public static final class Builder
         com.google.spanner.v1.CommitResponse.CommitStatsOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
         return null;
-//        return com.google.spanner.v1.SpannerProto
-//            .internal_static_google_spanner_v1_CommitResponse_CommitStats_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return null;
-//        return com.google.spanner.v1.SpannerProto
-//            .internal_static_google_spanner_v1_CommitResponse_CommitStats_fieldAccessorTable
-//            .ensureFieldAccessorsInitialized(
-//                com.google.spanner.v1.CommitResponse.CommitStats.class,
-//                com.google.spanner.v1.CommitResponse.CommitStats.Builder.class);
       }
 
       // Construct using com.google.spanner.v1.CommitResponse.CommitStats.newBuilder()
@@ -488,8 +474,6 @@ public Builder clear() {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
         return null;
-//        return com.google.spanner.v1.SpannerProto
-//            .internal_static_google_spanner_v1_CommitResponse_CommitStats_descriptor;
       }
 
       @java.lang.Override