flasn4nt
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xds: fix lint warnings (#6869)

This commit is contained in:
Kun Zhang 2020-03-27 16:04:11 -07:00 committed by GitHub
parent c7f69c851b
commit e28bb1975f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xds/src/main/java/io/grpc/xds/XdsClientWrapperForServerSds.java
View File

@ -67,7 +67,7 @@ public final class XdsClientWrapperForServerSds {
private EnvoyServerProtoData.Listener curListener; private EnvoyServerProtoData.Listener curListener;
// TODO(sanjaypujare): implement shutting down XdsServer which will need xdsClient reference // TODO(sanjaypujare): implement shutting down XdsServer which will need xdsClient reference
@SuppressWarnings("unused") @SuppressWarnings("unused")
@Nullable private XdsClient xdsClient; @Nullable private final XdsClient xdsClient;
private final int port; private final int port;
private final ScheduledExecutorService timeService; private final ScheduledExecutorService timeService;
@ -158,7 +158,7 @@ public final class XdsClientWrapperForServerSds {
} }
private static final class FilterChainComparator implements Comparator<FilterChain> { private static final class FilterChainComparator implements Comparator<FilterChain> {
private InetSocketAddress localAddress; private final InetSocketAddress localAddress;
private enum Match { private enum Match {
NO_MATCH, NO_MATCH,

2
xds/src/test/java/io/grpc/xds/XdsClientWrapperForServerSdsTest.java
View File

@ -137,7 +137,7 @@ public class XdsClientWrapperForServerSdsTest {
@Mock private Channel channel; @Mock private Channel channel;
private XdsClientWrapperForServerSds xdsClientWrapperForServerSds; private XdsClientWrapperForServerSds xdsClientWrapperForServerSds;
private DownstreamTlsContext[] tlsContexts = new DownstreamTlsContext[3]; private final DownstreamTlsContext[] tlsContexts = new DownstreamTlsContext[3];
@Before @Before
public void setUp() throws IOException { public void setUp() throws IOException {

3
xds/src/test/java/io/grpc/xds/XdsClientWrapperForServerSdsTestMisc.java
View File

@ -22,7 +22,6 @@ import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import static org.mockito.internal.verification.VerificationModeFactory.times;
import io.envoyproxy.envoy.api.v2.auth.DownstreamTlsContext; import io.envoyproxy.envoy.api.v2.auth.DownstreamTlsContext;
import io.grpc.inprocess.InProcessSocketAddress; import io.grpc.inprocess.InProcessSocketAddress;
@ -61,7 +60,7 @@ public class XdsClientWrapperForServerSdsTestMisc {
@Test @Test
public void verifyListenerWatcherRegistered() { public void verifyListenerWatcherRegistered() {
verify(xdsClient, times(1)).watchListenerData(eq(PORT), any(XdsClient.ListenerWatcher.class)); verify(xdsClient).watchListenerData(eq(PORT), any(XdsClient.ListenerWatcher.class));
} }
@Test @Test