Migrate to Flogger (green)

This is a 'green' Flogger migration CL. Green CLs are intended to be as
safe as possible and should be easy to review and submit.

No changes should be necessary to the code itself prior to submission,
but small changes to BUILD files may be required.

Changes within files are completely independent of each other, so this CL
can be safely split up for review using tools such as Rosie.

For more information, see []
Base CL: 197826149

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=198560170
This commit is contained in:
jianglai 2018-05-30 07:58:51 -07:00
parent 0d2fb3a8f0
commit 70b13596e4
178 changed files with 984 additions and 988 deletions

View file

@ -21,8 +21,8 @@ import static google.registry.testing.SystemInfo.hasCommand;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assume.assumeTrue;
import com.google.common.flogger.FluentLogger;
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;
@ -50,7 +50,7 @@ import org.junit.runner.RunWith;
@SuppressWarnings("resource")
public class RydeGpgIntegrationTest extends ShardableTestCase {
private static final FormattingLogger logger = FormattingLogger.getLoggerForCallerClass();
private static final FluentLogger logger = FluentLogger.forEnclosingClass();
@Rule
public final BouncyCastleProviderRule bouncy = new BouncyCastleProviderRule();
@ -145,7 +145,7 @@ public class RydeGpgIntegrationTest extends ShardableTestCase {
// mode b (62), created 1287273600, name="lol_2010-10-17_full_S1_R0.tar",
// raw data: 10752 bytes
// gpg: WARNING: message was not integrity protected
logger.info("Running GPG to list info about OpenPGP message...");
logger.atInfo().log("Running GPG to list info about OpenPGP message...");
{
Process pid =
gpg.exec(
@ -192,7 +192,7 @@ public class RydeGpgIntegrationTest extends ShardableTestCase {
// jart@jart:/tmp$ gpg --verify /tmp/deposit.sig /tmp/deposit.ryde
// gpg: Signature made Mon 26 Aug 2013 12:04:27 PM EDT using RSA-S key ID 2774D88E
// gpg: Good signature from <rde-unittest@registry.test>
logger.info("Running GPG to verify signature...");
logger.atInfo().log("Running GPG to verify signature...");
{
Process pid = gpg.exec(cmd.get(), "--verify", sigFile.toString(), rydeFile.toString());
String stderr = slurp(pid.getErrorStream());
@ -210,7 +210,7 @@ public class RydeGpgIntegrationTest extends ShardableTestCase {
// gpg: AES encrypted data
// gpg: original file name='lol_2010-10-17_full_S1_R0.tar'
// gpg: WARNING: message was not integrity protected
logger.info("Running GPG to extract tar...");
logger.atInfo().log("Running GPG to extract tar...");
{
Process pid =
gpg.exec(cmd.get(), "--use-embedded-filename", "--ignore-mdc-error", rydeFile.toString());
@ -222,7 +222,7 @@ public class RydeGpgIntegrationTest extends ShardableTestCase {
.isTrue();
// ...and finally, Iron Mountain extracts the tar file to get a happy XML file ^__^
logger.info("Running GNU tar to extract content...");
logger.atInfo().log("Running GNU tar to extract content...");
{
Process pid = gpg.exec("tar", "-xf", tarFile.toString());
String stderr = slurp(pid.getErrorStream());