More code review updates

Author: odeke-em

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

@@ -22,9 +22,7 @@
 import io.grpc.Metadata;
 import java.math.BigInteger;
 import java.security.SecureRandom;
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.regex.MatchResult;
@@ -108,7 +106,8 @@ public String toString() {
         this.attempt);
   }
 
-  private boolean isGreaterThan(XGoogSpannerRequestId other) {
+  @VisibleForTesting
+  boolean isGreaterThan(XGoogSpannerRequestId other) {
     return this.nthClientId > other.nthClientId
         && this.nthChannelId > other.nthChannelId
         && this.nthRequest > other.nthRequest
@@ -160,26 +159,4 @@ public XGoogSpannerRequestId nextRequestId(long channelId, int attempt) {
       return XGoogSpannerRequestId.of(1, 1, 1, 0);
     }
   }
-
-  static void assertMonotonicityOfIds(String prefix, List<XGoogSpannerRequestId> reqIds) {
-    int size = reqIds.size();
-
-    List<String> violations = new ArrayList<>();
-    for (int i = 1; i < size; i++) {
-      XGoogSpannerRequestId prev = reqIds.get(i - 1);
-      XGoogSpannerRequestId curr = reqIds.get(i);
-      if (prev.isGreaterThan(curr)) {
-        violations.add(String.format("#%d(%s) > #%d(%s)", i - 1, prev, i, curr));
-      }
-    }
-
-    if (violations.isEmpty()) {
-      return;
-    }
-
-    throw new IllegalStateException(
-        prefix
-            + " monotonicity violation:"
-            + String.join("\n\t", violations.toArray(new String[0])));
-  }
 }

google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java

@@ -2054,7 +2054,7 @@ <ReqT, RespT> GrpcCallContext newCallContext(
       }
       if (method != null) {
         String methodName = method.getFullMethodName();
-        context = withRequestId(context, options, methodName);
+        context = withRequestId(context, options);
       }
     }
     context = context.withExtraHeaders(metadataProvider.newExtraHeaders(resource, projectName));
@@ -2076,8 +2076,7 @@ <ReqT, RespT> GrpcCallContext newCallContext(
     return (GrpcCallContext) context.merge(apiCallContextFromContext);
   }
 
-  GrpcCallContext withRequestId(
-      GrpcCallContext context, Map<SpannerRpc.Option, ?> options, String methodName) {
+  GrpcCallContext withRequestId(GrpcCallContext context, Map<SpannerRpc.Option, ?> options) {
     XGoogSpannerRequestId reqId = (XGoogSpannerRequestId) options.get(Option.REQUEST_ID);
     if (reqId == null) {
       return context;

google-cloud-spanner/src/test/java/com/google/cloud/spanner/XGoogSpannerRequestIdTest.java

@@ -127,14 +127,36 @@ public String[] accumulatedValues() {
     public void assertIntegrity() {
       this.unaryResults.forEach(
           (String method, CopyOnWriteArrayList<XGoogSpannerRequestId> values) -> {
-            XGoogSpannerRequestId.assertMonotonicityOfIds(method, values);
+            assertMonotonicityOfIds(method, values);
           });
       this.streamingResults.forEach(
           (String method, CopyOnWriteArrayList<XGoogSpannerRequestId> values) -> {
-            XGoogSpannerRequestId.assertMonotonicityOfIds(method, values);
+            assertMonotonicityOfIds(method, values);
           });
     }
 
+    private void assertMonotonicityOfIds(String prefix, List<XGoogSpannerRequestId> reqIds) {
+      int size = reqIds.size();
+
+      List<String> violations = new ArrayList<>();
+      for (int i = 1; i < size; i++) {
+        XGoogSpannerRequestId prev = reqIds.get(i - 1);
+        XGoogSpannerRequestId curr = reqIds.get(i);
+        if (prev.isGreaterThan(curr)) {
+          violations.add(String.format("#%d(%s) > #%d(%s)", i - 1, prev, i, curr));
+        }
+      }
+
+      if (violations.isEmpty()) {
+        return;
+      }
+
+      throw new IllegalStateException(
+          prefix
+              + " monotonicity violation:"
+              + String.join("\n\t", violations.toArray(new String[0])));
+    }
+
     public static class methodAndRequestId {
       String method;
       String requestId;