From fc38e2b9813c12f83ba2aa12b029384791b2102c Mon Sep 17 00:00:00 2001 From: yifeizhuang Date: Mon, 20 Nov 2023 18:12:15 -0800 Subject: [PATCH] fix style --- xds/src/main/java/io/grpc/xds/ClusterResolverLoadBalancer.java | 3 ++- xds/src/main/java/io/grpc/xds/XdsClientImpl.java | 1 - xds/src/main/java/io/grpc/xds/XdsNameResolver.java | 3 ++- xds/src/main/java/io/grpc/xds/XdsServerWrapper.java | 3 ++- xds/src/test/java/io/grpc/xds/CdsLoadBalancer2Test.java | 2 +- .../test/java/io/grpc/xds/ClusterResolverLoadBalancerTest.java | 2 +- xds/src/test/java/io/grpc/xds/XdsNameResolverTest.java | 2 +- xds/src/test/java/io/grpc/xds/XdsServerTestHelper.java | 3 ++- 8 files changed, 11 insertions(+), 8 deletions(-) diff --git a/xds/src/main/java/io/grpc/xds/ClusterResolverLoadBalancer.java b/xds/src/main/java/io/grpc/xds/ClusterResolverLoadBalancer.java index 67b17f7cb2a..42e7120f8a7 100644 --- a/xds/src/main/java/io/grpc/xds/ClusterResolverLoadBalancer.java +++ b/xds/src/main/java/io/grpc/xds/ClusterResolverLoadBalancer.java @@ -366,7 +366,8 @@ private EdsClusterState(String name, @Nullable String edsServiceName, void start() { String resourceName = edsServiceName != null ? edsServiceName : name; logger.log(XdsLogLevel.INFO, "Start watching EDS resource {0}", resourceName); - xdsClient.watchXdsResource(XdsEndpointResource.getInstance(), resourceName, this, syncContext); + xdsClient.watchXdsResource(XdsEndpointResource.getInstance(), + resourceName, this, syncContext); } @Override diff --git a/xds/src/main/java/io/grpc/xds/XdsClientImpl.java b/xds/src/main/java/io/grpc/xds/XdsClientImpl.java index 8edec2c19d1..848fd1a564d 100644 --- a/xds/src/main/java/io/grpc/xds/XdsClientImpl.java +++ b/xds/src/main/java/io/grpc/xds/XdsClientImpl.java @@ -54,7 +54,6 @@ import java.util.Collection; import java.util.Collections; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Objects; diff --git a/xds/src/main/java/io/grpc/xds/XdsNameResolver.java b/xds/src/main/java/io/grpc/xds/XdsNameResolver.java index cb0ac9d468f..a345c7eb263 100644 --- a/xds/src/main/java/io/grpc/xds/XdsNameResolver.java +++ b/xds/src/main/java/io/grpc/xds/XdsNameResolver.java @@ -682,7 +682,8 @@ public void onResourceDoesNotExist(final String resourceName) { private void start() { logger.log(XdsLogLevel.INFO, "Start watching LDS resource {0}", ldsResourceName); - xdsClient.watchXdsResource(XdsListenerResource.getInstance(), ldsResourceName, this, syncContext); + xdsClient.watchXdsResource(XdsListenerResource.getInstance(), + ldsResourceName, this, syncContext); } private void stop() { diff --git a/xds/src/main/java/io/grpc/xds/XdsServerWrapper.java b/xds/src/main/java/io/grpc/xds/XdsServerWrapper.java index 3ab1dbf30f6..8c15dca8ea2 100644 --- a/xds/src/main/java/io/grpc/xds/XdsServerWrapper.java +++ b/xds/src/main/java/io/grpc/xds/XdsServerWrapper.java @@ -366,7 +366,8 @@ public Listener interceptCall(ServerCall call, private DiscoveryState(String resourceName) { this.resourceName = checkNotNull(resourceName, "resourceName"); - xdsClient.watchXdsResource(XdsListenerResource.getInstance(), resourceName, this, syncContext); + xdsClient.watchXdsResource( + XdsListenerResource.getInstance(), resourceName, this, syncContext); } @Override diff --git a/xds/src/test/java/io/grpc/xds/CdsLoadBalancer2Test.java b/xds/src/test/java/io/grpc/xds/CdsLoadBalancer2Test.java index b248de21374..6f734056ef4 100644 --- a/xds/src/test/java/io/grpc/xds/CdsLoadBalancer2Test.java +++ b/xds/src/test/java/io/grpc/xds/CdsLoadBalancer2Test.java @@ -800,7 +800,7 @@ void watchXdsResource(XdsResourceType type, String void watchXdsResource(XdsResourceType resourceType, String resourceName, ResourceWatcher watcher, - SynchronizationContext synchronizationContext) { + SynchronizationContext syncContext) { watchXdsResource(resourceType, resourceName, watcher); } diff --git a/xds/src/test/java/io/grpc/xds/ClusterResolverLoadBalancerTest.java b/xds/src/test/java/io/grpc/xds/ClusterResolverLoadBalancerTest.java index 0b9bba6acac..d98c8ed929d 100644 --- a/xds/src/test/java/io/grpc/xds/ClusterResolverLoadBalancerTest.java +++ b/xds/src/test/java/io/grpc/xds/ClusterResolverLoadBalancerTest.java @@ -1195,7 +1195,7 @@ void watchXdsResource(XdsResourceType type, String @SuppressWarnings("unchecked") void watchXdsResource(XdsResourceType type, String resourceName, ResourceWatcher watcher, - SynchronizationContext synchronizationContext) { + SynchronizationContext syncContext) { assertThat(type.typeName()).isEqualTo("EDS"); assertThat(watchers).doesNotContainKey(resourceName); watchers.put(resourceName, (ResourceWatcher) watcher); diff --git a/xds/src/test/java/io/grpc/xds/XdsNameResolverTest.java b/xds/src/test/java/io/grpc/xds/XdsNameResolverTest.java index d96153a553d..351c6dc71e1 100644 --- a/xds/src/test/java/io/grpc/xds/XdsNameResolverTest.java +++ b/xds/src/test/java/io/grpc/xds/XdsNameResolverTest.java @@ -1941,7 +1941,7 @@ void watchXdsResource(XdsResourceType resourceType void watchXdsResource(XdsResourceType resourceType, String resourceName, ResourceWatcher watcher, - SynchronizationContext synchronizationContext) { + SynchronizationContext syncContext) { watchXdsResource(resourceType, resourceName, watcher); } diff --git a/xds/src/test/java/io/grpc/xds/XdsServerTestHelper.java b/xds/src/test/java/io/grpc/xds/XdsServerTestHelper.java index 2c37fabd49a..f499c0462c3 100644 --- a/xds/src/test/java/io/grpc/xds/XdsServerTestHelper.java +++ b/xds/src/test/java/io/grpc/xds/XdsServerTestHelper.java @@ -198,12 +198,13 @@ void watchXdsResource(XdsResourceType resourceType default: } } + @Override @SuppressWarnings("unchecked") void watchXdsResource(XdsResourceType resourceType, String resourceName, ResourceWatcher watcher, - SynchronizationContext synchronizationContext) { + SynchronizationContext syncContext) { watchXdsResource(resourceType, resourceName, watcher); }