move code into override

googleapis · Apr 11, 2024 · b7cc2fe · b7cc2fe
1 parent f5766a3
commit b7cc2fe
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 52 deletions.
diff --git a/oauth2_http/java/com/google/auth/oauth2/ExternalAccountCredentials.java b/oauth2_http/java/com/google/auth/oauth2/ExternalAccountCredentials.java
@@ -237,14 +237,7 @@ protected ExternalAccountCredentials(ExternalAccountCredentials.Builder builder)
     this.clientSecret = builder.clientSecret;
 
     if (builder.tokenUrl == null) {
-      try {
-        this.tokenUrl = DEFAULT_TOKEN_URL.replace("{UNIVERSE_DOMAIN}", this.getUniverseDomain());
-      } catch (IOException e) {
-        // Throwing an IOException would be a breaking change, so wrap it here.
-        // This should not happen for this credential type.
-        throw new IllegalStateException(
-            "Error occurred when attempting to retrieve universe domain.", e);
-      }
+      this.tokenUrl = DEFAULT_TOKEN_URL.replace("{UNIVERSE_DOMAIN}", this.getUniverseDomain());
     } else {
       this.tokenUrl = builder.tokenUrl;
     }
@@ -334,6 +327,17 @@ public void onFailure(Throwable exception) {
         });
   }
 
+  @Override
+  public String getUniverseDomain() {
+    try {
+      return super.getUniverseDomain();
+    } catch (IOException e) {
+      // Throwing an IOException would be a breaking change, so wrap it here.
+      // This should not happen for this credential type.
+      throw new IllegalStateException(e);
+    }
+  }
+
   @Override
   public Map<String, List<String>> getRequestMetadata(URI uri) throws IOException {
     Map<String, List<String>> requestMetadata = super.getRequestMetadata(uri);

diff --git a/oauth2_http/javatests/com/google/auth/oauth2/ExternalAccountCredentialsTest.java b/oauth2_http/javatests/com/google/auth/oauth2/ExternalAccountCredentialsTest.java
@@ -583,26 +583,6 @@ public void constructor_builder_defaultTokenUrlwithUniverseDomain() {
     assertEquals("https://sts.testdomain.org/v1/token", credentials.getTokenUrl());
   }
 
-  @Test
-  public void constructor_builder_getUniverseDomainFails() {
-    HashMap<String, Object> credentialSource = new HashMap<>();
-    credentialSource.put("file", "file");
-
-    try {
-      UniverseDomainErrorTestCredentials.newBuilder()
-          .setHttpTransportFactory(transportFactory)
-          .setAudience(
-              "//iam.googleapis.com/locations/global/workforcePools/pool/providers/provider")
-          .setSubjectTokenType("subjectTokenType")
-          .setUniverseDomain("testdomain.org")
-          .build();
-      fail("Should not be able to continue without exception.");
-    } catch (IllegalStateException exception) {
-      assertEquals(
-          "Error occurred when attempting to retrieve universe domain.", exception.getMessage());
-    }
-  }
-
   @Test
   public void constructor_builder_subjectTokenTypeEnum() {
     HashMap<String, Object> credentialSource = new HashMap<>();
@@ -1388,28 +1368,4 @@ public String retrieveSubjectToken() {
       return "subjectToken";
     }
   }
-
-  static class UniverseDomainErrorTestCredentials extends TestExternalAccountCredentials {
-    protected UniverseDomainErrorTestCredentials(TestExternalAccountCredentials.Builder builder) {
-      super(builder);
-    }
-
-    public static UniverseDomainErrorTestCredentials.Builder newBuilder() {
-      return new UniverseDomainErrorTestCredentials.Builder();
-    }
-
-    static class Builder extends TestExternalAccountCredentials.Builder {
-      Builder() {}
-
-      @Override
-      public UniverseDomainErrorTestCredentials build() {
-        return new UniverseDomainErrorTestCredentials(this);
-      }
-    }
-
-    @Override
-    public String getUniverseDomain() throws IOException {
-      throw new IOException("Test error");
-    }
-  }
 }