commit 00d4cc29ad9245a277530d4e5421d5823264cb74
author Chengyuan Zhang <chengyuanzhang@google.com> Thu May 23 01:05:22 2019 -0700
committer GitHub <noreply@github.com> Thu May 23 01:05:22 2019 -0700
tree ef04962849e4973216136caee9c337d90e4e14b2
parent 54bbd372ef34a66a777569216ba303b9c9f1d55f

all: fix lint (#5770)

* fixed lint warnings

* remove unused arg for subchannel

api/src/test/java/io/grpc/LoadBalancerTest.java

diff --git a/api/src/test/java/io/grpc/LoadBalancerTest.java b/api/src/test/java/io/grpc/LoadBalancerTest.java
index 9492d2d..4bbac63 100644
--- a/api/src/test/java/io/grpc/LoadBalancerTest.java
+++ b/api/src/test/java/io/grpc/LoadBalancerTest.java
@@ -24,7 +24,6 @@
 import io.grpc.LoadBalancer.PickResult;
 import io.grpc.LoadBalancer.ResolvedAddresses;
 import io.grpc.LoadBalancer.Subchannel;
-import io.grpc.LoadBalancer.SubchannelStateListener;
 import java.net.SocketAddress;
 import java.util.Arrays;
 import java.util.List;
@@ -38,8 +37,6 @@
 public class LoadBalancerTest {
   private final Subchannel subchannel = mock(Subchannel.class);
   private final Subchannel subchannel2 = mock(Subchannel.class);
-  private final SubchannelStateListener subchannelStateListener =
-      mock(SubchannelStateListener.class);
   private final ClientStreamTracer.Factory tracerFactory = mock(ClientStreamTracer.Factory.class);
   private final Status status = Status.UNAVAILABLE.withDescription("for test");
   private final Status status2 = Status.UNAVAILABLE.withDescription("for test 2");
@@ -127,6 +124,7 @@
 
   @Deprecated
   @Test
+  @SuppressWarnings("deprecation")
   public void helper_createSubchannel_old_delegates() {
     class OverrideCreateSubchannel extends NoopHelper {
       boolean ran;

core/src/main/java/io/grpc/internal/ManagedChannelImpl.java

diff --git a/core/src/main/java/io/grpc/internal/ManagedChannelImpl.java b/core/src/main/java/io/grpc/internal/ManagedChannelImpl.java
index b75b9e3..6cb2d1b 100644
--- a/core/src/main/java/io/grpc/internal/ManagedChannelImpl.java
+++ b/core/src/main/java/io/grpc/internal/ManagedChannelImpl.java
@@ -1053,6 +1053,7 @@
 
     @Deprecated
     @Override
+    @SuppressWarnings("deprecation")
     public AbstractSubchannel createSubchannel(
         List<EquivalentAddressGroup> addressGroups, Attributes attrs) {
       logWarningIfNotInSyncContext("createSubchannel()");

core/src/test/java/io/grpc/internal/ManagedChannelImplTest.java

diff --git a/core/src/test/java/io/grpc/internal/ManagedChannelImplTest.java b/core/src/test/java/io/grpc/internal/ManagedChannelImplTest.java
index 2af7397..3756cc2 100644
--- a/core/src/test/java/io/grpc/internal/ManagedChannelImplTest.java
+++ b/core/src/test/java/io/grpc/internal/ManagedChannelImplTest.java
@@ -340,6 +340,7 @@
 
   @Deprecated
   @Test
+  @SuppressWarnings("deprecation")
   public void createSubchannel_old_outsideSynchronizationContextShouldLogWarning() {
     createChannel();
     final AtomicReference<LogRecord> logRef = new AtomicReference<>();
@@ -373,6 +374,7 @@
 
   @Deprecated
   @Test
+  @SuppressWarnings("deprecation")
   public void createSubchannel_old_propagateSubchannelStatesToOldApi() {
     createChannel();
     final AtomicReference<Subchannel> subchannelCapture = new AtomicReference<>();

services/src/test/java/io/grpc/services/HealthCheckingLoadBalancerFactoryTest.java

diff --git a/services/src/test/java/io/grpc/services/HealthCheckingLoadBalancerFactoryTest.java b/services/src/test/java/io/grpc/services/HealthCheckingLoadBalancerFactoryTest.java
index ea01beb..20747bf 100644
--- a/services/src/test/java/io/grpc/services/HealthCheckingLoadBalancerFactoryTest.java
+++ b/services/src/test/java/io/grpc/services/HealthCheckingLoadBalancerFactoryTest.java
@@ -466,7 +466,7 @@
     inOrder.verify(backoffPolicy1).nextBackoffNanos();
     assertThat(clock.getPendingTasks()).hasSize(1);
 
-    verifyRetryAfterNanos(inOrder, mockListener, subchannel, healthImpl, 11);
+    verifyRetryAfterNanos(inOrder, mockListener, healthImpl, 11);
     assertThat(clock.getPendingTasks()).isEmpty();
 
     subchannel.logs.clear();
@@ -485,7 +485,7 @@
     // Retry with backoff
     inOrder.verify(backoffPolicy1).nextBackoffNanos();
 
-    verifyRetryAfterNanos(inOrder, mockListener, subchannel, healthImpl, 21);
+    verifyRetryAfterNanos(inOrder, mockListener, healthImpl, 21);
 
     // Server responds this time
     healthImpl.calls.poll().responseObserver.onNext(makeResponse(ServingStatus.SERVING));
@@ -535,7 +535,7 @@
     inOrder.verify(backoffPolicy1).nextBackoffNanos();
     assertThat(clock.getPendingTasks()).hasSize(1);
 
-    verifyRetryAfterNanos(inOrder, mockStateListener, subchannel, healthImpl, 11);
+    verifyRetryAfterNanos(inOrder, mockStateListener, healthImpl, 11);
     assertThat(clock.getPendingTasks()).isEmpty();
 
     // Server responds
@@ -573,11 +573,11 @@
     // Retry with a new backoff policy
     inOrder.verify(backoffPolicy2).nextBackoffNanos();
 
-    verifyRetryAfterNanos(inOrder, mockStateListener, subchannel, healthImpl, 12);
+    verifyRetryAfterNanos(inOrder, mockStateListener, healthImpl, 12);
   }
 
   private void verifyRetryAfterNanos(
-      InOrder inOrder, SubchannelStateListener listener, Subchannel subchannel, HealthImpl impl,
+      InOrder inOrder, SubchannelStateListener listener, HealthImpl impl,
       long nanos) {
     assertThat(impl.calls).isEmpty();
     clock.forwardNanos(nanos - 1);