Revert "Added separate test class for mTLS-utils. Added missing cert and malformed cert tests to X509Provider."

This reverts commit e8fbea7.

Author: vverman

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

@@ -115,20 +115,15 @@ static WorkloadCertificateConfiguration getWorkloadCertificateConfiguration(
   }
 
   private static File getWellKnownCertificateConfigFile(
-      EnvironmentProvider envProvider, PropertyProvider propProvider) throws IOException {
+      EnvironmentProvider envProvider, PropertyProvider propProvider) {
     File cloudConfigPath;
     String envPath = envProvider.getEnv("CLOUDSDK_CONFIG");
     if (envPath != null) {
       cloudConfigPath = new File(envPath);
     } else {
       String osName = propProvider.getProperty("os.name", "").toLowerCase(Locale.US);
       if (osName.indexOf("windows") >= 0) {
-        String appData = envProvider.getEnv("APPDATA");
-        if (Strings.isNullOrEmpty(appData)) {
-          throw new CertificateSourceUnavailableException(
-              "APPDATA environment variable is not set on Windows.");
-        }
-        File appDataPath = new File(appData);
+        File appDataPath = new File(envProvider.getEnv("APPDATA"));
         cloudConfigPath = new File(appDataPath, CLOUDSDK_CONFIG_DIRECTORY);
       } else {
         File configPath = new File(propProvider.getProperty("user.home", ""), ".config");

oauth2_http/java/com/google/auth/oauth2/EnvironmentProvider.java

@@ -1,33 +1,3 @@
-/*
- * Copyright 2026 Google LLC
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google LLC nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
 package com.google.auth.oauth2;
 
 import com.google.api.core.InternalApi;

oauth2_http/java/com/google/auth/oauth2/IdentityPoolCredentials.java

@@ -176,6 +176,9 @@ private IdentityPoolSubjectTokenSupplier createCertificateSubjectTokenSupplier(
 
   private X509Provider getX509Provider(
       Builder builder, IdentityPoolCredentialSource credentialSource) {
+    final IdentityPoolCredentialSource.CertificateConfig certConfig =
+        credentialSource.getCertificateConfig();
+
     // Use the provided X509Provider if available, otherwise initialize a default one.
     X509Provider x509Provider = builder.x509Provider;
     if (x509Provider == null) {
@@ -190,9 +193,6 @@ private X509Provider getX509Provider(
   private static String getExplicitCertConfigPath(IdentityPoolCredentialSource credentialSource) {
     IdentityPoolCredentialSource.CertificateConfig certConfig =
         credentialSource.getCertificateConfig();
-    if (certConfig == null) {
-      return null;
-    }
     return certConfig.useDefaultCertificateConfig()
         ? null
         : certConfig.getCertificateConfigLocation();

oauth2_http/java/com/google/auth/oauth2/PropertyProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2026 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are

oauth2_http/java/com/google/auth/oauth2/SystemPropertyProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2026 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are

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

@@ -169,43 +169,4 @@ void x509Provider_succeeds_withWindowsPath()
     assertEquals(1, store.size());
     assertNotNull(store.getCertificateAlias(expectedCert));
   }
-
-  @Test
-  void x509Provider_certFileDoesntExist_throws() throws IOException {
-    Path tempConfig = Files.createTempFile("config", ".json");
-    tempConfig.toFile().deleteOnExit();
-    Path nonExistentCert = tempConfig.getParent().resolve("non_existent_cert.pem");
-
-    Files.write(
-        tempConfig,
-        ("{\"cert_configs\":{\"workload\":{\"cert_path\":\""
-                + nonExistentCert.toString()
-                + "\",\"key_path\":\"key.pem\"}}}")
-            .getBytes());
-
-    X509Provider testProvider = new X509Provider(tempConfig.toString());
-
-    assertThrows(IOException.class, testProvider::getKeyStore);
-  }
-
-  @Test
-  void x509Provider_malformedCert_throws() throws IOException {
-    Path tempConfig = Files.createTempFile("config", ".json");
-    tempConfig.toFile().deleteOnExit();
-    Path malformedCert = Files.createTempFile("badcert", ".pem");
-    malformedCert.toFile().deleteOnExit();
-
-    Files.write(malformedCert, "This is not a valid certificate".getBytes());
-
-    Files.write(
-        tempConfig,
-        ("{\"cert_configs\":{\"workload\":{\"cert_path\":\""
-                + malformedCert.toString()
-                + "\",\"key_path\":\"key.pem\"}}}")
-            .getBytes());
-
-    X509Provider testProvider = new X509Provider(tempConfig.toString());
-
-    assertThrows(Exception.class, testProvider::getKeyStore);
-  }
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2026 Google LLC
+ * Copyright 2025 Google LLC
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are