refactored clearChannelHintAffinity

Author: rahul2393

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

@@ -620,22 +620,7 @@ public void clearTransactionAndChannelAffinity(
       return;
     }
     clearTransactionAffinity(transactionId);
-    clearChannelHintAffinity(grpcGcpChannel, channelHint);
-  }
-
-  @VisibleForTesting
-  static void clearChannelHintAffinity(
-      @Nullable ManagedChannel channel, @Nullable Long channelHint) {
-    if (!(channel instanceof GcpManagedChannel) || channelHint == null) {
-      return;
-    }
-    ClientCall<ExecuteSqlRequest, ResultSet> call =
-        channel.newCall(
-            SpannerGrpc.getExecuteSqlMethod(),
-            CallOptions.DEFAULT
-                .withOption(GcpManagedChannel.AFFINITY_KEY, String.valueOf(channelHint))
-                .withOption(GcpManagedChannel.UNBIND_AFFINITY_KEY, true));
-    call.cancel("Cloud Spanner transaction closed", null);
+    GrpcGcpAffinityUtil.clearChannelHintAffinity(grpcGcpChannel, channelHint);
   }
 
   private static String parseGrpcGcpApiConfig() {

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

@@ -0,0 +1,44 @@
+/*
+ * Copyright 2026 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.cloud.spanner.spi.v1;
+
+import com.google.cloud.grpc.GcpManagedChannel;
+import com.google.spanner.v1.ExecuteSqlRequest;
+import com.google.spanner.v1.ResultSet;
+import com.google.spanner.v1.SpannerGrpc;
+import io.grpc.CallOptions;
+import io.grpc.ClientCall;
+import io.grpc.ManagedChannel;
+import javax.annotation.Nullable;
+
+final class GrpcGcpAffinityUtil {
+  private GrpcGcpAffinityUtil() {}
+
+  static void clearChannelHintAffinity(
+      @Nullable ManagedChannel channel, @Nullable Long channelHint) {
+    if (!(channel instanceof GcpManagedChannel) || channelHint == null) {
+      return;
+    }
+    ClientCall<ExecuteSqlRequest, ResultSet> call =
+        channel.newCall(
+            SpannerGrpc.getExecuteSqlMethod(),
+            CallOptions.DEFAULT
+                .withOption(GcpManagedChannel.AFFINITY_KEY, String.valueOf(channelHint))
+                .withOption(GcpManagedChannel.UNBIND_AFFINITY_KEY, true));
+    call.cancel("Cloud Spanner transaction closed", null);
+  }
+}

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

@@ -20,7 +20,6 @@
 
 import com.google.api.core.InternalApi;
 import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
-import com.google.cloud.grpc.GcpManagedChannel;
 import com.google.cloud.spanner.XGoogSpannerRequestId;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
@@ -33,7 +32,6 @@
 import com.google.spanner.v1.ReadRequest;
 import com.google.spanner.v1.ResultSet;
 import com.google.spanner.v1.RollbackRequest;
-import com.google.spanner.v1.SpannerGrpc;
 import com.google.spanner.v1.Transaction;
 import com.google.spanner.v1.TransactionSelector;
 import io.grpc.CallOptions;
@@ -316,24 +314,11 @@ void clearTransactionAndChannelAffinity(ByteString transactionId, @Nullable Long
           channel = endpoint.getChannel();
         }
       }
-      clearChannelHintAffinity(channel, channelHint);
+      GrpcGcpAffinityUtil.clearChannelHintAffinity(channel, channelHint);
     }
     clearAffinity(transactionId);
   }
 
-  private static void clearChannelHintAffinity(ManagedChannel channel, long channelHint) {
-    if (!(channel instanceof GcpManagedChannel)) {
-      return;
-    }
-    ClientCall<ExecuteSqlRequest, ResultSet> call =
-        channel.newCall(
-            SpannerGrpc.getExecuteSqlMethod(),
-            CallOptions.DEFAULT
-                .withOption(GcpManagedChannel.AFFINITY_KEY, String.valueOf(channelHint))
-                .withOption(GcpManagedChannel.UNBIND_AFFINITY_KEY, true));
-    call.cancel("Cloud Spanner transaction closed", null);
-  }
-
   private void maybeExcludeEndpointOnNextCall(
       @Nullable ChannelEndpoint endpoint, @Nullable String logicalRequestKey) {
     if (endpoint == null || logicalRequestKey == null) {

java-spanner/google-cloud-spanner/src/test/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpcTest.java

@@ -518,7 +518,7 @@ public void testClearChannelHintAffinityCancelsSyntheticGrpcGcpCall() {
                 Mockito.eq(SpannerGrpc.getExecuteSqlMethod()), callOptionsCaptor.capture()))
         .thenReturn(call);
 
-    GapicSpannerRpc.clearChannelHintAffinity(channel, 7L);
+    GrpcGcpAffinityUtil.clearChannelHintAffinity(channel, 7L);
 
     assertEquals("7", callOptionsCaptor.getValue().getOption(GcpManagedChannel.AFFINITY_KEY));
     assertEquals(