From 84fce477c20c202cb0f43399ae6fe49289425756 Mon Sep 17 00:00:00 2001
From: Carl Mastrangelo <notcarl@google.com>
Date: Mon, 17 Jul 2017 17:21:07 -0700
Subject: [PATCH] all: fix minor lint warnings

---
 .../main/java/io/grpc/internal/DnsNameResolver.java    |  4 ++--
 core/src/test/java/io/grpc/AttributesTest.java         | 10 +++++-----
 core/src/test/java/io/grpc/IntegerMarshaller.java      |  2 +-
 .../io/grpc/examples/header/CustomHeaderServer.java    |  6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/core/src/main/java/io/grpc/internal/DnsNameResolver.java b/core/src/main/java/io/grpc/internal/DnsNameResolver.java
index a13991f3de..d8d1deea6f 100644
--- a/core/src/main/java/io/grpc/internal/DnsNameResolver.java
+++ b/core/src/main/java/io/grpc/internal/DnsNameResolver.java
@@ -57,7 +57,7 @@ final class DnsNameResolver extends NameResolver {
 
   private static final Logger logger = Logger.getLogger(DnsNameResolver.class.getName());
 
-  private static final boolean isJndiAvailable = jndiAvailable();
+  private static final boolean JNDI_AVAILABLE = jndiAvailable();
 
   @VisibleForTesting
   static boolean enableJndi = false;
@@ -224,7 +224,7 @@ final class DnsNameResolver extends NameResolver {
 
   private DelegateResolver pickDelegateResolver() {
     JdkResolver jdkResolver = new JdkResolver();
-    if (isJndiAvailable && enableJndi) {
+    if (JNDI_AVAILABLE && enableJndi) {
       return new CompositeResolver(jdkResolver, new JndiResolver());
     }
     return jdkResolver;
diff --git a/core/src/test/java/io/grpc/AttributesTest.java b/core/src/test/java/io/grpc/AttributesTest.java
index 6ed0337a0b..329358e5d6 100644
--- a/core/src/test/java/io/grpc/AttributesTest.java
+++ b/core/src/test/java/io/grpc/AttributesTest.java
@@ -26,7 +26,7 @@ import org.junit.runners.JUnit4;
 /** Unit tests for {@link Attributes}. */
 @RunWith(JUnit4.class)
 public class AttributesTest {
-  private static Attributes.Key<String> YOLO_KEY = Attributes.Key.of("yolo");
+  private static final Attributes.Key<String> YOLO_KEY = Attributes.Key.of("yolo");
 
   @Test
   public void buildAttributes() {
@@ -38,10 +38,10 @@ public class AttributesTest {
   @Test
   public void duplicates() {
     Attributes attrs = Attributes.newBuilder()
-            .set(YOLO_KEY, "To be?")
-            .set(YOLO_KEY, "Or not to be?")
-            .set(Attributes.Key.of("yolo"), "I'm not a duplicate")
-            .build();
+        .set(YOLO_KEY, "To be?")
+        .set(YOLO_KEY, "Or not to be?")
+        .set(Attributes.Key.of("yolo"), "I'm not a duplicate")
+        .build();
     assertSame("Or not to be?", attrs.get(YOLO_KEY));
     assertEquals(2, attrs.keys().size());
   }
diff --git a/core/src/test/java/io/grpc/IntegerMarshaller.java b/core/src/test/java/io/grpc/IntegerMarshaller.java
index 4adb462400..580f3f6b70 100644
--- a/core/src/test/java/io/grpc/IntegerMarshaller.java
+++ b/core/src/test/java/io/grpc/IntegerMarshaller.java
@@ -20,7 +20,7 @@ import java.io.InputStream;
 
 /** Marshalls decimal-encoded integers. */
 public class IntegerMarshaller implements MethodDescriptor.Marshaller<Integer> {
-  public static IntegerMarshaller INSTANCE = new IntegerMarshaller();
+  public static final IntegerMarshaller INSTANCE = new IntegerMarshaller();
 
   @Override
   public InputStream stream(Integer value) {
diff --git a/examples/src/main/java/io/grpc/examples/header/CustomHeaderServer.java b/examples/src/main/java/io/grpc/examples/header/CustomHeaderServer.java
index de705921a0..4caa5a5850 100644
--- a/examples/src/main/java/io/grpc/examples/header/CustomHeaderServer.java
+++ b/examples/src/main/java/io/grpc/examples/header/CustomHeaderServer.java
@@ -34,15 +34,15 @@ public class CustomHeaderServer {
   private static final Logger logger = Logger.getLogger(CustomHeaderServer.class.getName());
 
   /* The port on which the server should run */
-  private static final int port = 50051;
+  private static final int PORT = 50051;
   private Server server;
 
   private void start() throws IOException {
-    server = ServerBuilder.forPort(port)
+    server = ServerBuilder.forPort(PORT)
         .addService(ServerInterceptors.intercept(new GreeterImpl(), new HeaderServerInterceptor()))
         .build()
         .start();
-    logger.info("Server started, listening on " + port);
+    logger.info("Server started, listening on " + PORT);
     Runtime.getRuntime().addShutdownHook(new Thread() {
       @Override
       public void run() {