From f2b976266ef7cb32a3981a091745df1fb93c292f Mon Sep 17 00:00:00 2001 From: Terry Wilson Date: Fri, 14 Apr 2023 07:59:35 -0700 Subject: [PATCH] Revert "core: ForwardingLoadBalancer to forward acceptResolvedAddresses() (#10050)" This reverts commit 086edf0f205184a304a5e96649bddc8a2a52ea4e. --- core/src/main/java/io/grpc/util/ForwardingLoadBalancer.java | 5 ----- .../test/java/io/grpc/util/ForwardingLoadBalancerTest.java | 4 +++- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/io/grpc/util/ForwardingLoadBalancer.java b/core/src/main/java/io/grpc/util/ForwardingLoadBalancer.java index 516488f0d1..cefcbf344e 100644 --- a/core/src/main/java/io/grpc/util/ForwardingLoadBalancer.java +++ b/core/src/main/java/io/grpc/util/ForwardingLoadBalancer.java @@ -34,11 +34,6 @@ public abstract class ForwardingLoadBalancer extends LoadBalancer { delegate().handleResolvedAddresses(resolvedAddresses); } - @Override - public boolean acceptResolvedAddresses(ResolvedAddresses resolvedAddresses) { - return delegate().acceptResolvedAddresses(resolvedAddresses); - } - @Override public void handleNameResolutionError(Status error) { delegate().handleNameResolutionError(error); diff --git a/core/src/test/java/io/grpc/util/ForwardingLoadBalancerTest.java b/core/src/test/java/io/grpc/util/ForwardingLoadBalancerTest.java index 4e219906aa..f9b53400ce 100644 --- a/core/src/test/java/io/grpc/util/ForwardingLoadBalancerTest.java +++ b/core/src/test/java/io/grpc/util/ForwardingLoadBalancerTest.java @@ -20,6 +20,7 @@ import static org.mockito.Mockito.mock; import io.grpc.ForwardingTestUtil; import io.grpc.LoadBalancer; +import io.grpc.LoadBalancer.ResolvedAddresses; import java.util.Arrays; import org.junit.Test; import org.junit.runner.RunWith; @@ -43,6 +44,7 @@ public class ForwardingLoadBalancerTest { LoadBalancer.class, mockDelegate, new TestBalancer(), - Arrays.asList()); + Arrays.asList( + LoadBalancer.class.getMethod("acceptResolvedAddresses", ResolvedAddresses.class))); } }