From d0ebbde9ad7b1bce5eeb117b45c823966f626db1 Mon Sep 17 00:00:00 2001 From: Michael Muller Date: Wed, 11 May 2022 14:23:21 -0400 Subject: [PATCH] Fix new checkstyle violations (#1626) * Fix new checkstyle violations * Restore naming in javadocs --- .../registry/tools/ForwardingServerReceiver.java | 10 +++++----- .../main/java/google/registry/tools/LoginCommand.java | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/src/main/java/google/registry/tools/ForwardingServerReceiver.java b/core/src/main/java/google/registry/tools/ForwardingServerReceiver.java index ac8df9640..cc4c99ffc 100644 --- a/core/src/main/java/google/registry/tools/ForwardingServerReceiver.java +++ b/core/src/main/java/google/registry/tools/ForwardingServerReceiver.java @@ -42,17 +42,17 @@ import java.io.IOException; */ final class ForwardingServerReceiver implements VerificationCodeReceiver { - private final int forwarding_port; + private final int forwardingPort; private final LocalServerReceiver localServerReceiver = new LocalServerReceiver(); - ForwardingServerReceiver(int forwarding_port) { - this.forwarding_port = forwarding_port; + ForwardingServerReceiver(int forwardingPort) { + this.forwardingPort = forwardingPort; } @Override public String getRedirectUri() throws IOException { - String redirect_uri = localServerReceiver.getRedirectUri(); - return redirect_uri.replace("localhost:" + getRemotePort(), "localhost:" + forwarding_port); + String redirectUri = localServerReceiver.getRedirectUri(); + return redirectUri.replace("localhost:" + getRemotePort(), "localhost:" + forwardingPort); } @Override diff --git a/core/src/main/java/google/registry/tools/LoginCommand.java b/core/src/main/java/google/registry/tools/LoginCommand.java index 10c9905b6..14eef9959 100644 --- a/core/src/main/java/google/registry/tools/LoginCommand.java +++ b/core/src/main/java/google/registry/tools/LoginCommand.java @@ -43,18 +43,18 @@ final class LoginCommand implements Command { public void run() throws Exception { AuthorizationCodeInstalledApp app; if (port != 0) { - String remote_host = InetAddress.getLocalHost().getHostName(); + String remoteHost = InetAddress.getLocalHost().getHostName(); ForwardingServerReceiver forwardingServerReceiver = new ForwardingServerReceiver(port); app = new AuthorizationCodeInstalledApp( flow, forwardingServerReceiver, url -> { - int remote_port = forwardingServerReceiver.getRemotePort(); + int remotePort = forwardingServerReceiver.getRemotePort(); System.out.printf( "Please first run the following command in a separate terminal on your local " + "host:\n\n ssh -L %s:localhost:%s %s\n\n", - port, remote_port, remote_host); + port, remotePort, remoteHost); System.out.printf( "Please then open the following URL in your local browser and follow the" + " instructions:\n\n %s\n\n",