Migrate to internal FormattingLogger in preparation of migration to Flogger

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=197744904

javatests/google/registry/keyring/api/ComparatorKeyringTest.java

@@ -80,12 +80,12 @@ public class ComparatorKeyringTest {
 
   @Before
   public void setUp() {
-    ComparatorKeyring.logger.addHandler(testLogHandler);
+    ComparatorKeyring.logger.getFormattingLogger().addHandler(testLogHandler);
   }
 
   @After
   public void tearDown() {
-    ComparatorKeyring.logger.removeHandler(testLogHandler);
+    ComparatorKeyring.logger.getFormattingLogger().removeHandler(testLogHandler);
   }
 
   @Test

javatests/google/registry/model/BUILD

@@ -18,6 +18,7 @@ java_library(
     resources = [
     ] + glob(["**/testdata/*"]),
     deps = [
+        "//java/com/google/common/logging:formatting_logger",
         "//java/google/registry/config",
         "//java/google/registry/dns/writer",
         "//java/google/registry/flows",

javatests/google/registry/rde/BUILD

@@ -12,6 +12,7 @@ java_library(
     srcs = glob(["*.java"]),
     resources = glob(["testdata/*"]),
     deps = [
+        "//java/com/google/common/logging:formatting_logger",
         "//java/google/registry/config",
         "//java/google/registry/gcs",
         "//java/google/registry/keyring/api",

javatests/google/registry/rde/BouncyCastleTest.java

@@ -23,8 +23,8 @@ import static org.bouncycastle.bcpg.PublicKeyAlgorithmTags.RSA_GENERAL;
 import static org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags.AES_128;
 
 import com.google.common.io.CharStreams;
+import com.google.common.logging.FormattingLogger;
 import google.registry.testing.BouncyCastleProviderRule;
-import google.registry.util.FormattingLogger;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;

javatests/google/registry/rde/RydeGpgIntegrationTest.java

@@ -22,12 +22,12 @@ import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.junit.Assume.assumeTrue;
 
 import com.google.common.io.CharStreams;
+import com.google.common.logging.FormattingLogger;
 import google.registry.keyring.api.Keyring;
 import google.registry.testing.BouncyCastleProviderRule;
 import google.registry.testing.FakeKeyringModule;
 import google.registry.testing.GpgSystemCommandRule;
 import google.registry.testing.ShardableTestCase;
-import google.registry.util.FormattingLogger;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;

javatests/google/registry/server/BUILD

@@ -17,6 +17,7 @@ java_library(
     ],
     visibility = ["//visibility:public"],
     deps = [
+        "//java/com/google/common/logging:formatting_logger",
         "//java/google/registry/util",
         "@com_google_appengine_tools_sdk",
         "@com_google_auto_value",

javatests/google/registry/server/StaticResourceServlet.java

@@ -20,9 +20,9 @@ import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN;
 import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.common.logging.FormattingLogger;
 import com.google.common.net.MediaType;
 import com.google.common.primitives.Ints;
-import google.registry.util.FormattingLogger;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;

javatests/google/registry/testing/BUILD

@@ -21,6 +21,7 @@ java_library(
     ] + glob(["*.csv"]) + glob(["testdata/*"]),
     exports = ["//third_party/junit"],
     deps = [
+        "//java/com/google/common/logging:formatting_logger",
         "//java/google/registry/config",
         "//java/google/registry/dns",
         "//java/google/registry/dns:constants",

javatests/google/registry/testing/ShardableTestCase.java

@@ -14,7 +14,7 @@
 
 package google.registry.testing;
 
-import google.registry.util.FormattingLogger;
+import com.google.common.logging.FormattingLogger;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;

javatests/google/registry/testing/SystemInfo.java

@@ -17,7 +17,7 @@ package google.registry.testing;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
-import google.registry.util.FormattingLogger;
+import com.google.common.logging.FormattingLogger;
 import java.io.IOException;
 import java.util.concurrent.ExecutionException;
 import javax.annotation.concurrent.ThreadSafe;

javatests/google/registry/testing/mapreduce/BUILD

@@ -11,10 +11,10 @@ java_library(
     name = "mapreduce",
     srcs = glob(["*.java"]),
     deps = [
+        "//java/com/google/common/logging:formatting_logger",
         "//java/google/registry/config",
         "//java/google/registry/mapreduce",
         "//java/google/registry/model",
-        "//java/google/registry/util",
         "//javatests/google/registry/testing",
         "@com_google_appengine_api_1_0_sdk",
         "@com_google_appengine_api_stubs",

javatests/google/registry/testing/mapreduce/MapreduceTestCase.java

@@ -33,11 +33,11 @@ import com.google.appengine.tools.pipeline.impl.servlets.PipelineServlet;
 import com.google.appengine.tools.pipeline.impl.servlets.TaskHandler;
 import com.google.apphosting.api.ApiProxy;
 import com.google.common.base.CharMatcher;
+import com.google.common.logging.FormattingLogger;
 import google.registry.mapreduce.MapreduceRunner;
 import google.registry.testing.AppEngineRule;
 import google.registry.testing.FakeClock;
 import google.registry.testing.ShardableTestCase;
-import google.registry.util.FormattingLogger;
 import java.io.ByteArrayInputStream;
 import java.io.ObjectInputStream;
 import java.io.UnsupportedEncodingException;

javatests/google/registry/testing/sftp/BUILD

@@ -9,6 +9,7 @@ java_library(
     name = "sftp",
     srcs = glob(["*.java"]),
     deps = [
+        "//java/com/google/common/logging:formatting_logger",
         "//java/google/registry/util",
         "@com_google_code_findbugs_jsr305",
         "@com_google_guava",

javatests/google/registry/testing/sftp/TestSftpServer.java

@@ -16,7 +16,7 @@ package google.registry.testing.sftp;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import google.registry.util.FormattingLogger;
+import com.google.common.logging.FormattingLogger;
 import java.io.File;
 import java.io.IOException;
 import java.io.StringReader;

javatests/google/registry/ui/server/registrar/SessionUtilsTest.java

@@ -77,7 +77,7 @@ public class SessionUtilsTest {
 
   @Before
   public void before() throws Exception {
-    SessionUtils.logger.addHandler(testLogHandler);
+    SessionUtils.logger.getFormattingLogger().addHandler(testLogHandler);
     sessionUtils = new SessionUtils();
     sessionUtils.registryAdminClientId = ADMIN_CLIENT_ID;
     persistResource(loadRegistrar(ADMIN_CLIENT_ID));
@@ -86,7 +86,7 @@ public class SessionUtilsTest {
 
   @After
   public void after() throws Exception {
-    SessionUtils.logger.removeHandler(testLogHandler);
+    SessionUtils.logger.getFormattingLogger().removeHandler(testLogHandler);
   }
 
   /** User needs to be logged in before calling checkRegistrarConsoleLogin */

javatests/google/registry/util/RequestStatusCheckerImplTest.java

@@ -69,12 +69,12 @@ public final class RequestStatusCheckerImplTest {
   public AppEngineRule appEngineRule = AppEngineRule.builder().build();
 
   @Before public void setUp() {
-    RequestStatusCheckerImpl.logger.addHandler(logHandler);
+    RequestStatusCheckerImpl.logger.getFormattingLogger().addHandler(logHandler);
     RequestStatusCheckerImpl.logService = mock(LogService.class);
   }
 
   @After public void tearDown() {
-    RequestStatusCheckerImpl.logger.removeHandler(logHandler);
+    RequestStatusCheckerImpl.logger.getFormattingLogger().removeHandler(logHandler);
   }
 
   // If a logId is unrecognized, it could be that the log hasn't been uploaded yet - so we assume

javatests/google/registry/whois/WhoisReaderTest.java

@@ -41,7 +41,7 @@ public class WhoisReaderTest {
   @Before
   public void init() {
     createTlds("tld", "xn--kgbechtv", "1.test");
-    WhoisReader.logger.addHandler(testLogHandler);
+    WhoisReader.logger.getFormattingLogger().addHandler(testLogHandler);
   }
 
   @SuppressWarnings({"TypeParameterUnusedInFormals", "unchecked"})