address comments

Author: rahul2393

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

@@ -431,12 +431,15 @@ public GapicSpannerRpc(final SpannerOptions options) {
                 && isEnableDirectAccess;
         this.readRetrySettings =
             options.getSpannerStubSettings().streamingReadSettings().getRetrySettings();
+        Set<Code> streamingReadRetryableCodes =
+            options.getSpannerStubSettings().streamingReadSettings().getRetryableCodes();
         this.readRetryableCodes =
-            ImmutableSet.<Code>builder()
-                .addAll(
-                    options.getSpannerStubSettings().streamingReadSettings().getRetryableCodes())
-                .add(Code.RESOURCE_EXHAUSTED)
-                .build();
+            enableLocationApi
+                ? ImmutableSet.<Code>builder()
+                    .addAll(streamingReadRetryableCodes)
+                    .add(Code.RESOURCE_EXHAUSTED)
+                    .build()
+                : streamingReadRetryableCodes;
         this.executeQueryRetrySettings =
             options.getSpannerStubSettings().executeStreamingSqlSettings().getRetrySettings();
         this.executeQueryRetryableCodes =

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

@@ -34,6 +34,7 @@
 import com.google.api.gax.rpc.ApiCallContext;
 import com.google.api.gax.rpc.ApiClientHeaderProvider;
 import com.google.api.gax.rpc.HeaderProvider;
+import com.google.api.gax.rpc.StatusCode.Code;
 import com.google.api.gax.rpc.TransportChannelProvider;
 import com.google.auth.Credentials;
 import com.google.auth.oauth2.AccessToken;
@@ -1059,6 +1060,53 @@ public boolean isEnableLocationApi() {
     }
   }
 
+  @Test
+  public void testReadRetryableCodesIncludeResourceExhaustedWhenLocationApiEnabled() {
+    try {
+      SpannerOptions.useEnvironment(
+          new SpannerOptions.SpannerEnvironment() {
+            @Override
+            public boolean isEnableLocationApi() {
+              return true;
+            }
+          });
+      GapicSpannerRpc rpc = new GapicSpannerRpc(createSpannerOptions(), true);
+      try {
+        assertThat(rpc.getReadRetryableCodes()).contains(Code.RESOURCE_EXHAUSTED);
+      } finally {
+        rpc.shutdown();
+      }
+    } finally {
+      SpannerOptions.useDefaultEnvironment();
+    }
+  }
+
+  @Test
+  public void testReadRetryableCodesDoNotAddResourceExhaustedWhenLocationApiDisabled() {
+    try {
+      SpannerOptions.useEnvironment(
+          new SpannerOptions.SpannerEnvironment() {
+            @Override
+            public boolean isEnableLocationApi() {
+              return false;
+            }
+          });
+      GapicSpannerRpc rpc = new GapicSpannerRpc(createSpannerOptions(), true);
+      try {
+        assertThat(rpc.getReadRetryableCodes())
+            .isEqualTo(
+                createSpannerOptions()
+                    .getSpannerStubSettings()
+                    .streamingReadSettings()
+                    .getRetryableCodes());
+      } finally {
+        rpc.shutdown();
+      }
+    } finally {
+      SpannerOptions.useDefaultEnvironment();
+    }
+  }
+
   @Test
   public void testGrpcGcpExtensionPreservesChannelConfigurator() throws Exception {
     InstantiatingGrpcChannelProvider.Builder channelProviderBuilder =