chore: fix failing test cases

Author: olavloite

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

@@ -2034,11 +2034,12 @@ <ReqT, RespT> GrpcCallContext newCallContext(
       MethodDescriptor<ReqT, RespT> method,
       boolean routeToLeader) {
     GrpcCallContext context = this.baseGrpcCallContext;
-    if (options != null) {
+    Long affinity = options == null ? null : Option.CHANNEL_HINT.getLong(options);
+    if (affinity != null) {
       if (this.isGrpcGcpExtensionEnabled) {
         // Set channel affinity in gRPC-GCP.
         // Compute bounded channel hint to prevent gRPC-GCP affinity map from getting unbounded.
-        int boundedChannelHint = Option.CHANNEL_HINT.getLong(options).intValue() % this.numChannels;
+        int boundedChannelHint = affinity.intValue() % this.numChannels;
         context =
             context.withCallOptions(
                 context
@@ -2047,11 +2048,10 @@ <ReqT, RespT> GrpcCallContext newCallContext(
                         GcpManagedChannel.AFFINITY_KEY, String.valueOf(boundedChannelHint)));
       } else {
         // Set channel affinity in GAX.
-        Long affinity = Option.CHANNEL_HINT.getLong(options);
-        if (affinity != null) {
-          context = context.withChannelAffinity(affinity.intValue());
-        }
+        context = context.withChannelAffinity(affinity.intValue());
       }
+    }
+    if (options != null) {
       context = withRequestId(context, options);
     }
     context = context.withExtraHeaders(metadataProvider.newExtraHeaders(resource, projectName));

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

@@ -241,7 +241,7 @@ public void usesPreparedTransaction() {
             Mockito.anyString(),
             Mockito.anyString(),
             Mockito.anyMap(),
-            Mockito.eq(null),
+            Mockito.anyMap(),
             Mockito.eq(true)))
         .thenAnswer(
             invocation ->
@@ -324,7 +324,7 @@ public void inlineBegin() {
             Mockito.anyString(),
             Mockito.anyString(),
             Mockito.anyMap(),
-            Mockito.eq(null),
+            Mockito.anyMap(),
             Mockito.eq(true)))
         .thenAnswer(
             invocation ->

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

@@ -193,7 +193,7 @@ public void usesPreparedTransaction() {
             Mockito.anyString(),
             Mockito.anyString(),
             Mockito.anyMap(),
-            Mockito.eq(null),
+            Mockito.anyMap(),
             Mockito.eq(true)))
         .thenAnswer(
             invocation ->