removed catch block

Author: aeitzman

oauth2_http/java/com/google/auth/mtls/X509Provider.java

@@ -144,19 +144,10 @@ private WorkloadCertificateConfiguration getWorkloadCertificateConfiguration()
     try {
       if (!isFile(certConfig)) {
         // Path will be put in the message from the catch block below
-        throw new IOException("File does not exist.");
+        throw new CertificateSourceUnavailableException("File does not exist.");
       }
       certConfigStream = createInputStream(certConfig);
       return WorkloadCertificateConfiguration.fromCertificateConfigurationStream(certConfigStream);
-    } catch (Exception e) {
-      // Although it is also the cause, the message of the caught exception can have very
-      // important information for diagnosing errors, so include its message in the
-      // outer exception message also.
-      throw new CertificateSourceUnavailableException(
-          String.format(
-              "Error reading certificate configuration file value '%s': %s",
-              certConfig.getPath(), e.getMessage()),
-          e);
     } finally {
       if (certConfigStream != null) {
         certConfigStream.close();

oauth2_http/javatests/com/google/auth/mtls/X509ProviderTest.java

@@ -32,6 +32,7 @@
 package com.google.auth.mtls;
 
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -45,6 +46,7 @@
 import java.security.cert.CertificateFactory;
 import java.util.HashMap;
 import java.util.Map;
+import net.bytebuddy.pool.TypePool.Resolution.Illegal;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -88,14 +90,10 @@ public class X509ProviderTest {
   public void x509Provider_fileDoesntExist_throws() {
     String certConfigPath = "badfile.txt";
     X509Provider testProvider = new TestX509Provider(certConfigPath);
-    String expectedErrorMessage =
-        String.format(
-            "Error reading certificate configuration file value '%s': File does not exist.",
-            certConfigPath);
+    String expectedErrorMessage = "File does not exist.";
 
     CertificateSourceUnavailableException exception =
-        Assert.assertThrows(
-            CertificateSourceUnavailableException.class, () -> testProvider.getKeyStore());
+        Assert.assertThrows(CertificateSourceUnavailableException.class, () -> testProvider.getKeyStore());
     assertTrue(exception.getMessage().contains(expectedErrorMessage));
   }
 
@@ -107,11 +105,11 @@ public void x509Provider_emptyFile_throws() {
     testProvider.addFile(certConfigPath, certConfigStream);
     String expectedErrorMessage =
         String.format(
-            "Error reading certificate configuration file value '%s': no JSON input found",
+            "no JSON input found",
             certConfigPath);
 
-    IOException exception =
-        Assert.assertThrows(IOException.class, () -> testProvider.getKeyStore());
+    IllegalArgumentException exception =
+        Assert.assertThrows(IllegalArgumentException.class, () -> testProvider.getKeyStore());
     assertTrue(exception.getMessage().contains(expectedErrorMessage));
   }