zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-15 17:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Migrate to Flogger (green)

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

14
javatests/google/registry/testing/sftp/TestSftpServer.java
View file

@ -16,7 +16,7 @@ package google.registry.testing.sftp;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.logging.FormattingLogger;
import com.google.common.flogger.FluentLogger;
import java.io.File;
import java.io.IOException;
import java.io.StringReader;
@ -47,7 +47,7 @@ import org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter;
/** In-process SFTP server using Apache SSHD. */
public class TestSftpServer implements FtpServer {
private static final FormattingLogger logger = FormattingLogger.getLoggerForCallerClass();
private static final FluentLogger logger = FluentLogger.forEnclosingClass();
private static SingletonRandomFactory secureRandomFactory;
@ -93,10 +93,10 @@ public class TestSftpServer implements FtpServer {
try (PEMParser pemParser = new PEMParser(new StringReader(key))) {
PEMKeyPair pemPair = (PEMKeyPair) pemParser.readObject();
KeyPair result = new JcaPEMKeyConverter().setProvider("BC").getKeyPair(pemPair);
logger.infofmt("Read key pair %s", result);
logger.atInfo().log("Read key pair %s", result);
return result;
} catch (IOException e) {
logger.severe(e, "Couldn't read key pair from string.");
logger.atSevere().withCause(e).log("Couldn't read key pair from string.");
return null;
}
}
@ -185,18 +185,18 @@ public class TestSftpServer implements FtpServer {
@Override
public synchronized void stop() {
try {
logger.info("Stopping server");
logger.atInfo().log("Stopping server");
server.stop(true);
stopped = true;
} catch (IOException e) {
logger.warning(e, "Error shutting down server");
logger.atWarning().withCause(e).log("Error shutting down server");
}
}
@Override
public synchronized void start() throws FtpException {
try {
logger.info("Starting server");
logger.atInfo().log("Starting server");
server.start();
stopped = false;
} catch (IOException e) {