address comments

Author: shivaspeaks

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

@@ -116,13 +116,6 @@ public Status acceptResolvedAddresses(ResolvedAddresses resolvedAddresses) {
           ((RpcBehaviorConfig) resolvedAddresses.getLoadBalancingPolicyConfig()).rpcBehavior);
       return delegateLb.acceptResolvedAddresses(resolvedAddresses);
     }
-
-    @Override
-    public Status acceptResolvedAddresses(ResolvedAddresses resolvedAddresses) {
-      helper.setRpcBehavior(
-          ((RpcBehaviorConfig) resolvedAddresses.getLoadBalancingPolicyConfig()).rpcBehavior);
-      return delegateLb.acceptResolvedAddresses(resolvedAddresses);
-    }
   }
 
   /**

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

@@ -36,9 +36,8 @@ public abstract class ForwardingLoadBalancer extends LoadBalancer {
    *     use instead {@link #acceptResolvedAddresses(ResolvedAddresses)}
    */
   @Deprecated
-  @SuppressWarnings("all")
   public void handleResolvedAddresses(ResolvedAddresses resolvedAddresses) {
-    acceptResolvedAddresses(resolvedAddresses);
+    delegate().handleResolvedAddresses(resolvedAddresses);
   }
 
   @Override

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

@@ -51,11 +51,7 @@ public final class GracefulSwitchLoadBalancer extends ForwardingLoadBalancer {
   private final LoadBalancer defaultBalancer = new LoadBalancer() {
     /**
      * 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 Status acceptResolvedAddresses(ResolvedAddresses resolvedAddresses) {
       throw new AssertionError("real LB is called instead");

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

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

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

@@ -147,7 +147,6 @@ public void tearDown() {
     assertThat(fakeClock.getPendingTasks()).isEmpty();
   }
 
-  @Deprecated
   @Test
   public void acceptResolvedAddresses() {
     SocketAddress socketAddress = new InetSocketAddress(8080);
@@ -242,7 +241,6 @@ public void acceptResolvedAddresses() {
     verify(barBalancer0, never()).shutdown();
   }
 
-  @Deprecated
   @Test
   public void acceptResolvedAddresses_propagatesChildFailures() {
     LoadBalancerProvider lbProvider = new CannedLoadBalancer.Provider();
@@ -336,7 +334,6 @@ public void handleNameResolutionError() {
     verify(fooLb1).handleNameResolutionError(status);
   }
 
-  @Deprecated
   @Test
   public void typicalPriorityFailOverFlow() {
     PriorityChildConfig priorityChildConfig0 =
@@ -482,7 +479,6 @@ public PickResult pickSubchannel(PickSubchannelArgs args) {
     verify(balancer3).shutdown();
   }
 
-  @Deprecated
   @Test
   public void idleToConnectingDoesNotTriggerFailOver() {
     PriorityChildConfig priorityChildConfig0 =
@@ -519,7 +515,6 @@ public void idleToConnectingDoesNotTriggerFailOver() {
     assertThat(fooHelpers).hasSize(1);
   }
 
-  @Deprecated
   @Test
   public void connectingResetFailOverIfSeenReadyOrIdleSinceTransientFailure() {
     PriorityChildConfig priorityChildConfig0 =
@@ -561,7 +556,6 @@ public void connectingResetFailOverIfSeenReadyOrIdleSinceTransientFailure() {
     assertThat(fooHelpers).hasSize(2);
   }
 
-  @Deprecated
   @Test
   public void failoverTimerNotRestartedOnDupConnecting() {
     InOrder inOrder = inOrder(helper);
@@ -668,7 +662,6 @@ public PickResult pickSubchannel(PickSubchannelArgs args) {
     assertThat(fooHelpers).hasSize(1);
   }
 
-  @Deprecated
   @Test
   public void typicalPriorityFailOverFlowWithIdleUpdate() {
     PriorityChildConfig priorityChildConfig0 =
@@ -784,7 +777,6 @@ public void typicalPriorityFailOverFlowWithIdleUpdate() {
     verify(balancer3).shutdown();
   }
 
-  @Deprecated
   @Test
   public void failover_propagatesChildFailures() {
     LoadBalancerProvider lbProvider = new CannedLoadBalancer.Provider();
@@ -862,7 +854,6 @@ public void bypassReresolutionRequestsIfConfiged() {
     verify(helper).refreshNameResolution();
   }
 
-  @Deprecated
   @Test
   public void raceBetweenShutdownAndChildLbBalancingStateUpdate() {
     PriorityChildConfig priorityChildConfig0 =
@@ -888,7 +879,6 @@ public void raceBetweenShutdownAndChildLbBalancingStateUpdate() {
     verifyNoMoreInteractions(helper);
   }
 
-  @Deprecated
   @Test
   public void noDuplicateOverallBalancingStateUpdate() {
     FakeLoadBalancerProvider fakeLbProvider = new FakeLoadBalancerProvider();
@@ -991,7 +981,6 @@ static class FakeLoadBalancer extends LoadBalancer {
       this.helper = helper;
     }
 
-    @Deprecated
     @Override
     public Status acceptResolvedAddresses(ResolvedAddresses resolvedAddresses) {
       helper.updateBalancingState(
@@ -1002,7 +991,7 @@ public Status acceptResolvedAddresses(ResolvedAddresses resolvedAddresses) {
     @Override
     public void handleNameResolutionError(Status error) {
     }
-
+    
     @Override
     public void shutdown() {
     }

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

@@ -181,7 +181,6 @@ public void tearDown() {
     }
   }
 
-  @Deprecated
   @Test
   public void acceptResolvedAddresses() {
     ArgumentCaptor<ResolvedAddresses> resolvedAddressesCaptor =
@@ -274,7 +273,6 @@ public void acceptResolvedAddresses() {
     }
   }
 
-  @Deprecated
   @Test
   public void handleNameResolutionError() {
     ArgumentCaptor<SubchannelPicker> pickerCaptor = ArgumentCaptor.forClass(SubchannelPicker.class);
@@ -313,7 +311,6 @@ public void handleNameResolutionError() {
     }
   }
 
-  @Deprecated
   @Test
   public void balancingStateUpdatedFromChildBalancers() {
     Map<String, WeightedPolicySelection> targets = ImmutableMap.of(
@@ -402,7 +399,6 @@ public void balancingStateUpdatedFromChildBalancers() {
             new WeightedChildPicker(weights[3], failurePickers[3]));
   }
 
-  @Deprecated
   @Test
   public void raceBetweenShutdownAndChildLbBalancingStateUpdate() {
     Map<String, WeightedPolicySelection> targets = ImmutableMap.of(
@@ -425,7 +421,6 @@ public void raceBetweenShutdownAndChildLbBalancingStateUpdate() {
 
   // When the ChildHelper is asked to update the overall balancing state, it should not do that if
   // the update was triggered by the parent LB that will handle triggering the overall state update.
-  @Deprecated
   @Test
   public void noDuplicateOverallBalancingStateUpdate() {
     FakeLoadBalancerProvider fakeLbProvider = new FakeLoadBalancerProvider();
@@ -483,7 +478,6 @@ static class FakeLoadBalancer extends LoadBalancer {
       this.helper = helper;
     }
 
-    @Deprecated
     @Override
     public Status acceptResolvedAddresses(ResolvedAddresses resolvedAddresses) {
       helper.updateBalancingState(

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

@@ -107,7 +107,6 @@ public void setUp() {
     loadBalancer = new WrrLocalityLoadBalancer(mockHelper, lbRegistry);
   }
 
-  @Deprecated
   @Test
   public void acceptResolvedAddresses() {
     // A two locality cluster with a mock child LB policy.
@@ -174,7 +173,6 @@ public void handleNameResolutionError_withChildLb() {
     verify(mockWeightedTargetLb).handleNameResolutionError(status);
   }
 
-  @Deprecated
   @Test
   public void localityWeightAttributeNotPropagated() {
     Object childPolicy = newChildConfig(mockChildProvider, null);
@@ -214,7 +212,6 @@ private Object newChildConfig(LoadBalancerProvider provider, Object config) {
     return GracefulSwitchLoadBalancer.createLoadBalancingPolicyConfig(provider, config);
   }
 
-  @Deprecated
   private void deliverAddresses(WrrLocalityConfig config, List<EquivalentAddressGroup> addresses) {
     loadBalancer.acceptResolvedAddresses(
         ResolvedAddresses.newBuilder().setAddresses(addresses).setLoadBalancingPolicyConfig(config)