From a157052117b13436e1227a0d9371fc23a8ec1212 Mon Sep 17 00:00:00 2001
From: Kun Zhang <zhangkun83@users.noreply.github.com>
Date: Mon, 8 Apr 2019 15:34:52 -0700
Subject: [PATCH] core: make the LoadBalancer.handleResolvedAddressGroups()
 change backward compatible. (#5563)

This will give time for pre-existing external callers (e.g.,
forwarding LoadBalancers) to migrate to the new handleResolvedAddresses().
---
 core/src/main/java/io/grpc/LoadBalancer.java  |  3 +-
 .../test/java/io/grpc/LoadBalancerTest.java   | 70 +++++++++++++++++++
 2 files changed, 72 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/io/grpc/LoadBalancer.java b/core/src/main/java/io/grpc/LoadBalancer.java
index 9a2dcd29e7..e9f0b61844 100644
--- a/core/src/main/java/io/grpc/LoadBalancer.java
+++ b/core/src/main/java/io/grpc/LoadBalancer.java
@@ -131,7 +131,8 @@ public abstract class LoadBalancer {
   public void handleResolvedAddressGroups(
       List<EquivalentAddressGroup> servers,
       @NameResolver.ResolutionResultAttr Attributes attributes) {
-    throw new UnsupportedOperationException("Not implemented");
+    handleResolvedAddresses(
+        ResolvedAddresses.newBuilder().setServers(servers).setAttributes(attributes).build());
   }
 
   /**
diff --git a/core/src/test/java/io/grpc/LoadBalancerTest.java b/core/src/test/java/io/grpc/LoadBalancerTest.java
index 4a55f05ecc..78e6ec764c 100644
--- a/core/src/test/java/io/grpc/LoadBalancerTest.java
+++ b/core/src/test/java/io/grpc/LoadBalancerTest.java
@@ -20,10 +20,12 @@ import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.mock;
 
 import io.grpc.LoadBalancer.PickResult;
+import io.grpc.LoadBalancer.ResolvedAddresses;
 import io.grpc.LoadBalancer.Subchannel;
 import java.net.SocketAddress;
 import java.util.Arrays;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -197,6 +199,74 @@ public class LoadBalancerTest {
     }.getAddresses();
   }
 
+  @Deprecated
+  @Test
+  public void handleResolvedAddressGroups_delegatesToHandleResolvedAddresses() {
+    final AtomicReference<ResolvedAddresses> resultCapture = new AtomicReference<>();
+
+    LoadBalancer balancer = new LoadBalancer() {
+        @Override
+        public void handleResolvedAddresses(ResolvedAddresses resolvedAddresses) {
+          resultCapture.set(resolvedAddresses);
+        }
+
+        @Override
+        public void handleNameResolutionError(Status error) {
+        }
+
+        @Override
+        public void handleSubchannelState(Subchannel subchannel, ConnectivityStateInfo state) {
+        }
+
+        @Override
+        public void shutdown() {
+        }
+      };
+
+    List<EquivalentAddressGroup> servers = Arrays.asList(
+        new EquivalentAddressGroup(new SocketAddress(){}),
+        new EquivalentAddressGroup(new SocketAddress(){}));
+    balancer.handleResolvedAddressGroups(servers, attrs);
+    assertThat(resultCapture.get()).isEqualTo(
+        ResolvedAddresses.newBuilder().setServers(servers).setAttributes(attrs).build());
+  }
+
+  @Deprecated
+  @Test
+  public void handleResolvedAddresses_delegatesToHandleResolvedAddressGroups() {
+    final AtomicReference<List<EquivalentAddressGroup>> serversCapture = new AtomicReference<>();
+    final AtomicReference<Attributes> attrsCapture = new AtomicReference<>();
+
+    LoadBalancer balancer = new LoadBalancer() {
+        @Override
+        public void handleResolvedAddressGroups(
+            List<EquivalentAddressGroup> servers, Attributes attrs) {
+          serversCapture.set(servers);
+          attrsCapture.set(attrs);
+        }
+
+        @Override
+        public void handleNameResolutionError(Status error) {
+        }
+
+        @Override
+        public void handleSubchannelState(Subchannel subchannel, ConnectivityStateInfo state) {
+        }
+
+        @Override
+        public void shutdown() {
+        }
+      };
+
+    List<EquivalentAddressGroup> servers = Arrays.asList(
+        new EquivalentAddressGroup(new SocketAddress(){}),
+        new EquivalentAddressGroup(new SocketAddress(){}));
+    balancer.handleResolvedAddresses(
+        ResolvedAddresses.newBuilder().setServers(servers).setAttributes(attrs).build());
+    assertThat(serversCapture.get()).isEqualTo(servers);
+    assertThat(attrsCapture.get()).isEqualTo(attrs);
+  }
+
   private static class NoopHelper extends LoadBalancer.Helper {
     @Override
     public ManagedChannel createOobChannel(EquivalentAddressGroup eag, String authority) {