From 641cb357c68cba5f0d1820973c6a6c0c908dc074 Mon Sep 17 00:00:00 2001
From: Eric Anderson <ejona@google.com>
Date: Tue, 24 May 2016 14:29:52 -0700
Subject: [PATCH] Tweak -Xlint warnings

This now catches a few more places we needed -Xlint:-options.
InProcessSocketAddress is technically already in our stable API, so I
maintained its current serialVersionUID.
---
 benchmarks/build.gradle                                   | 4 ++++
 build.gradle                                              | 8 ++++++--
 compiler/build.gradle                                     | 7 ++++++-
 core/src/main/java/io/grpc/ManagedChannelProvider.java    | 2 ++
 .../java/io/grpc/inprocess/InProcessSocketAddress.java    | 2 ++
 5 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/benchmarks/build.gradle b/benchmarks/build.gradle
index 9a244300d6..02d035f3f0 100644
--- a/benchmarks/build.gradle
+++ b/benchmarks/build.gradle
@@ -45,6 +45,10 @@ dependencies {
             libraries.math
 }
 
+compileJmhJava {
+  options.compilerArgs = compileJava.options.compilerArgs
+}
+
 configureProtoCompilation()
 
 def vmArgs = [
diff --git a/build.gradle b/build.gradle
index eaf0eaa16c..50f9de318c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,11 +30,15 @@ subprojects {
     }
 
     [compileJava, compileTestJava].each() {
-        it.options.compilerArgs += ["-Xlint:unchecked", "-Xlint:deprecation", "-Xlint:-options",
-            "-Xlint:rawtypes"]
+        it.options.compilerArgs += ["-Xlint:all", "-Xlint:-options"]
         it.options.encoding = "UTF-8"
     }
 
+    compileTestJava {
+      // serialVersionUID is basically guaranteed to be useless in our tests
+      options.compilerArgs += ["-Xlint:-serial"]
+    }
+
     jar.manifest {
         attributes('Implementation-Title': name,
                 'Implementation-Version': version,
diff --git a/compiler/build.gradle b/compiler/build.gradle
index 2302e5c9ad..c9b7c564e1 100644
--- a/compiler/build.gradle
+++ b/compiler/build.gradle
@@ -135,7 +135,12 @@ sourceSets {
 
 compileTestLiteJava {
   // Protobuf-generated Lite produces quite a few warnings.
-  it.options.compilerArgs.removeAll(["-Xlint:unchecked", "-Xlint:rawtypes"])
+  options.compilerArgs = compileTestJava.options.compilerArgs +
+      ["-Xlint:-unchecked", "-Xlint:-rawtypes"]
+}
+
+compileTestNanoJava {
+  options.compilerArgs = compileTestJava.options.compilerArgs
 }
 
 protobuf {
diff --git a/core/src/main/java/io/grpc/ManagedChannelProvider.java b/core/src/main/java/io/grpc/ManagedChannelProvider.java
index 2741e20e3e..3aaf749d6f 100644
--- a/core/src/main/java/io/grpc/ManagedChannelProvider.java
+++ b/core/src/main/java/io/grpc/ManagedChannelProvider.java
@@ -133,6 +133,8 @@ public abstract class ManagedChannelProvider {
   protected abstract ManagedChannelBuilder<?> builderForTarget(String target);
 
   public static final class ProviderNotFoundException extends RuntimeException {
+    private static final long serialVersionUID = 1;
+
     public ProviderNotFoundException(String msg) {
       super(msg);
     }
diff --git a/core/src/main/java/io/grpc/inprocess/InProcessSocketAddress.java b/core/src/main/java/io/grpc/inprocess/InProcessSocketAddress.java
index 49b3ae7f5a..dc7ab3b1ce 100644
--- a/core/src/main/java/io/grpc/inprocess/InProcessSocketAddress.java
+++ b/core/src/main/java/io/grpc/inprocess/InProcessSocketAddress.java
@@ -37,6 +37,8 @@ import java.net.SocketAddress;
  * Custom SocketAddress class for {@link InProcessTransport}.
  */
 public class InProcessSocketAddress extends SocketAddress {
+  private static final long serialVersionUID = -2803441206326023474L;
+
   private final String name;
 
   public InProcessSocketAddress(String name) {