commit 1b23cf4f39ab26728336edbda8bb6af22dfe0a01
author Chengyuan Zhang <chengyuanzhang@google.com> Fri Jan 15 17:03:39 2021 -0800
committer GitHub <noreply@github.com> Fri Jan 15 17:03:39 2021 -0800
tree 45dc56f3d8d5789bcf970cb14d2ea752837cc784
parent 4130c5a1b8016656081258f1ceff393b59b9c7b2

xds: fix lint warnings (#7817)

xds/src/main/java/io/grpc/xds/InternalXdsAttributes.java

diff --git a/xds/src/main/java/io/grpc/xds/InternalXdsAttributes.java b/xds/src/main/java/io/grpc/xds/InternalXdsAttributes.java
index 229bcff..5fc06b9 100644
--- a/xds/src/main/java/io/grpc/xds/InternalXdsAttributes.java
+++ b/xds/src/main/java/io/grpc/xds/InternalXdsAttributes.java
@@ -44,7 +44,7 @@
    */
   @NameResolver.ResolutionResultAttr
   static final Attributes.Key<ObjectPool<XdsClient>> XDS_CLIENT_POOL =
-      Attributes.Key.create("io.grpc.xds.XdsAttributes.xdsClientPool");
+      Attributes.Key.create("io.grpc.xds.InternalXdsAttributes.xdsClientPool");
 
   /**
    * Attribute key for obtaining the global provider that provides atomics for aggregating
@@ -52,7 +52,7 @@
    */
   @NameResolver.ResolutionResultAttr
   static final Attributes.Key<CallCounterProvider> CALL_COUNTER_PROVIDER =
-      Attributes.Key.create("io.grpc.xds.XdsAttributes.callCounterProvider");
+      Attributes.Key.create("io.grpc.xds.InternalXdsAttributes.callCounterProvider");
 
   /**
    * Name of the cluster that provides this EquivalentAddressGroup.
@@ -65,7 +65,7 @@
   // TODO (chengyuanzhang): temporary solution for migrating to LRS policy. Should access
   //   stats object via XdsClient interface.
   static final Attributes.Key<LoadStatsStore> ATTR_CLUSTER_SERVICE_LOAD_STATS_STORE =
-      Attributes.Key.create("io.grpc.xds.XdsAttributes.loadStatsStore");
+      Attributes.Key.create("io.grpc.xds.InternalXdsAttributes.loadStatsStore");
 
   private InternalXdsAttributes() {}
 }

xds/src/main/java/io/grpc/xds/XdsClient.java

diff --git a/xds/src/main/java/io/grpc/xds/XdsClient.java b/xds/src/main/java/io/grpc/xds/XdsClient.java
index 4aae1cc..8da3601 100644
--- a/xds/src/main/java/io/grpc/xds/XdsClient.java
+++ b/xds/src/main/java/io/grpc/xds/XdsClient.java
@@ -85,7 +85,7 @@
         return false;
       }
       LdsUpdate that = (LdsUpdate) o;
-      return Objects.equals(httpMaxStreamDurationNano, that.httpMaxStreamDurationNano)
+      return httpMaxStreamDurationNano == that.httpMaxStreamDurationNano
           && Objects.equals(rdsName, that.rdsName)
           && Objects.equals(virtualHosts, that.virtualHosts);
     }

xds/src/test/java/io/grpc/xds/XdsNameResolverTest.java

diff --git a/xds/src/test/java/io/grpc/xds/XdsNameResolverTest.java b/xds/src/test/java/io/grpc/xds/XdsNameResolverTest.java
index 2083876..7df19c0 100644
--- a/xds/src/test/java/io/grpc/xds/XdsNameResolverTest.java
+++ b/xds/src/test/java/io/grpc/xds/XdsNameResolverTest.java
@@ -243,7 +243,6 @@
             Collections.singletonList(route2)));
   }
 
-  @SuppressWarnings("unchecked")
   @Test
   public void resolved_noTimeout() {
     resolver.start(mockListener);