From 6d3fb531285628f4ca7c8b281dabcddc0db2efc3 Mon Sep 17 00:00:00 2001
From: ZHANG Dapeng <zdapeng@google.com>
Date: Thu, 7 Nov 2019 15:18:59 -0800
Subject: [PATCH] xds: not use Immutable collections in method signature

---
 xds/src/main/java/io/grpc/xds/LocalityStore.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/xds/src/main/java/io/grpc/xds/LocalityStore.java b/xds/src/main/java/io/grpc/xds/LocalityStore.java
index 20debb4d48..fabefd3800 100644
--- a/xds/src/main/java/io/grpc/xds/LocalityStore.java
+++ b/xds/src/main/java/io/grpc/xds/LocalityStore.java
@@ -72,9 +72,9 @@ interface LocalityStore {
 
   void reset();
 
-  void updateLocalityStore(ImmutableMap<Locality, LocalityLbEndpoints> localityInfoMap);
+  void updateLocalityStore(Map<Locality, LocalityLbEndpoints> localityInfoMap);
 
-  void updateDropPercentage(ImmutableList<DropOverload> dropOverloads);
+  void updateDropPercentage(List<DropOverload> dropOverloads);
 
   void handleSubchannelState(Subchannel subchannel, ConnectivityStateInfo newState);
 
@@ -97,7 +97,7 @@ interface LocalityStore {
     private final Map<Locality, LocalityLbInfo> localityMap = new HashMap<>();
     // Most current set of localities instructed by traffic director
     private Set<Locality> localities = ImmutableSet.of();
-    private ImmutableList<DropOverload> dropOverloads = ImmutableList.of();
+    private List<DropOverload> dropOverloads = ImmutableList.of();
     private long metricsReportIntervalNano = -1;
 
     LocalityStoreImpl(Helper helper, LoadBalancerRegistry lbRegistry) {
@@ -132,13 +132,13 @@ interface LocalityStore {
 
     private static final class DroppablePicker extends SubchannelPicker {
 
-      final ImmutableList<DropOverload> dropOverloads;
+      final List<DropOverload> dropOverloads;
       final SubchannelPicker delegate;
       final ThreadSafeRandom random;
       final LoadStatsStore loadStatsStore;
 
       DroppablePicker(
-          ImmutableList<DropOverload> dropOverloads, SubchannelPicker delegate,
+          List<DropOverload> dropOverloads, SubchannelPicker delegate,
           ThreadSafeRandom random, LoadStatsStore loadStatsStore) {
         this.dropOverloads = dropOverloads;
         this.delegate = delegate;
@@ -204,7 +204,7 @@ interface LocalityStore {
     // This is triggered by EDS response.
     @Override
     public void updateLocalityStore(
-        final ImmutableMap<Locality, LocalityLbEndpoints> localityInfoMap) {
+        final Map<Locality, LocalityLbEndpoints> localityInfoMap) {
 
       Set<Locality> newLocalities = localityInfoMap.keySet();
       // TODO: put endPointWeights into attributes for WRR.
@@ -265,7 +265,7 @@ interface LocalityStore {
     }
 
     @Override
-    public void updateDropPercentage(ImmutableList<DropOverload> dropOverloads) {
+    public void updateDropPercentage(List<DropOverload> dropOverloads) {
       this.dropOverloads = checkNotNull(dropOverloads, "dropOverloads");
     }