xds: not use Immutable collections in method signature

This commit is contained in:
ZHANG Dapeng 2019-11-07 15:18:59 -08:00 committed by GitHub
parent b38d3ee571
commit 6d3fb53128
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions

View File

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