extract env var name.

googleapis · Dec 11, 2024 · 6485526 · 6485526
1 parent c2a8d76
commit 6485526
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/oauth2_http/java/com/google/auth/oauth2/LoggingConfigs.java b/oauth2_http/java/com/google/auth/oauth2/LoggingConfigs.java
@@ -37,9 +37,12 @@
 
 class LoggingConfigs {
 
-  private static EnvironmentProvider environmentProvider = SystemEnvironmentProvider.getInstance();
   private static final Logger NO_OP_LOGGER = org.slf4j.helpers.NOPLogger.NOP_LOGGER;
-  private static boolean loggingEnabled = isLoggingEnabled();
+  static final String GOOGLE_SDK_JAVA_LOGGING_ENV = "GOOGLE_SDK_JAVA_LOGGING";
+  private static EnvironmentProvider environmentProvider =
+      SystemEnvironmentProvider.getInstance(); // this may be reset for testing purpose
+  private static boolean loggingEnabled =
+      isLoggingEnabled(); // this may be recalculated for testing purposes
   // expose this setter only for testing purposes
   static void setEnvironmentProvider(EnvironmentProvider provider) {
     environmentProvider = provider;
@@ -63,7 +66,7 @@ static Logger getLogger(Class<?> clazz, LoggerFactoryProvider factoryProvider) {
   }
 
   static boolean isLoggingEnabled() {
-    String enableLogging = environmentProvider.getEnv("GOOGLE_SDK_JAVA_LOGGING");
+    String enableLogging = environmentProvider.getEnv(GOOGLE_SDK_JAVA_LOGGING_ENV);
     return "true".equalsIgnoreCase(enableLogging);
   }
 

diff --git a/oauth2_http/javatests/com/google/auth/oauth2/LoggingConfigsTest.java b/oauth2_http/javatests/com/google/auth/oauth2/LoggingConfigsTest.java
@@ -69,7 +69,7 @@ public void tearDown() {
 
   @Test
   public void testGetLogger_loggingEnabled_slf4jBindingPresent() {
-    testEnvironmentProvider.setEnv("GOOGLE_SDK_JAVA_LOGGING", "true");
+    testEnvironmentProvider.setEnv(LoggingConfigs.GOOGLE_SDK_JAVA_LOGGING_ENV, "true");
     LoggingConfigs.setEnvironmentProvider(testEnvironmentProvider);
     Logger logger = LoggingConfigs.getLogger(LoggingConfigsTest.class);
     assertNotNull(logger);
@@ -78,7 +78,7 @@ public void testGetLogger_loggingEnabled_slf4jBindingPresent() {
 
   @Test
   public void testGetLogger_loggingDisabled() {
-    testEnvironmentProvider.setEnv("GOOGLE_SDK_JAVA_LOGGING", "false");
+    testEnvironmentProvider.setEnv(LoggingConfigs.GOOGLE_SDK_JAVA_LOGGING_ENV, "false");
     LoggingConfigs.setEnvironmentProvider(testEnvironmentProvider);
 
     Logger logger = LoggingConfigs.getLogger(LoggingConfigsTest.class);
@@ -87,7 +87,7 @@ public void testGetLogger_loggingDisabled() {
 
   @Test
   public void testGetLogger_loggingEnabled_noBinding() {
-    testEnvironmentProvider.setEnv("GOOGLE_SDK_JAVA_LOGGING", "true");
+    testEnvironmentProvider.setEnv(LoggingConfigs.GOOGLE_SDK_JAVA_LOGGING_ENV, "true");
     LoggingConfigs.setEnvironmentProvider(testEnvironmentProvider);
     // Create a mock LoggerFactoryProvider
     LoggerFactoryProvider mockLoggerFactoryProvider = mock(LoggerFactoryProvider.class);
@@ -105,13 +105,13 @@ public void testGetLogger_loggingEnabled_noBinding() {
 
   @Test
   public void testIsLoggingEnabled_true() {
-    testEnvironmentProvider.setEnv("GOOGLE_SDK_JAVA_LOGGING", "true");
+    testEnvironmentProvider.setEnv(LoggingConfigs.GOOGLE_SDK_JAVA_LOGGING_ENV, "true");
     LoggingConfigs.setEnvironmentProvider(testEnvironmentProvider);
     assertTrue(LoggingConfigs.isLoggingEnabled());
-    testEnvironmentProvider.setEnv("GOOGLE_SDK_JAVA_LOGGING", "TRUE");
+    testEnvironmentProvider.setEnv(LoggingConfigs.GOOGLE_SDK_JAVA_LOGGING_ENV, "TRUE");
     LoggingConfigs.setEnvironmentProvider(testEnvironmentProvider);
     assertTrue(LoggingConfigs.isLoggingEnabled());
-    testEnvironmentProvider.setEnv("GOOGLE_SDK_JAVA_LOGGING", "True");
+    testEnvironmentProvider.setEnv(LoggingConfigs.GOOGLE_SDK_JAVA_LOGGING_ENV, "True");
     LoggingConfigs.setEnvironmentProvider(testEnvironmentProvider);
     assertTrue(LoggingConfigs.isLoggingEnabled());
   }