remove public from LoggingUtils.

Author: zhumin8

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

@@ -14,10 +14,8 @@
 import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;
 
-public class LoggingUtils {
+class LoggingUtils {
 
-  private static final java.util.logging.Logger LOGGER =
-      java.util.logging.Logger.getLogger(LoggingUtils.class.getName());
   private static EnvironmentProvider environmentProvider = SystemEnvironmentProvider.getInstance();
 
   // expose this setter for testing purposes
@@ -38,11 +36,12 @@ public ILoggerFactory getLoggerFactory() {
     }
   }
 
-  public static Logger getLogger(Class<?> clazz) {
+  static Logger getLogger(Class<?> clazz) {
     return getLogger(clazz, new DefaultLoggerFactoryProvider());
   }
 
-  public static Logger getLogger(Class<?> clazz, LoggerFactoryProvider factoryProvider) {
+  // constructor with LoggerFactoryProvider to make testing easier
+  static Logger getLogger(Class<?> clazz, LoggerFactoryProvider factoryProvider) {
     if (!isLoggingEnabled()) {
       //  use SLF4j's NOP logger regardless of bindings
       return org.slf4j.helpers.NOPLogger.NOP_LOGGER;
@@ -57,12 +56,12 @@ public static Logger getLogger(Class<?> clazz, LoggerFactoryProvider factoryProv
     return org.slf4j.helpers.NOPLogger.NOP_LOGGER;
   }
 
-  public static boolean isLoggingEnabled() {
+  static boolean isLoggingEnabled() {
     String enableLogging = environmentProvider.getEnv("GOOGLE_SDK_JAVA_LOGGING");
     return "true".equalsIgnoreCase(enableLogging);
   }
 
-  public static void logWithMDC(
+  static void logWithMDC(
       Logger logger, org.slf4j.event.Level level, Map<String, String> contextMap, String message) {
     contextMap.forEach(MDC::put);
     switch (level) {

oauth2_http/javatests/com/google/auth/TestAppender.java

@@ -5,9 +5,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * Logback appender used to set up tests.
- */
+/** Logback appender used to set up tests. */
 public class TestAppender extends AppenderBase<ILoggingEvent> {
   public static List<ILoggingEvent> events = new ArrayList<>();
 

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

@@ -41,10 +41,6 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import ch.qos.logback.classic.LoggerContext;
-import ch.qos.logback.classic.encoder.PatternLayoutEncoder;
-import ch.qos.logback.classic.spi.ILoggingEvent;
-import ch.qos.logback.core.ConsoleAppender;
 import com.google.api.client.http.HttpResponseException;
 import com.google.api.client.http.HttpStatusCodes;
 import com.google.api.client.json.GenericJson;
@@ -83,13 +79,10 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /** Test case for {@link ServiceAccountCredentials}. */
 @RunWith(JUnit4.class)
@@ -167,6 +160,7 @@ private ServiceAccountCredentials.Builder createDefaultBuilder() throws IOExcept
   }
 
   private TestEnvironmentProvider testEnvironmentProvider;
+
   @Before
   public void setup() {
     testEnvironmentProvider = new TestEnvironmentProvider();
@@ -939,7 +933,6 @@ public void idTokenWithAudience_oauthFlow_targetAudienceDoesNotMatchAudClaim()
         tokenCredential.getIdToken().getJsonWebSignature().getPayload().getAudience());
   }
 
-
   @Test
   public void idTokenWithAudience_iamFlow_targetAudienceMatchesAudClaim() throws IOException {