Change gcp token creation to use Optional

apache · Oct 15, 2024 · 77fdb2f · 77fdb2f
1 parent 48433d5
commit 77fdb2f
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/...ris-service/src/main/java/org/apache/polaris/service/config/PolarisApplicationConfig.java b/...ris-service/src/main/java/org/apache/polaris/service/config/PolarisApplicationConfig.java
@@ -28,6 +28,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.function.Supplier;
 import javax.annotation.Nullable;
 import org.apache.commons.lang3.StringUtils;
@@ -217,15 +218,17 @@ public void setDefaultRealms(List<String> defaultRealms) {
   }
 
   public Supplier<GoogleCredentials> getGcpCredentialsProvider() {
-    return gcpAccessToken != null
-        ? () -> GoogleCredentials.create(gcpAccessToken)
-        : () -> {
-          try {
-            return GoogleCredentials.getApplicationDefault();
-          } catch (IOException e) {
-            throw new RuntimeException("Failed to get GCP credentials", e);
-          }
-        };
+    return () ->
+        Optional.ofNullable(gcpAccessToken)
+            .map(GoogleCredentials::create)
+            .orElseGet(
+                () -> {
+                  try {
+                    return GoogleCredentials.getApplicationDefault();
+                  } catch (IOException e) {
+                    throw new RuntimeException("Failed to get GCP credentials", e);
+                  }
+                });
   }
 
   @JsonProperty("gcp_credentials")