fix style

YifeiZhuang · Nov 21, 2023 · fc38e2b · fc38e2b
1 parent cd522c0
commit fc38e2b
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -366,7 +366,8 @@ public <ReqT, RespT> Listener<ReqT> interceptCall(ServerCall<ReqT, RespT> 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
@@ -800,7 +800,7 @@ <T extends ResourceUpdate> void watchXdsResource(XdsResourceType<T> type, String
     <T extends ResourceUpdate> void watchXdsResource(XdsResourceType<T> resourceType,
                                                      String resourceName,
                                                      ResourceWatcher<T> 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
@@ -1195,7 +1195,7 @@ <T extends ResourceUpdate> void watchXdsResource(XdsResourceType<T> type, String
     @SuppressWarnings("unchecked")
     <T extends ResourceUpdate> void watchXdsResource(XdsResourceType<T> type, String resourceName,
                                                      ResourceWatcher<T> watcher,
-                                                     SynchronizationContext synchronizationContext) {
+                                                     SynchronizationContext syncContext) {
       assertThat(type.typeName()).isEqualTo("EDS");
       assertThat(watchers).doesNotContainKey(resourceName);
       watchers.put(resourceName, (ResourceWatcher<EdsUpdate>) watcher);

diff --git a/xds/src/test/java/io/grpc/xds/XdsNameResolverTest.java b/xds/src/test/java/io/grpc/xds/XdsNameResolverTest.java
@@ -1941,7 +1941,7 @@ <T extends ResourceUpdate> void watchXdsResource(XdsResourceType<T> resourceType
     <T extends ResourceUpdate> void watchXdsResource(XdsResourceType<T> resourceType,
                                                      String resourceName,
                                                      ResourceWatcher<T> 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
@@ -198,12 +198,13 @@ <T extends ResourceUpdate> void watchXdsResource(XdsResourceType<T> resourceType
         default:
       }
     }
+
     @Override
     @SuppressWarnings("unchecked")
     <T extends ResourceUpdate> void watchXdsResource(XdsResourceType<T> resourceType,
                                                      String resourceName,
                                                      ResourceWatcher<T> watcher,
-                                                     SynchronizationContext synchronizationContext) {
+                                                     SynchronizationContext syncContext) {
       watchXdsResource(resourceType, resourceName, watcher);
     }