chore: Use Java Auth's GDU constant (#2340)

Author: lqiu96

gax-java/gax/src/main/java/com/google/api/gax/rpc/EndpointContext.java

@@ -31,6 +31,7 @@
 
 import com.google.api.core.InternalApi;
 import com.google.api.gax.rpc.mtls.MtlsProvider;
+import com.google.auth.Credentials;
 import com.google.auto.value.AutoValue;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Strings;
@@ -41,7 +42,6 @@
 @InternalApi
 @AutoValue
 public abstract class EndpointContext {
-  static final String GOOGLE_DEFAULT_UNIVERSE = "googleapis.com";
 
   /**
    * ServiceName is host URI for Google Cloud Services. It follows the format of
@@ -162,14 +162,14 @@ private String determineUniverseDomain() {
           throw new IllegalArgumentException(
               "Universe domain configuration is incompatible with GDC-H");
         }
-        return GOOGLE_DEFAULT_UNIVERSE;
+        return Credentials.GOOGLE_DEFAULT_UNIVERSE;
       }
       // Check for "" (empty string)
       if (universeDomain() != null && universeDomain().isEmpty()) {
         throw new IllegalArgumentException("The universe domain value cannot be empty.");
       }
       // Override with user set universe domain if provided
-      return universeDomain() != null ? universeDomain() : GOOGLE_DEFAULT_UNIVERSE;
+      return universeDomain() != null ? universeDomain() : Credentials.GOOGLE_DEFAULT_UNIVERSE;
     }
 
     /** Determines the fully resolved endpoint and universe domain values */
@@ -200,7 +200,7 @@ private String determineEndpoint() throws IOException {
 
       // Check if mTLS is configured with non-GDU
       if (endpoint.equals(mtlsEndpoint())
-          && !resolvedUniverseDomain().equals(GOOGLE_DEFAULT_UNIVERSE)) {
+          && !resolvedUniverseDomain().equals(Credentials.GOOGLE_DEFAULT_UNIVERSE)) {
         throw new IllegalArgumentException(
             "mTLS is not supported in any universe other than googleapis.com");
       }

gax-java/gax/src/test/java/com/google/api/gax/rpc/EndpointContextTest.java

@@ -33,6 +33,7 @@
 
 import com.google.api.gax.rpc.mtls.MtlsProvider;
 import com.google.api.gax.rpc.testing.FakeMtlsProvider;
+import com.google.auth.Credentials;
 import com.google.common.truth.Truth;
 import java.io.IOException;
 import org.junit.Before;
@@ -51,7 +52,7 @@ public void setUp() throws IOException {
     defaultEndpointContextBuilder =
         EndpointContext.newBuilder()
             .setServiceName("test")
-            .setUniverseDomain(EndpointContext.GOOGLE_DEFAULT_UNIVERSE)
+            .setUniverseDomain(Credentials.GOOGLE_DEFAULT_UNIVERSE)
             .setClientSettingsEndpoint(DEFAULT_ENDPOINT)
             .setMtlsEndpoint(DEFAULT_MTLS_ENDPOINT);
   }
@@ -177,7 +178,7 @@ public void endpointContextBuild_noUniverseDomain_usesClientSettingsEndpoint()
         defaultEndpointContextBuilder.setClientSettingsEndpoint(DEFAULT_ENDPOINT).build();
     Truth.assertThat(endpointContext.resolvedEndpoint()).isEqualTo(DEFAULT_ENDPOINT);
     Truth.assertThat(endpointContext.resolvedUniverseDomain())
-        .isEqualTo(EndpointContext.GOOGLE_DEFAULT_UNIVERSE);
+        .isEqualTo(Credentials.GOOGLE_DEFAULT_UNIVERSE);
   }
 
   @Test
@@ -192,7 +193,7 @@ public void endpointContextBuild_noUniverseDomain_usesTransportChannelProviderEn
     Truth.assertThat(endpointContext.resolvedEndpoint())
         .isEqualTo(transportChannelProviderEndpoint);
     Truth.assertThat(endpointContext.resolvedUniverseDomain())
-        .isEqualTo(EndpointContext.GOOGLE_DEFAULT_UNIVERSE);
+        .isEqualTo(Credentials.GOOGLE_DEFAULT_UNIVERSE);
   }
 
   @Test
@@ -207,7 +208,7 @@ public void endpointContextBuild_noUniverseDomain_overrideUsesTransportChannelPr
     Truth.assertThat(endpointContext.resolvedEndpoint())
         .isEqualTo(transportChannelProviderEndpoint);
     Truth.assertThat(endpointContext.resolvedUniverseDomain())
-        .isEqualTo(EndpointContext.GOOGLE_DEFAULT_UNIVERSE);
+        .isEqualTo(Credentials.GOOGLE_DEFAULT_UNIVERSE);
   }
 
   @Test
@@ -225,7 +226,7 @@ public void endpointContextBuild_GDUUniverseDomain() throws IOException {
     EndpointContext endpointContext = defaultEndpointContextBuilder.build();
     Truth.assertThat(endpointContext.resolvedEndpoint()).isEqualTo(DEFAULT_ENDPOINT);
     Truth.assertThat(endpointContext.resolvedUniverseDomain())
-        .isEqualTo(EndpointContext.GOOGLE_DEFAULT_UNIVERSE);
+        .isEqualTo(Credentials.GOOGLE_DEFAULT_UNIVERSE);
   }
 
   @Test
@@ -248,7 +249,7 @@ public void endpointContextBuild_noUniverseDomain_noEndpoints() throws IOExcepti
             .build();
     Truth.assertThat(endpointContext.resolvedEndpoint()).isEqualTo(expectedEndpoint);
     Truth.assertThat(endpointContext.resolvedUniverseDomain())
-        .isEqualTo(EndpointContext.GOOGLE_DEFAULT_UNIVERSE);
+        .isEqualTo(Credentials.GOOGLE_DEFAULT_UNIVERSE);
   }
 
   @Test
@@ -269,7 +270,7 @@ public void endpointContextBuild_mtlsConfigured_GDU() throws IOException {
             .build();
     Truth.assertThat(endpointContext.resolvedEndpoint()).isEqualTo(DEFAULT_MTLS_ENDPOINT);
     Truth.assertThat(endpointContext.resolvedUniverseDomain())
-        .isEqualTo(EndpointContext.GOOGLE_DEFAULT_UNIVERSE);
+        .isEqualTo(Credentials.GOOGLE_DEFAULT_UNIVERSE);
   }
 
   @Test
@@ -315,7 +316,7 @@ public void endpointContextBuild_gdchFlow_noUniverseDomain_noCustomEndpoint() th
             .build();
     Truth.assertThat(endpointContext.resolvedEndpoint()).isEqualTo(DEFAULT_ENDPOINT);
     Truth.assertThat(endpointContext.resolvedUniverseDomain())
-        .isEqualTo(EndpointContext.GOOGLE_DEFAULT_UNIVERSE);
+        .isEqualTo(Credentials.GOOGLE_DEFAULT_UNIVERSE);
   }
 
   @Test
@@ -329,6 +330,6 @@ public void endpointContextBuild_gdchFlow_noUniverseDomain_customEndpoint() thro
             .build();
     Truth.assertThat(endpointContext.resolvedEndpoint()).isEqualTo(clientSettingsEndpoint);
     Truth.assertThat(endpointContext.resolvedUniverseDomain())
-        .isEqualTo(EndpointContext.GOOGLE_DEFAULT_UNIVERSE);
+        .isEqualTo(Credentials.GOOGLE_DEFAULT_UNIVERSE);
   }
 }