Merge branch 'FixIssue-11194' of https://github.com/SreeramdasLavanya/grpc-java into FixIssue-11194

Author: shivaspeaks

api/src/main/java/io/grpc/LoadBalancer.java

@@ -163,8 +163,7 @@ public String toString() {
    * @param resolvedAddresses the resolved server addresses, attributes, and config.
    * @since 1.21.0
    *
-   * @deprecated  As of release 1.69.0, use instead
-   *     {@link #acceptResolvedAddresses(ResolvedAddresses)}
+   * @deprecated  Use instead {@link #acceptResolvedAddresses(ResolvedAddresses)}
    */
   @Deprecated
   public void handleResolvedAddresses(ResolvedAddresses resolvedAddresses) {
@@ -181,14 +180,9 @@ public void handleResolvedAddresses(ResolvedAddresses resolvedAddresses) {
    * EquivalentAddressGroup} addresses should be considered equivalent but may be flattened into a
    * single list if needed.
    *
-   * <p>Implementations can choose to reject the given addresses by returning
-   * {@code Status.UNAVAILABLE}.
-   *
-   * <p>Implementations should not modify the given {@code resolvedAddresses}.
-   *
-   * @param resolvedAddresses the resolved server addresses, attributes, and config.
-   * @return {@code Status.OK} if the resolved addresses were accepted. {@code Status.UNAVAILABLE}
-   *     if rejected.
+   * @param resolvedAddresses the resolved server addresses, attributes, and config
+   * @return {@code Status.OK} if the resolved addresses were accepted, otherwise an error to report
+   *     to the name resolver
    *
    * @since 1.49.0
    */

interop-testing/src/main/java/io/grpc/testing/integration/RpcBehaviorLoadBalancerProvider.java

@@ -110,6 +110,14 @@ protected LoadBalancer delegate() {
       return delegateLb;
     }
 
+    @Deprecated
+    @Override
+    public void handleResolvedAddresses(ResolvedAddresses resolvedAddresses) {
+      helper.setRpcBehavior(
+          ((RpcBehaviorConfig) resolvedAddresses.getLoadBalancingPolicyConfig()).rpcBehavior);
+      delegateLb.handleResolvedAddresses(resolvedAddresses);
+    }
+
     @Override
     public Status acceptResolvedAddresses(ResolvedAddresses resolvedAddresses) {
       helper.setRpcBehavior(

interop-testing/src/test/java/io/grpc/testing/integration/RpcBehaviorLoadBalancerProviderTest.java

@@ -78,13 +78,14 @@ public void parseInvalidConfig() {
     assertThat(status.getDescription()).contains("rpcBehavior");
   }
 
+  @Deprecated
   @Test
   public void handleResolvedAddressesDelegated() {
     RpcBehaviorLoadBalancer lb = new RpcBehaviorLoadBalancer(new RpcBehaviorHelper(mockHelper),
         mockDelegateLb);
     ResolvedAddresses resolvedAddresses = buildResolvedAddresses(buildConfig());
-    lb.acceptResolvedAddresses(resolvedAddresses);
-    verify(mockDelegateLb).acceptResolvedAddresses(resolvedAddresses);
+    lb.handleResolvedAddresses(resolvedAddresses);
+    verify(mockDelegateLb).handleResolvedAddresses(resolvedAddresses);
   }
 
   @Test

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

@@ -29,22 +29,12 @@ public abstract class ForwardingLoadBalancer extends LoadBalancer {
    */
   protected abstract LoadBalancer delegate();
 
-  /**
-   * Handles newly resolved addresses and metadata attributes from name resolution system.
-   *
-   * @deprecated  As of release 1.69.0,
-   *     use instead {@link #acceptResolvedAddresses(ResolvedAddresses)}
-   */
   @Deprecated
+  @Override
   public void handleResolvedAddresses(ResolvedAddresses resolvedAddresses) {
     delegate().handleResolvedAddresses(resolvedAddresses);
   }
 
-  @Override
-  public Status acceptResolvedAddresses(ResolvedAddresses resolvedAddresses) {
-    return delegate().acceptResolvedAddresses(resolvedAddresses);
-  }
-
   @Override
   public void handleNameResolutionError(Status error) {
     delegate().handleNameResolutionError(error);

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

@@ -49,9 +49,6 @@
 @NotThreadSafe // Must be accessed in SynchronizationContext
 public final class GracefulSwitchLoadBalancer extends ForwardingLoadBalancer {
   private final LoadBalancer defaultBalancer = new LoadBalancer() {
-    /**
-     * Handles newly resolved addresses and metadata attributes from name resolution system.
-     */
     @Override
     public Status acceptResolvedAddresses(ResolvedAddresses resolvedAddresses) {
       throw new AssertionError("real LB is called instead");
@@ -87,12 +84,6 @@ public GracefulSwitchLoadBalancer(Helper helper) {
     this.helper = checkNotNull(helper, "helper");
   }
 
-  /**
-   * Handles newly resolved addresses and metadata attributes from name resolution system.
-   *
-   * @deprecated  As of release 1.69.0,
-   *     use instead {@link #acceptResolvedAddresses(ResolvedAddresses)}
-   */
   @Deprecated
   @Override
   public void handleResolvedAddresses(ResolvedAddresses resolvedAddresses) {

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

@@ -20,6 +20,7 @@
 
 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,7 +44,7 @@ public void allMethodsForwarded() throws Exception {
         LoadBalancer.class,
         mockDelegate,
         new TestBalancer(),
-        Arrays.asList()
-    );
+        Arrays.asList(
+            LoadBalancer.class.getMethod("acceptResolvedAddresses", ResolvedAddresses.class)));
   }
 }

xds/src/test/java/io/grpc/xds/MetadataLoadBalancerProvider.java

@@ -107,12 +107,6 @@ protected LoadBalancer delegate() {
       return delegateLb;
     }
 
-    /**
-     * Handles newly resolved addresses and metadata attributes from name resolution system.
-     *
-     * @deprecated  As of release 1.69.0,
-     *     use instead {@link #acceptResolvedAddresses(ResolvedAddresses)}
-     */
     @Deprecated
     @Override
     public void handleResolvedAddresses(ResolvedAddresses resolvedAddresses) {

xds/src/test/java/io/grpc/xds/PriorityLoadBalancerTest.java

@@ -991,7 +991,7 @@ public Status acceptResolvedAddresses(ResolvedAddresses resolvedAddresses) {
     @Override
     public void handleNameResolutionError(Status error) {
     }
-    
+
     @Override
     public void shutdown() {
     }