Format fixes

This commit is contained in:
Sarah Botwinick 2021-01-28 18:24:58 -05:00
parent 6d47ed2861
commit 26f88bd313
3 changed files with 12 additions and 13 deletions

View file

@ -198,8 +198,7 @@ public class TlsCredentials implements TransportCredentials {
// Log an error and validate using certificate hash instead // Log an error and validate using certificate hash instead
// TODO(sarahbot): throw a BadRegistrarCertificateException once hash is no longer used as // TODO(sarahbot): throw a BadRegistrarCertificateException once hash is no longer used as
// failover // failover
logger.atWarning().log( logger.atWarning().log("Non-matching certificate for registrar %s.", registrar.getClientId());
"Non-matching certificate for registrar %s.", registrar.getClientId());
} }
validateCertificateHash(registrar); validateCertificateHash(registrar);
} }

View file

@ -18,6 +18,7 @@ import static google.registry.testing.DatabaseHelper.loadRegistrar;
import static google.registry.testing.DatabaseHelper.persistResource; import static google.registry.testing.DatabaseHelper.persistResource;
import static google.registry.testing.LogsSubject.assertAboutLogs; import static google.registry.testing.LogsSubject.assertAboutLogs;
import static google.registry.util.DateTimeUtils.START_OF_TIME; import static google.registry.util.DateTimeUtils.START_OF_TIME;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.joda.time.DateTimeZone.UTC; import static org.joda.time.DateTimeZone.UTC;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
@ -47,7 +48,6 @@ import org.junit.jupiter.api.extension.RegisterExtension;
import org.testcontainers.shaded.org.bouncycastle.openssl.jcajce.JcaMiscPEMGenerator; import org.testcontainers.shaded.org.bouncycastle.openssl.jcajce.JcaMiscPEMGenerator;
import org.testcontainers.shaded.org.bouncycastle.util.io.pem.PemObjectGenerator; import org.testcontainers.shaded.org.bouncycastle.util.io.pem.PemObjectGenerator;
import org.testcontainers.shaded.org.bouncycastle.util.io.pem.PemWriter; import org.testcontainers.shaded.org.bouncycastle.util.io.pem.PemWriter;
import static java.nio.charset.StandardCharsets.UTF_8;
/** Test logging in with TLS credentials. */ /** Test logging in with TLS credentials. */
class EppLoginTlsTest extends EppTestCase { class EppLoginTlsTest extends EppTestCase {

View file

@ -16,8 +16,8 @@ package google.registry.flows.session;
import static google.registry.testing.DatabaseHelper.persistResource; import static google.registry.testing.DatabaseHelper.persistResource;
import static google.registry.util.DateTimeUtils.START_OF_TIME; import static google.registry.util.DateTimeUtils.START_OF_TIME;
import static org.joda.time.DateTimeZone.UTC;
import static java.nio.charset.StandardCharsets.UTF_8; import static java.nio.charset.StandardCharsets.UTF_8;
import static org.joda.time.DateTimeZone.UTC;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;