Exception handling

Author: emmyzhou-db

databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/EnvVarIDTokenSource.java

@@ -30,6 +30,7 @@ public EnvVarIDTokenSource(String envVarName, Environment env) {
    * @throws IllegalArgumentException if the environment variable name is null or empty, or the
    *     environment is null.
    * @throws DatabricksException if the environment variable is not set or is empty.
+   * @throws ClassCastException if the environment variable is not valid type.
    */
   @Override
   public IDToken getIDToken(String audience) {
@@ -47,9 +48,9 @@ public IDToken getIDToken(String audience) {
     } catch (IllegalArgumentException e) {
       throw new DatabricksException(
           "Received empty ID token from environment variable " + envVarName);
-    } catch (RuntimeException e) {
+    } catch (ClassCastException e) {
       throw new DatabricksException(
-          "Failed to read environment variable " + envVarName + ": " + e.getMessage(), e);
+          "Environment variable " + envVarName + " has invalid type: " + e.getMessage(), e);
     }
   }
 }

databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/FileIDTokenSource.java

@@ -33,13 +33,21 @@ public FileIDTokenSource(String filePath) {
 
   /**
    * Retrieves an ID Token from the file. The file is read using UTF-8 encoding and the first line
-   * is used as the token value.
+   * is used as the token value. Any leading or trailing whitespace in the token is trimmed.
    *
-   * @param audience The intended recipient of the ID Token (not used).
+   * @param audience The intended recipient of the ID Token. This parameter is not used in this
+   *     implementation as the token is read directly from the file.
    * @return An {@link IDToken} containing the token value from the file.
    * @throws IllegalArgumentException if the file path is null or empty.
-   * @throws DatabricksException if the file path is invalid, the file does not exist, is empty, or
-   *     contains only whitespace.
+   * @throws DatabricksException in the following cases:
+   *     <ul>
+   *       <li>If the file path is invalid or malformed
+   *       <li>If the file does not exist
+   *       <li>If there are security permission issues accessing the file
+   *       <li>If the file is empty or contains only whitespace
+   *       <li>If the file cannot be read due to I/O errors
+   *       <li>If the token format in the file is invalid
+   *     </ul>
    */
   @Override
   public IDToken getIDToken(String audience) {
@@ -54,8 +62,17 @@ public IDToken getIDToken(String audience) {
       throw new DatabricksException("Invalid file path: " + filePath, e);
     }
 
-    if (!Files.exists(path)) {
-      throw new DatabricksException("File " + filePath + " does not exist");
+    try {
+      if (!Files.exists(path)) {
+        throw new DatabricksException("File " + filePath + " does not exist");
+      }
+    } catch (SecurityException e) {
+      throw new DatabricksException(
+          "Security permission denied when checking if file "
+              + filePath
+              + " exists: "
+              + e.getMessage(),
+          e);
     }
 
     List<String> lines;
@@ -64,6 +81,9 @@ public IDToken getIDToken(String audience) {
     } catch (IOException e) {
       throw new DatabricksException(
           "Failed to read ID token from file " + filePath + ": " + e.getMessage(), e);
+    } catch (SecurityException e) {
+      throw new DatabricksException(
+          "Security permission denied when reading file " + filePath + ": " + e.getMessage(), e);
     }
 
     if (lines.isEmpty()) {
@@ -74,7 +94,7 @@ public IDToken getIDToken(String audience) {
       String token;
       try {
         token = lines.get(0).trim();
-      } catch (IndexOutOfBoundsException | NullPointerException e) {
+      } catch (IndexOutOfBoundsException e) {
         throw new DatabricksException("Invalid token format in file " + filePath);
       }
       return new IDToken(token);

databricks-sdk-java/src/main/java/com/databricks/sdk/core/oauth/IDToken.java

@@ -12,6 +12,7 @@ public class IDToken {
    * Constructs an IDToken with a value.
    *
    * @param value The ID Token string.
+   * @throws IllegalArgumentException if the token value is null or empty.
    */
   public IDToken(String value) {
     if (value == null || value.isEmpty()) {