simplify logic for getLogger. remove unused argLine for maven-surefire-plugin.

Author: zhumin8

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

@@ -17,6 +17,7 @@
 class LoggingUtils {
 
   private static EnvironmentProvider environmentProvider = SystemEnvironmentProvider.getInstance();
+  private static final Logger NO_OP_LOGGER = org.slf4j.helpers.NOPLogger.NOP_LOGGER;
 
   // expose this setter for testing purposes
   static void setEnvironmentProvider(EnvironmentProvider provider) {
@@ -44,16 +45,9 @@ static Logger getLogger(Class<?> clazz) {
   static Logger getLogger(Class<?> clazz, LoggerFactoryProvider factoryProvider) {
     if (!isLoggingEnabled()) {
       //  use SLF4j's NOP logger regardless of bindings
-      return org.slf4j.helpers.NOPLogger.NOP_LOGGER;
+      return NO_OP_LOGGER;
     }
-
-    ILoggerFactory loggerFactory = factoryProvider.getLoggerFactory();
-    if (loggerFactory != null && !(loggerFactory instanceof org.slf4j.helpers.NOPLoggerFactory)) {
-      // Use SLF4j binding when present
-      return LoggerFactory.getLogger(clazz);
-    }
-    // No SLF4j binding found, return nop logger
-    return org.slf4j.helpers.NOPLogger.NOP_LOGGER;
+    return factoryProvider.getLoggerFactory().getLogger(clazz.getName());
   }
 
   static boolean isLoggingEnabled() {

oauth2_http/javatests/com/google/auth/oauth2/LoggingUtilsTest.java

@@ -4,6 +4,7 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -12,6 +13,7 @@
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.ConsoleAppender;
 import com.google.auth.TestAppender;
+import com.google.auth.oauth2.LoggingUtils.LoggerFactoryProvider;
 import java.util.HashMap;
 import java.util.Map;
 import org.junit.After;
@@ -69,21 +71,6 @@ public void testGetLogger_loggingEnabled_slf4jBindingPresent() {
     assertNotEquals(logger.getClass(), NOPLogger.class);
   }
 
-  @Test
-  public void testGetLogger_loggingEnabled_noSlf4jBinding() {
-    LoggingUtils.LoggerFactoryProvider mockProvider =
-        mock(LoggingUtils.LoggerFactoryProvider.class);
-    ILoggerFactory mockLoggerFactory =
-        mock(org.slf4j.helpers.NOPLoggerFactory.class); // Mock NOPLoggerFactory
-
-    when(mockProvider.getLoggerFactory())
-        .thenReturn(mockLoggerFactory); // Return the mock NOPLoggerFactory
-
-    testEnvironmentProvider.setEnv("GOOGLE_SDK_JAVA_LOGGING", "true");
-    Logger logger = LoggingUtils.getLogger(LoggingUtilsTest.class, mockProvider);
-    assertTrue(logger instanceof NOPLogger);
-  }
-
   @Test
   public void testGetLogger_loggingDisabled() {
     testEnvironmentProvider.setEnv("GOOGLE_SDK_JAVA_LOGGING", "false");
@@ -92,6 +79,23 @@ public void testGetLogger_loggingDisabled() {
     assertEquals(NOPLogger.class, logger.getClass());
   }
 
+  @Test
+  public void testGetLogger_loggingEnabled_noBinding() {
+    testEnvironmentProvider.setEnv("GOOGLE_SDK_JAVA_LOGGING", "true");
+    // Create a mock LoggerFactoryProvider
+    LoggerFactoryProvider mockLoggerFactoryProvider = mock(LoggerFactoryProvider.class);
+    ILoggerFactory mockLoggerFactory = mock(ILoggerFactory.class);
+    when(mockLoggerFactoryProvider.getLoggerFactory()).thenReturn(mockLoggerFactory);
+    when(mockLoggerFactory.getLogger(anyString()))
+        .thenReturn(org.slf4j.helpers.NOPLogger.NOP_LOGGER);
+
+    // Use the mock LoggerFactoryProvider in getLogger()
+    Logger logger = LoggingUtils.getLogger(LoggingUtilsTest.class, mockLoggerFactoryProvider);
+
+    // Assert that the returned logger is a NOPLogger
+    assertTrue(logger instanceof org.slf4j.helpers.NOPLogger);
+  }
+
   @Test
   public void testIsLoggingEnabled_true() {
     testEnvironmentProvider.setEnv("GOOGLE_SDK_JAVA_LOGGING", "true");

oauth2_http/pom.xml

@@ -34,7 +34,6 @@
             <artifactId>maven-surefire-plugin</artifactId>
             <version>${surefire.version}</version>
             <configuration>
-              <argLine>--add-opens java.base/java.util=ALL-UNNAMED</argLine>
               <!-- Excludes integration tests when unit tests are run. -->
               <excludes>
                 <exclude>**/IT*.java</exclude>