From df54162ffda5f651e34ba3a764db42f9cd89e827 Mon Sep 17 00:00:00 2001
From: Jihun Cho <jihuncho@google.com>
Date: Tue, 23 Jun 2020 10:10:42 -0700
Subject: [PATCH] all: fix lint warnings and errors (#7150)

---
 .../grpc/examples/retrying/RetryingHelloWorldClient.java  | 2 +-
 .../grpc/examples/retrying/RetryingHelloWorldServer.java  | 8 ++++----
 xds/src/main/java/io/grpc/xds/EnvoyServerProtoData.java   | 6 +++---
 xds/src/test/java/io/grpc/xds/RouteMatchTest.java         | 5 ++++-
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/examples/src/main/java/io/grpc/examples/retrying/RetryingHelloWorldClient.java b/examples/src/main/java/io/grpc/examples/retrying/RetryingHelloWorldClient.java
index 73f5d69802..d8f2e72441 100644
--- a/examples/src/main/java/io/grpc/examples/retrying/RetryingHelloWorldClient.java
+++ b/examples/src/main/java/io/grpc/examples/retrying/RetryingHelloWorldClient.java
@@ -70,7 +70,7 @@ public class RetryingHelloWorldClient {
         .usePlaintext();
     if (enableRetries) {
       Map<String, ?> serviceConfig = getRetryingServiceConfig();
-      logger.info("Client started with retrying configuration: " + serviceConfig.toString());
+      logger.info("Client started with retrying configuration: " + serviceConfig);
       channelBuilder.defaultServiceConfig(serviceConfig).enableRetry();
     }
     channel = channelBuilder.build();
diff --git a/examples/src/main/java/io/grpc/examples/retrying/RetryingHelloWorldServer.java b/examples/src/main/java/io/grpc/examples/retrying/RetryingHelloWorldServer.java
index 37c48e0d9b..0bff00a698 100644
--- a/examples/src/main/java/io/grpc/examples/retrying/RetryingHelloWorldServer.java
+++ b/examples/src/main/java/io/grpc/examples/retrying/RetryingHelloWorldServer.java
@@ -35,8 +35,8 @@ import java.util.logging.Logger;
  */
 public class RetryingHelloWorldServer {
   private static final Logger logger = Logger.getLogger(RetryingHelloWorldServer.class.getName());
-  private static final float unavailablePercentage = 0.5F;
-  private static Random random = new Random();
+  private static final float UNAVAILABLE_PERCENTAGE = 0.5F;
+  private static final Random random = new Random();
 
   private Server server;
 
@@ -50,7 +50,7 @@ public class RetryingHelloWorldServer {
     logger.info("Server started, listening on " + port);
 
     DecimalFormat df = new DecimalFormat("#%");
-    logger.info("Responding as UNAVAILABLE to " + df.format(unavailablePercentage) + " requests");
+    logger.info("Responding as UNAVAILABLE to " + df.format(UNAVAILABLE_PERCENTAGE) + " requests");
     Runtime.getRuntime().addShutdownHook(new Thread() {
       @Override
       public void run() {
@@ -96,7 +96,7 @@ public class RetryingHelloWorldServer {
     @Override
     public void sayHello(HelloRequest request, StreamObserver<HelloReply> responseObserver) {
       int count = retryCounter.incrementAndGet();
-      if (random.nextFloat() < unavailablePercentage) {
+      if (random.nextFloat() < UNAVAILABLE_PERCENTAGE) {
         logger.info("Returning stubbed UNAVAILABLE error. count: " + count);
         responseObserver.onError(Status.UNAVAILABLE
             .withDescription("Greeter temporarily unavailable...").asRuntimeException());
diff --git a/xds/src/main/java/io/grpc/xds/EnvoyServerProtoData.java b/xds/src/main/java/io/grpc/xds/EnvoyServerProtoData.java
index ce8688e6c5..d2647a505b 100644
--- a/xds/src/main/java/io/grpc/xds/EnvoyServerProtoData.java
+++ b/xds/src/main/java/io/grpc/xds/EnvoyServerProtoData.java
@@ -41,7 +41,7 @@ public final class EnvoyServerProtoData {
   public abstract static class BaseTlsContext {
     @Nullable protected final CommonTlsContext commonTlsContext;
 
-    public BaseTlsContext(@Nullable CommonTlsContext commonTlsContext) {
+    protected BaseTlsContext(@Nullable CommonTlsContext commonTlsContext) {
       this.commonTlsContext = commonTlsContext;
     }
 
@@ -54,7 +54,7 @@ public final class EnvoyServerProtoData {
       if (this == o) {
         return true;
       }
-      if (o == null || !(o instanceof BaseTlsContext)) {
+      if (!(o instanceof BaseTlsContext)) {
         return false;
       }
       BaseTlsContext that = (BaseTlsContext) o;
@@ -63,7 +63,7 @@ public final class EnvoyServerProtoData {
 
     @Override
     public int hashCode() {
-      return Objects.hash(commonTlsContext);
+      return Objects.hashCode(commonTlsContext);
     }
   }
 
diff --git a/xds/src/test/java/io/grpc/xds/RouteMatchTest.java b/xds/src/test/java/io/grpc/xds/RouteMatchTest.java
index 283d137c1c..222a4a1de3 100644
--- a/xds/src/test/java/io/grpc/xds/RouteMatchTest.java
+++ b/xds/src/test/java/io/grpc/xds/RouteMatchTest.java
@@ -31,8 +31,11 @@ import java.util.Map;
 import java.util.Set;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /** Tests for {@link RouteMatch}. */
+@RunWith(JUnit4.class)
 public class RouteMatchTest {
 
   private final Map<String, Set<String>> headers = new HashMap<>();
@@ -163,4 +166,4 @@ public class RouteMatchTest {
       return value;
     }
   }
-}
\ No newline at end of file
+}