Skip to content

Commit 361c4b8

Browse files
committed
Don't implement ForwardingLb.acceptResolvedAddresses()
Any old implementations that still implement handleResolvedAddresses() will have their implementationed "skipped" by new callers of acceptResolvedAddresses(). We've been having such forwarders implement both methods instead. Since there's very few usages of handleResolvedAddresses() left, out-of-tree implementations should generally be fine just swapping to acceptResolvedAddresses.
1 parent 66e17cf commit 361c4b8

2 files changed

Lines changed: 3 additions & 13 deletions

File tree

util/src/main/java/io/grpc/util/ForwardingLoadBalancer.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,22 +29,11 @@ public abstract class ForwardingLoadBalancer extends LoadBalancer {
2929
*/
3030
protected abstract LoadBalancer delegate();
3131

32-
/**
33-
* Handles newly resolved addresses and metadata attributes from name resolution system.
34-
*
35-
* @deprecated As of release 1.69.0,
36-
* use instead {@link #acceptResolvedAddresses(ResolvedAddresses)}
37-
*/
3832
@Deprecated
3933
public void handleResolvedAddresses(ResolvedAddresses resolvedAddresses) {
4034
delegate().handleResolvedAddresses(resolvedAddresses);
4135
}
4236

43-
@Override
44-
public Status acceptResolvedAddresses(ResolvedAddresses resolvedAddresses) {
45-
return delegate().acceptResolvedAddresses(resolvedAddresses);
46-
}
47-
4837
@Override
4938
public void handleNameResolutionError(Status error) {
5039
delegate().handleNameResolutionError(error);

util/src/test/java/io/grpc/util/ForwardingLoadBalancerTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
import io.grpc.ForwardingTestUtil;
2222
import io.grpc.LoadBalancer;
23+
import io.grpc.LoadBalancer.ResolvedAddresses;
2324
import java.util.Arrays;
2425
import org.junit.Test;
2526
import org.junit.runner.RunWith;
@@ -43,7 +44,7 @@ public void allMethodsForwarded() throws Exception {
4344
LoadBalancer.class,
4445
mockDelegate,
4546
new TestBalancer(),
46-
Arrays.asList()
47-
);
47+
Arrays.asList(
48+
LoadBalancer.class.getMethod("acceptResolvedAddresses", ResolvedAddresses.class)));
4849
}
4950
}

0 commit comments

Comments
 (0)