diff --git a/api/src/main/java/io/grpc/LoadBalancer.java b/api/src/main/java/io/grpc/LoadBalancer.java index 786322698e..b41095215d 100644 --- a/api/src/main/java/io/grpc/LoadBalancer.java +++ b/api/src/main/java/io/grpc/LoadBalancer.java @@ -133,7 +133,7 @@ public abstract class LoadBalancer { List servers, @NameResolver.ResolutionResultAttr Attributes attributes) { handleResolvedAddresses( - ResolvedAddresses.newBuilder().setServers(servers).setAttributes(attributes).build()); + ResolvedAddresses.newBuilder().setAddresses(servers).setAttributes(attributes).build()); } /** @@ -148,7 +148,8 @@ public abstract class LoadBalancer { */ @SuppressWarnings("deprecation") public void handleResolvedAddresses(ResolvedAddresses resolvedAddresses) { - handleResolvedAddressGroups(resolvedAddresses.getServers(), resolvedAddresses.getAttributes()); + handleResolvedAddressGroups( + resolvedAddresses.getAddresses(), resolvedAddresses.getAttributes()); } /** @@ -159,7 +160,7 @@ public abstract class LoadBalancer { * @since 1.21.0 */ public static final class ResolvedAddresses { - private final List servers; + private final List addresses; @NameResolver.ResolutionResultAttr private final Attributes attributes; @Nullable @@ -167,11 +168,11 @@ public abstract class LoadBalancer { // Make sure to update toBuilder() below! private ResolvedAddresses( - List servers, + List addresses, @NameResolver.ResolutionResultAttr Attributes attributes, Object loadBalancingPolicyConfig) { - this.servers = - Collections.unmodifiableList(new ArrayList<>(checkNotNull(servers, "servers"))); + this.addresses = + Collections.unmodifiableList(new ArrayList<>(checkNotNull(addresses, "addresses"))); this.attributes = checkNotNull(attributes, "attributes"); this.loadBalancingPolicyConfig = loadBalancingPolicyConfig; } @@ -192,7 +193,7 @@ public abstract class LoadBalancer { */ public Builder toBuilder() { return newBuilder() - .setServers(servers) + .setAddresses(addresses) .setAttributes(attributes) .setLoadBalancingPolicyConfig(loadBalancingPolicyConfig); } @@ -202,8 +203,8 @@ public abstract class LoadBalancer { * * @since 1.21.0 */ - public List getServers() { - return servers; + public List getAddresses() { + return addresses; } /** @@ -232,7 +233,7 @@ public abstract class LoadBalancer { * Builder for {@link ResolvedAddresses}. */ public static final class Builder { - private List servers; + private List addresses; @NameResolver.ResolutionResultAttr private Attributes attributes = Attributes.EMPTY; @Nullable @@ -241,12 +242,12 @@ public abstract class LoadBalancer { Builder() {} /** - * Sets the servers. This field is required. + * Sets the addresses. This field is required. * * @return this. */ - public Builder setServers(List servers) { - this.servers = servers; + public Builder setAddresses(List addresses) { + this.addresses = addresses; return this; } @@ -275,14 +276,14 @@ public abstract class LoadBalancer { * Constructs the {@link ResolvedAddresses}. */ public ResolvedAddresses build() { - return new ResolvedAddresses(servers, attributes, loadBalancingPolicyConfig); + return new ResolvedAddresses(addresses, attributes, loadBalancingPolicyConfig); } } @Override public String toString() { return MoreObjects.toStringHelper(this) - .add("servers", servers) + .add("addresses", addresses) .add("attributes", attributes) .add("loadBalancingPolicyConfig", loadBalancingPolicyConfig) .toString(); @@ -290,7 +291,7 @@ public abstract class LoadBalancer { @Override public int hashCode() { - return Objects.hashCode(servers, attributes, loadBalancingPolicyConfig); + return Objects.hashCode(addresses, attributes, loadBalancingPolicyConfig); } @Override @@ -299,7 +300,7 @@ public abstract class LoadBalancer { return false; } ResolvedAddresses that = (ResolvedAddresses) obj; - return Objects.equal(this.servers, that.servers) + return Objects.equal(this.addresses, that.addresses) && Objects.equal(this.attributes, that.attributes) && Objects.equal(this.loadBalancingPolicyConfig, that.loadBalancingPolicyConfig); } diff --git a/api/src/main/java/io/grpc/LoadBalancerProvider.java b/api/src/main/java/io/grpc/LoadBalancerProvider.java index 0884aa1e5e..a6aa64f297 100644 --- a/api/src/main/java/io/grpc/LoadBalancerProvider.java +++ b/api/src/main/java/io/grpc/LoadBalancerProvider.java @@ -27,6 +27,14 @@ import java.util.Map; */ @ExperimentalApi("https://github.com/grpc/grpc-java/issues/1771") public abstract class LoadBalancerProvider extends LoadBalancer.Factory { + + /** + * A sentinel value indicating that service config is not supported. This can be used to + * indicate that parsing of the service config is neither right nor wrong, but doesn't have + * any meaning. + */ + private static final ConfigOrError UNKNOWN_CONFIG = ConfigOrError.fromConfig(new UnknownConfig()); + /** * Whether this provider is available for use, taking the current environment into consideration. * If {@code false}, {@link #newLoadBalancer} is not safe to be called. @@ -56,8 +64,7 @@ public abstract class LoadBalancerProvider extends LoadBalancer.Factory { * return a {@link ConfigOrError} which contains either the successfully parsed config, or the * {@link Status} representing the failure to parse. Implementations are expected to not throw * exceptions but return a Status representing the failure. If successful, the load balancing - * policy config should be immutable, and implement {@link Object#equals(Object)} and - * {@link Object#hashCode()}. + * policy config should be immutable. * * @param rawLoadBalancingPolicyConfig The {@link Map} representation of the load balancing * policy choice. @@ -66,7 +73,7 @@ public abstract class LoadBalancerProvider extends LoadBalancer.Factory { * @see https://github.com/grpc/proposal/blob/master/A24-lb-policy-config.md */ public ConfigOrError parseLoadBalancingPolicyConfig(Map rawLoadBalancingPolicyConfig) { - return ConfigOrError.UNKNOWN_CONFIG; + return UNKNOWN_CONFIG; } @Override @@ -90,4 +97,14 @@ public abstract class LoadBalancerProvider extends LoadBalancer.Factory { public final int hashCode() { return super.hashCode(); } + + private static final class UnknownConfig { + + UnknownConfig() {} + + @Override + public String toString() { + return "service config is unused"; + } + } } diff --git a/api/src/main/java/io/grpc/NameResolver.java b/api/src/main/java/io/grpc/NameResolver.java index ae8eed04aa..67b2da061c 100644 --- a/api/src/main/java/io/grpc/NameResolver.java +++ b/api/src/main/java/io/grpc/NameResolver.java @@ -87,7 +87,7 @@ public abstract class NameResolver { @Override public void onResult(ResolutionResult resolutionResult) { - listener.onAddresses(resolutionResult.getServers(), resolutionResult.getAttributes()); + listener.onAddresses(resolutionResult.getAddresses(), resolutionResult.getAttributes()); } }); } @@ -276,12 +276,13 @@ public abstract class NameResolver { @Deprecated public final void onAddresses( List servers, @ResolutionResultAttr Attributes attributes) { - onResult(ResolutionResult.newBuilder().setServers(servers).setAttributes(attributes).build()); + onResult( + ResolutionResult.newBuilder().setAddresses(servers).setAttributes(attributes).build()); } /** * Handles updates on resolved addresses and attributes. If - * {@link ResolutionResult#getServers()} is empty, {@link #onError(Status)} will be called. + * {@link ResolutionResult#getAddresses()} is empty, {@link #onError(Status)} will be called. * * @param resolutionResult the resolved server addresses, attributes, and Service Config. * @since 1.21.0 @@ -363,17 +364,17 @@ public abstract class NameResolver { */ @ExperimentalApi("https://github.com/grpc/grpc-java/issues/1770") public static final class ResolutionResult { - private final List servers; + private final List addresses; @ResolutionResultAttr private final Attributes attributes; @Nullable private final ConfigOrError serviceConfig; ResolutionResult( - List servers, + List addresses, @ResolutionResultAttr Attributes attributes, ConfigOrError serviceConfig) { - this.servers = Collections.unmodifiableList(new ArrayList<>(servers)); + this.addresses = Collections.unmodifiableList(new ArrayList<>(addresses)); this.attributes = checkNotNull(attributes, "attributes"); this.serviceConfig = serviceConfig; } @@ -394,22 +395,22 @@ public abstract class NameResolver { */ public Builder toBuilder() { return newBuilder() - .setServers(servers) + .setAddresses(addresses) .setAttributes(attributes) .setServiceConfig(serviceConfig); } /** - * Gets the servers resolved by name resolution. + * Gets the addresses resolved by name resolution. * * @since 1.21.0 */ - public List getServers() { - return servers; + public List getAddresses() { + return addresses; } /** - * Gets the attributes associated with the servers resolved by name resolution. If there are + * Gets the attributes associated with the addresses resolved by name resolution. If there are * no attributes, {@link Attributes#EMPTY} will be returned. * * @since 1.21.0 @@ -432,26 +433,32 @@ public abstract class NameResolver { @Override public String toString() { return MoreObjects.toStringHelper(this) - .add("servers", servers) + .add("addresses", addresses) .add("attributes", attributes) .add("serviceConfig", serviceConfig) .toString(); } + /** + * Useful for testing. May be slow to calculate. + */ @Override public boolean equals(Object obj) { if (!(obj instanceof ResolutionResult)) { return false; } ResolutionResult that = (ResolutionResult) obj; - return Objects.equal(this.servers, that.servers) + return Objects.equal(this.addresses, that.addresses) && Objects.equal(this.attributes, that.attributes) && Objects.equal(this.serviceConfig, that.serviceConfig); } + /** + * Useful for testing. May be slow to calculate. + */ @Override public int hashCode() { - return Objects.hashCode(servers, attributes, serviceConfig); + return Objects.hashCode(addresses, attributes, serviceConfig); } /** @@ -460,7 +467,7 @@ public abstract class NameResolver { * @since 1.21.0 */ public static final class Builder { - private List servers = Collections.emptyList(); + private List addresses = Collections.emptyList(); private Attributes attributes = Attributes.EMPTY; @Nullable private ConfigOrError serviceConfig; @@ -469,17 +476,17 @@ public abstract class NameResolver { Builder() {} /** - * Sets the servers resolved by name resolution. This field is required. + * Sets the addresses resolved by name resolution. This field is required. * * @since 1.21.0 */ - public Builder setServers(List servers) { - this.servers = servers; + public Builder setAddresses(List addresses) { + this.addresses = addresses; return this; } /** - * Sets the attributes for the servers resolved by name resolution. If unset, + * Sets the attributes for the addresses resolved by name resolution. If unset, * {@link Attributes#EMPTY} will be used as a default. * * @since 1.21.0 @@ -506,35 +513,18 @@ public abstract class NameResolver { * @since 1.21.0 */ public ResolutionResult build() { - return new ResolutionResult(servers, attributes, serviceConfig); + return new ResolutionResult(addresses, attributes, serviceConfig); } } } /** - * Gets the attributes associated with the servers resolved by name resolution. If there are + * Gets the attributes associated with the addresses resolved by name resolution. If there are * no attributes, {@link Attributes#EMPTY} will be returned. * * @since 1.21.0 */ public static final class ConfigOrError { - private static final class UnknownConfig { - - UnknownConfig() {} - - @Override - public String toString() { - return "service config is unused"; - } - } - - /** - * A sentinel value indicating that service config is not supported. This can be used to - * indicate that parsing of the service config is neither right nor wrong, but doesn't have - * any meaning. - */ - public static final ConfigOrError UNKNOWN_CONFIG = - ConfigOrError.fromConfig(new UnknownConfig()); /** * Returns a {@link ConfigOrError} for the successfully parsed config. diff --git a/api/src/test/java/io/grpc/LoadBalancerTest.java b/api/src/test/java/io/grpc/LoadBalancerTest.java index cc0a992d5b..ad54a2f1d8 100644 --- a/api/src/test/java/io/grpc/LoadBalancerTest.java +++ b/api/src/test/java/io/grpc/LoadBalancerTest.java @@ -254,7 +254,7 @@ public class LoadBalancerTest { new EquivalentAddressGroup(new SocketAddress(){})); balancer.handleResolvedAddressGroups(servers, attrs); assertThat(resultCapture.get()).isEqualTo( - ResolvedAddresses.newBuilder().setServers(servers).setAttributes(attrs).build()); + ResolvedAddresses.newBuilder().setAddresses(servers).setAttributes(attrs).build()); } @Deprecated @@ -288,7 +288,7 @@ public class LoadBalancerTest { new EquivalentAddressGroup(new SocketAddress(){}), new EquivalentAddressGroup(new SocketAddress(){})); balancer.handleResolvedAddresses( - ResolvedAddresses.newBuilder().setServers(servers).setAttributes(attrs).build()); + ResolvedAddresses.newBuilder().setAddresses(servers).setAttributes(attrs).build()); assertThat(serversCapture.get()).isEqualTo(servers); assertThat(attrsCapture.get()).isEqualTo(attrs); } diff --git a/core/src/main/java/io/grpc/internal/AbstractManagedChannelImplBuilder.java b/core/src/main/java/io/grpc/internal/AbstractManagedChannelImplBuilder.java index fd9d9cdf16..0a01bcc7a9 100644 --- a/core/src/main/java/io/grpc/internal/AbstractManagedChannelImplBuilder.java +++ b/core/src/main/java/io/grpc/internal/AbstractManagedChannelImplBuilder.java @@ -606,7 +606,7 @@ public abstract class AbstractManagedChannelImplBuilder public void start(Observer observer) { observer.onResult( ResolutionResult.newBuilder() - .setServers(Collections.singletonList(new EquivalentAddressGroup(address))) + .setAddresses(Collections.singletonList(new EquivalentAddressGroup(address))) .setAttributes(Attributes.EMPTY) .build()); } diff --git a/core/src/main/java/io/grpc/internal/AutoConfiguredLoadBalancerFactory.java b/core/src/main/java/io/grpc/internal/AutoConfiguredLoadBalancerFactory.java index 52e0ace586..afc9302d27 100644 --- a/core/src/main/java/io/grpc/internal/AutoConfiguredLoadBalancerFactory.java +++ b/core/src/main/java/io/grpc/internal/AutoConfiguredLoadBalancerFactory.java @@ -102,7 +102,7 @@ public final class AutoConfiguredLoadBalancerFactory extends LoadBalancer.Factor // Must be run inside ChannelExecutor. @Override public void handleResolvedAddresses(ResolvedAddresses resolvedAddresses) { - List servers = resolvedAddresses.getServers(); + List servers = resolvedAddresses.getAddresses(); Attributes attributes = resolvedAddresses.getAttributes(); if (attributes.get(ATTR_LOAD_BALANCING_CONFIG) != null) { throw new IllegalArgumentException( @@ -151,7 +151,7 @@ public final class AutoConfiguredLoadBalancerFactory extends LoadBalancer.Factor } else { delegate.handleResolvedAddresses( ResolvedAddresses.newBuilder() - .setServers(selection.serverList) + .setAddresses(selection.serverList) .setAttributes(attributes) .build()); } diff --git a/core/src/main/java/io/grpc/internal/DnsNameResolver.java b/core/src/main/java/io/grpc/internal/DnsNameResolver.java index 95c3aefb02..d87dbb0f98 100644 --- a/core/src/main/java/io/grpc/internal/DnsNameResolver.java +++ b/core/src/main/java/io/grpc/internal/DnsNameResolver.java @@ -28,7 +28,6 @@ import com.google.common.base.VerifyException; import io.grpc.Attributes; import io.grpc.EquivalentAddressGroup; import io.grpc.NameResolver; -import io.grpc.NameResolver.ConfigOrError; import io.grpc.ProxiedSocketAddress; import io.grpc.ProxyDetector; import io.grpc.Status; @@ -241,7 +240,7 @@ final class DnsNameResolver extends NameResolver { EquivalentAddressGroup server = new EquivalentAddressGroup(proxiedAddr); ResolutionResult resolutionResult = ResolutionResult.newBuilder() - .setServers(Collections.singletonList(server)) + .setAddresses(Collections.singletonList(server)) .setAttributes(Attributes.EMPTY) .build(); savedObserver.onResult(resolutionResult); @@ -308,7 +307,7 @@ final class DnsNameResolver extends NameResolver { logger.log(Level.FINE, "No TXT records found for {0}", new Object[]{host}); } ResolutionResult resolutionResult = - ResolutionResult.newBuilder().setServers(servers).setAttributes(attrs.build()).build(); + ResolutionResult.newBuilder().setAddresses(servers).setAttributes(attrs.build()).build(); savedObserver.onResult(resolutionResult); } } diff --git a/core/src/main/java/io/grpc/internal/ManagedChannelImpl.java b/core/src/main/java/io/grpc/internal/ManagedChannelImpl.java index 3bdefd3938..663e2bcfc7 100644 --- a/core/src/main/java/io/grpc/internal/ManagedChannelImpl.java +++ b/core/src/main/java/io/grpc/internal/ManagedChannelImpl.java @@ -1341,7 +1341,7 @@ final class ManagedChannelImpl extends ManagedChannel implements @SuppressWarnings("ReferenceEquality") @Override public void run() { - List servers = resolutionResult.getServers(); + List servers = resolutionResult.getAddresses(); Attributes attrs = resolutionResult.getAttributes(); channelLogger.log( ChannelLogLevel.DEBUG, "Resolved address: {0}, config={1}", servers, attrs); @@ -1410,7 +1410,7 @@ final class ManagedChannelImpl extends ManagedChannel implements } helper.lb.handleResolvedAddresses( ResolvedAddresses.newBuilder() - .setServers(servers) + .setAddresses(servers) .setAttributes(effectiveAttrs) .build()); } diff --git a/core/src/main/java/io/grpc/internal/PickFirstLoadBalancer.java b/core/src/main/java/io/grpc/internal/PickFirstLoadBalancer.java index 901126f36f..ba3e9938f2 100644 --- a/core/src/main/java/io/grpc/internal/PickFirstLoadBalancer.java +++ b/core/src/main/java/io/grpc/internal/PickFirstLoadBalancer.java @@ -25,11 +25,6 @@ import io.grpc.ConnectivityState; import io.grpc.ConnectivityStateInfo; import io.grpc.EquivalentAddressGroup; import io.grpc.LoadBalancer; -import io.grpc.LoadBalancer.Helper; -import io.grpc.LoadBalancer.PickResult; -import io.grpc.LoadBalancer.PickSubchannelArgs; -import io.grpc.LoadBalancer.Subchannel; -import io.grpc.LoadBalancer.SubchannelPicker; import io.grpc.LoadBalancer.SubchannelStateListener; import io.grpc.Status; import java.util.List; @@ -49,7 +44,7 @@ final class PickFirstLoadBalancer extends LoadBalancer implements SubchannelStat @Override public void handleResolvedAddresses(ResolvedAddresses resolvedAddresses) { - List servers = resolvedAddresses.getServers(); + List servers = resolvedAddresses.getAddresses(); if (subchannel == null) { subchannel = helper.createSubchannel( CreateSubchannelArgs.newBuilder() diff --git a/core/src/main/java/io/grpc/util/RoundRobinLoadBalancer.java b/core/src/main/java/io/grpc/util/RoundRobinLoadBalancer.java index 6db8012d45..0503bfedd2 100644 --- a/core/src/main/java/io/grpc/util/RoundRobinLoadBalancer.java +++ b/core/src/main/java/io/grpc/util/RoundRobinLoadBalancer.java @@ -33,10 +33,6 @@ import io.grpc.ConnectivityState; import io.grpc.ConnectivityStateInfo; import io.grpc.EquivalentAddressGroup; import io.grpc.LoadBalancer; -import io.grpc.LoadBalancer.PickResult; -import io.grpc.LoadBalancer.PickSubchannelArgs; -import io.grpc.LoadBalancer.Subchannel; -import io.grpc.LoadBalancer.SubchannelPicker; import io.grpc.LoadBalancer.SubchannelStateListener; import io.grpc.Metadata; import io.grpc.Metadata.Key; @@ -89,7 +85,7 @@ final class RoundRobinLoadBalancer extends LoadBalancer implements SubchannelSta @Override public void handleResolvedAddresses(ResolvedAddresses resolvedAddresses) { - List servers = resolvedAddresses.getServers(); + List servers = resolvedAddresses.getAddresses(); Attributes attributes = resolvedAddresses.getAttributes(); Set currentAddrs = subchannels.keySet(); Set latestAddrs = stripAttrs(servers); diff --git a/core/src/test/java/io/grpc/internal/AutoConfiguredLoadBalancerFactoryTest.java b/core/src/test/java/io/grpc/internal/AutoConfiguredLoadBalancerFactoryTest.java index 1e3b3e7354..99bb821487 100644 --- a/core/src/test/java/io/grpc/internal/AutoConfiguredLoadBalancerFactoryTest.java +++ b/core/src/test/java/io/grpc/internal/AutoConfiguredLoadBalancerFactoryTest.java @@ -190,7 +190,7 @@ public class AutoConfiguredLoadBalancerFactoryTest { lb.handleResolvedAddresses( ResolvedAddresses.newBuilder() - .setServers(servers) + .setAddresses(servers) .setAttributes(Attributes.EMPTY) .build()); @@ -233,7 +233,7 @@ public class AutoConfiguredLoadBalancerFactoryTest { lb.handleResolvedAddresses( ResolvedAddresses.newBuilder() - .setServers(servers) + .setAddresses(servers) .setAttributes(serviceConfigAttrs) .build()); @@ -258,7 +258,7 @@ public class AutoConfiguredLoadBalancerFactoryTest { lb.handleResolvedAddresses( ResolvedAddresses.newBuilder() - .setServers(servers) + .setAddresses(servers) .setAttributes(serviceConfigAttrs) .build()); @@ -267,7 +267,7 @@ public class AutoConfiguredLoadBalancerFactoryTest { ArgumentCaptor resultCaptor = ArgumentCaptor.forClass(ResolvedAddresses.class); verify(testLbBalancer).handleResolvedAddresses(resultCaptor.capture()); - assertThat(resultCaptor.getValue().getServers()).containsExactlyElementsIn(servers).inOrder(); + assertThat(resultCaptor.getValue().getAddresses()).containsExactlyElementsIn(servers).inOrder(); Attributes actualAttributes = resultCaptor.getValue().getAttributes(); assertThat(actualAttributes.get(ATTR_LOAD_BALANCING_CONFIG)) .isEqualTo(Collections.singletonMap("setting1", "high")); @@ -282,14 +282,14 @@ public class AutoConfiguredLoadBalancerFactoryTest { .build(); lb.handleResolvedAddresses( ResolvedAddresses.newBuilder() - .setServers(servers) + .setAddresses(servers) .setAttributes(serviceConfigAttrs) .build()); resultCaptor = ArgumentCaptor.forClass(ResolvedAddresses.class); verify(testLbBalancer, times(2)).handleResolvedAddresses(resultCaptor.capture()); - assertThat(resultCaptor.getValue().getServers()).containsExactlyElementsIn(servers).inOrder(); + assertThat(resultCaptor.getValue().getAddresses()).containsExactlyElementsIn(servers).inOrder(); actualAttributes = resultCaptor.getValue().getAttributes(); // But the balancer config is changed. assertThat(actualAttributes.get(ATTR_LOAD_BALANCING_CONFIG)) @@ -319,14 +319,14 @@ public class AutoConfiguredLoadBalancerFactoryTest { lb.handleResolvedAddresses( ResolvedAddresses.newBuilder() - .setServers(servers) + .setAddresses(servers) .setAttributes(Attributes.EMPTY) .build()); assertThat(lb.getDelegate()).isSameAs(testLbBalancer); verify(testLbBalancer).handleResolvedAddresses( ResolvedAddresses.newBuilder() - .setServers(Collections.singletonList(servers.get(0))) + .setAddresses(Collections.singletonList(servers.get(0))) .setAttributes(Attributes.EMPTY) .build()); } @@ -342,7 +342,7 @@ public class AutoConfiguredLoadBalancerFactoryTest { parseConfig("{\"loadBalancingConfig\": [ {\"test_lb\": { \"setting1\": \"high\" } } ] }"); lb.handleResolvedAddresses( ResolvedAddresses.newBuilder() - .setServers(Collections.emptyList()) + .setAddresses(Collections.emptyList()) .setAttributes(Attributes.newBuilder() .set(GrpcAttributes.NAME_RESOLVER_SERVICE_CONFIG, serviceConfig).build()) .build()); @@ -367,7 +367,7 @@ public class AutoConfiguredLoadBalancerFactoryTest { parseConfig("{\"loadBalancingConfig\": [ {\"test_lb2\": { \"setting1\": \"high\" } } ] }"); lb.handleResolvedAddresses( ResolvedAddresses.newBuilder() - .setServers(Collections.emptyList()) + .setAddresses(Collections.emptyList()) .setAttributes(Attributes.newBuilder() .set(GrpcAttributes.NAME_RESOLVER_SERVICE_CONFIG, serviceConfig).build()) .build()); @@ -377,7 +377,7 @@ public class AutoConfiguredLoadBalancerFactoryTest { ArgumentCaptor resultCaptor = ArgumentCaptor.forClass(ResolvedAddresses.class); verify(testLbBalancer2).handleResolvedAddresses(resultCaptor.capture()); - assertThat(resultCaptor.getValue().getServers()).isEmpty(); + assertThat(resultCaptor.getValue().getAddresses()).isEmpty(); Attributes actualAttributes = resultCaptor.getValue().getAttributes(); Map lbConfig = actualAttributes.get(LoadBalancer.ATTR_LOAD_BALANCING_CONFIG); @@ -747,7 +747,7 @@ public class AutoConfiguredLoadBalancerFactoryTest { .newLoadBalancer(helper); lb.handleResolvedAddresses( ResolvedAddresses.newBuilder() - .setServers(servers) + .setAddresses(servers) .setAttributes(Attributes.EMPTY) .build()); @@ -757,7 +757,7 @@ public class AutoConfiguredLoadBalancerFactoryTest { serviceConfig.put("loadBalancingPolicy", "round_robin"); lb.handleResolvedAddresses( ResolvedAddresses.newBuilder() - .setServers(servers) + .setAddresses(servers) .setAttributes(Attributes.newBuilder() .set(GrpcAttributes.NAME_RESOLVER_SERVICE_CONFIG, serviceConfig).build()) .build()); @@ -775,7 +775,7 @@ public class AutoConfiguredLoadBalancerFactoryTest { serviceConfig.put("loadBalancingPolicy", "round_robin"); lb.handleResolvedAddresses( ResolvedAddresses.newBuilder() - .setServers(servers) + .setAddresses(servers) .setAttributes(Attributes.newBuilder() .set(GrpcAttributes.NAME_RESOLVER_SERVICE_CONFIG, serviceConfig).build()) .build()); @@ -790,7 +790,7 @@ public class AutoConfiguredLoadBalancerFactoryTest { Attributes.newBuilder().set(GrpcAttributes.ATTR_LB_ADDR_AUTHORITY, "ok").build())); lb.handleResolvedAddresses( ResolvedAddresses.newBuilder() - .setServers(servers) + .setAddresses(servers) .setAttributes(Attributes.EMPTY) .build()); diff --git a/core/src/test/java/io/grpc/internal/DnsNameResolverTest.java b/core/src/test/java/io/grpc/internal/DnsNameResolverTest.java index a8f8fb8fa5..b30fed7572 100644 --- a/core/src/test/java/io/grpc/internal/DnsNameResolverTest.java +++ b/core/src/test/java/io/grpc/internal/DnsNameResolverTest.java @@ -635,7 +635,7 @@ public class DnsNameResolverTest { assertEquals(1, fakeExecutor.runDueTasks()); verify(mockObserver).onResult(resultCaptor.capture()); - List result = resultCaptor.getValue().getServers(); + List result = resultCaptor.getValue().getAddresses(); assertThat(result).hasSize(1); EquivalentAddressGroup eag = result.get(0); assertThat(eag.getAddresses()).hasSize(1); @@ -1072,9 +1072,9 @@ public class DnsNameResolverTest { private static void assertAnswerMatches( List addrs, int port, ResolutionResult resolutionResult) { - assertEquals(addrs.size(), resolutionResult.getServers().size()); + assertEquals(addrs.size(), resolutionResult.getAddresses().size()); for (int i = 0; i < addrs.size(); i++) { - EquivalentAddressGroup addrGroup = resolutionResult.getServers().get(i); + EquivalentAddressGroup addrGroup = resolutionResult.getAddresses().get(i); InetSocketAddress socketAddr = (InetSocketAddress) Iterables.getOnlyElement(addrGroup.getAddresses()); assertEquals("Addr " + i, port, socketAddr.getPort()); diff --git a/core/src/test/java/io/grpc/internal/ManagedChannelImplIdlenessTest.java b/core/src/test/java/io/grpc/internal/ManagedChannelImplIdlenessTest.java index 9c25ed7a09..2919206485 100644 --- a/core/src/test/java/io/grpc/internal/ManagedChannelImplIdlenessTest.java +++ b/core/src/test/java/io/grpc/internal/ManagedChannelImplIdlenessTest.java @@ -228,12 +228,13 @@ public class ManagedChannelImplIdlenessTest { // the NameResolver. ResolutionResult resolutionResult = ResolutionResult.newBuilder() - .setServers(servers) + .setAddresses(servers) .setAttributes(Attributes.EMPTY) .build(); nameResolverObserverCaptor.getValue().onResult(resolutionResult); verify(mockLoadBalancer).handleResolvedAddresses( - ResolvedAddresses.newBuilder().setServers(servers).setAttributes(Attributes.EMPTY).build()); + ResolvedAddresses.newBuilder().setAddresses(servers).setAttributes(Attributes.EMPTY) + .build()); } @Test diff --git a/core/src/test/java/io/grpc/internal/ManagedChannelImplTest.java b/core/src/test/java/io/grpc/internal/ManagedChannelImplTest.java index 1836ab36e1..d08ae5bc49 100644 --- a/core/src/test/java/io/grpc/internal/ManagedChannelImplTest.java +++ b/core/src/test/java/io/grpc/internal/ManagedChannelImplTest.java @@ -702,7 +702,7 @@ public class ManagedChannelImplTest { verify(mockLoadBalancerProvider).newLoadBalancer(any(Helper.class)); verify(mockLoadBalancer).handleResolvedAddresses( ResolvedAddresses.newBuilder() - .setServers(Arrays.asList(addressGroup)) + .setAddresses(Arrays.asList(addressGroup)) .setAttributes(Attributes.EMPTY) .build()); @@ -951,7 +951,7 @@ public class ManagedChannelImplTest { ArgumentCaptor resultCaptor = ArgumentCaptor.forClass(ResolvedAddresses.class); verify(mockLoadBalancer).handleResolvedAddresses(resultCaptor.capture()); - assertThat(resultCaptor.getValue().getServers()).isEmpty(); + assertThat(resultCaptor.getValue().getAddresses()).isEmpty(); Attributes actualAttrs = resultCaptor.getValue().getAttributes(); Map lbConfig = actualAttrs.get(LoadBalancer.ATTR_LOAD_BALANCING_CONFIG); assertEquals(ImmutableMap.of("setting1", "high"), lbConfig); @@ -1021,7 +1021,7 @@ public class ManagedChannelImplTest { verify(mockLoadBalancerProvider).newLoadBalancer(any(Helper.class)); verify(mockLoadBalancer).handleResolvedAddresses( ResolvedAddresses.newBuilder() - .setServers(Collections.emptyList()) + .setAddresses(Collections.emptyList()) .setAttributes(serviceConfigAttrs) .build()); @@ -1104,7 +1104,7 @@ public class ManagedChannelImplTest { EquivalentAddressGroup addressGroup = new EquivalentAddressGroup(resolvedAddrs); inOrder.verify(mockLoadBalancer).handleResolvedAddresses( ResolvedAddresses.newBuilder() - .setServers(Arrays.asList(addressGroup)) + .setAddresses(Arrays.asList(addressGroup)) .build()); Subchannel subchannel = createSubchannelSafely(helper, addressGroup, Attributes.EMPTY, subchannelStateListener); @@ -1255,7 +1255,7 @@ public class ManagedChannelImplTest { EquivalentAddressGroup addressGroup = new EquivalentAddressGroup(resolvedAddrs); inOrder.verify(mockLoadBalancer).handleResolvedAddresses( ResolvedAddresses.newBuilder() - .setServers(Arrays.asList(addressGroup)) + .setAddresses(Arrays.asList(addressGroup)) .build()); Subchannel subchannel = createSubchannelSafely(helper, addressGroup, Attributes.EMPTY, subchannelStateListener); @@ -2674,7 +2674,7 @@ public class ManagedChannelImplTest { int prevSize = getStats(channel).channelTrace.events.size(); ResolutionResult resolutionResult1 = ResolutionResult.newBuilder() - .setServers(Collections.singletonList( + .setAddresses(Collections.singletonList( new EquivalentAddressGroup( Arrays.asList(new SocketAddress() {}, new SocketAddress() {})))) .setAttributes(Attributes.EMPTY) @@ -2692,7 +2692,7 @@ public class ManagedChannelImplTest { prevSize = getStats(channel).channelTrace.events.size(); ResolutionResult resolutionResult2 = ResolutionResult.newBuilder() - .setServers(Collections.singletonList( + .setAddresses(Collections.singletonList( new EquivalentAddressGroup( Arrays.asList(new SocketAddress() {}, new SocketAddress() {})))) .setAttributes(Attributes.EMPTY) @@ -2718,7 +2718,7 @@ public class ManagedChannelImplTest { .set(GrpcAttributes.NAME_RESOLVER_SERVICE_CONFIG, new HashMap()) .build(); ResolutionResult resolutionResult1 = ResolutionResult.newBuilder() - .setServers(Collections.singletonList( + .setAddresses(Collections.singletonList( new EquivalentAddressGroup( Arrays.asList(new SocketAddress() {}, new SocketAddress() {})))) .setAttributes(attributes) @@ -2733,7 +2733,7 @@ public class ManagedChannelImplTest { .build()); prevSize = getStats(channel).channelTrace.events.size(); - ResolutionResult resolutionResult2 = ResolutionResult.newBuilder().setServers( + ResolutionResult resolutionResult2 = ResolutionResult.newBuilder().setAddresses( Collections.singletonList( new EquivalentAddressGroup( Arrays.asList(new SocketAddress() {}, new SocketAddress() {})))) @@ -2751,7 +2751,7 @@ public class ManagedChannelImplTest { .build(); timer.forwardNanos(1234); ResolutionResult resolutionResult3 = ResolutionResult.newBuilder() - .setServers(Collections.singletonList( + .setAddresses(Collections.singletonList( new EquivalentAddressGroup( Arrays.asList(new SocketAddress() {}, new SocketAddress() {})))) .setAttributes(attributes) @@ -3136,7 +3136,7 @@ public class ManagedChannelImplTest { helper = helperCaptor.getValue(); verify(mockLoadBalancer).handleResolvedAddresses( ResolvedAddresses.newBuilder() - .setServers(nameResolverFactory.servers) + .setAddresses(nameResolverFactory.servers) .setAttributes(attributesWithRetryPolicy) .build()); @@ -3236,7 +3236,7 @@ public class ManagedChannelImplTest { helper = helperCaptor.getValue(); verify(mockLoadBalancer).handleResolvedAddresses( ResolvedAddresses.newBuilder() - .setServers(nameResolverFactory.servers) + .setAddresses(nameResolverFactory.servers) .setAttributes(attributesWithRetryPolicy) .build()); @@ -3317,7 +3317,7 @@ public class ManagedChannelImplTest { this.observer = observer; observer.onResult( ResolutionResult.newBuilder() - .setServers(addresses) + .setAddresses(addresses) .setAttributes( Attributes.newBuilder() .set( @@ -3378,7 +3378,7 @@ public class ManagedChannelImplTest { factory.resolver.observer.onResult( ResolutionResult.newBuilder() - .setServers(addresses) + .setAddresses(addresses) .setAttributes( Attributes.newBuilder() .set( @@ -3725,7 +3725,7 @@ public class ManagedChannelImplTest { ArgumentCaptor resultCaptor = ArgumentCaptor.forClass(ResolvedAddresses.class); verify(mockLoadBalancer).handleResolvedAddresses(resultCaptor.capture()); - assertThat(resultCaptor.getValue().getServers()).containsExactly(addressGroup); + assertThat(resultCaptor.getValue().getAddresses()).containsExactly(addressGroup); Attributes actualAttrs = resultCaptor.getValue().getAttributes(); assertThat(actualAttrs.get(GrpcAttributes.NAME_RESOLVER_SERVICE_CONFIG)).isNull(); verify(mockLoadBalancer, never()).handleNameResolutionError(any(Status.class)); @@ -3761,7 +3761,7 @@ public class ManagedChannelImplTest { ArgumentCaptor resultCaptor = ArgumentCaptor.forClass(ResolvedAddresses.class); verify(mockLoadBalancer).handleResolvedAddresses(resultCaptor.capture()); - assertThat(resultCaptor.getValue().getServers()).containsExactly(addressGroup); + assertThat(resultCaptor.getValue().getAddresses()).containsExactly(addressGroup); Attributes actualAttrs = resultCaptor.getValue().getAttributes(); assertThat(actualAttrs.get(GrpcAttributes.NAME_RESOLVER_SERVICE_CONFIG)) @@ -3795,7 +3795,7 @@ public class ManagedChannelImplTest { ArgumentCaptor resultCaptor = ArgumentCaptor.forClass(ResolvedAddresses.class); verify(mockLoadBalancer).handleResolvedAddresses(resultCaptor.capture()); - assertThat(resultCaptor.getValue().getServers()).containsExactly(addressGroup); + assertThat(resultCaptor.getValue().getAddresses()).containsExactly(addressGroup); Attributes actualAttrs = resultCaptor.getValue().getAttributes(); assertThat(actualAttrs.get(GrpcAttributes.NAME_RESOLVER_SERVICE_CONFIG)) @@ -3816,7 +3816,7 @@ public class ManagedChannelImplTest { resultCaptor = ArgumentCaptor.forClass(ResolvedAddresses.class); verify(mockLoadBalancer, times(2)).handleResolvedAddresses(resultCaptor.capture()); - assertThat(resultCaptor.getValue().getServers()).containsExactly(addressGroup); + assertThat(resultCaptor.getValue().getAddresses()).containsExactly(addressGroup); actualAttrs = resultCaptor.getValue().getAttributes(); assertThat(actualAttrs.get(GrpcAttributes.NAME_RESOLVER_SERVICE_CONFIG)) .isEqualTo(serviceConfig); @@ -3854,7 +3854,7 @@ public class ManagedChannelImplTest { ArgumentCaptor resultCaptor = ArgumentCaptor.forClass(ResolvedAddresses.class); verify(mockLoadBalancer).handleResolvedAddresses(resultCaptor.capture()); - assertThat(resultCaptor.getValue().getServers()).containsExactly(addressGroup); + assertThat(resultCaptor.getValue().getAddresses()).containsExactly(addressGroup); Attributes actualAttrs = resultCaptor.getValue().getAttributes(); assertThat(actualAttrs.get(GrpcAttributes.NAME_RESOLVER_SERVICE_CONFIG)) .isEqualTo(serviceConfig); @@ -3886,7 +3886,7 @@ public class ManagedChannelImplTest { ArgumentCaptor resultCaptor = ArgumentCaptor.forClass(ResolvedAddresses.class); verify(mockLoadBalancer).handleResolvedAddresses(resultCaptor.capture()); - assertThat(resultCaptor.getValue().getServers()).containsExactly(addressGroup); + assertThat(resultCaptor.getValue().getAddresses()).containsExactly(addressGroup); Attributes actualAttrs = resultCaptor.getValue().getAttributes(); assertThat(actualAttrs.get(GrpcAttributes.NAME_RESOLVER_SERVICE_CONFIG)) .isEqualTo(defaultServiceConfig); @@ -3912,7 +3912,7 @@ public class ManagedChannelImplTest { ArgumentCaptor resultCaptor = ArgumentCaptor.forClass(ResolvedAddresses.class); verify(mockLoadBalancer).handleResolvedAddresses(resultCaptor.capture()); - assertThat(resultCaptor.getValue().getServers()).containsExactly(addressGroup); + assertThat(resultCaptor.getValue().getAddresses()).containsExactly(addressGroup); Attributes actualAttrs = resultCaptor.getValue().getAttributes(); assertThat(actualAttrs.get(GrpcAttributes.NAME_RESOLVER_SERVICE_CONFIG)).isNull(); verify(mockLoadBalancer, never()).handleNameResolutionError(any(Status.class)); @@ -4078,7 +4078,7 @@ public class ManagedChannelImplTest { } observer.onResult( ResolutionResult.newBuilder() - .setServers(servers) + .setAddresses(servers) .setAttributes(nextResolvedAttributes.get()) .build()); } diff --git a/core/src/test/java/io/grpc/internal/PickFirstLoadBalancerTest.java b/core/src/test/java/io/grpc/internal/PickFirstLoadBalancerTest.java index bff5f778d1..4ae2b08b2b 100644 --- a/core/src/test/java/io/grpc/internal/PickFirstLoadBalancerTest.java +++ b/core/src/test/java/io/grpc/internal/PickFirstLoadBalancerTest.java @@ -110,7 +110,7 @@ public class PickFirstLoadBalancerTest { @Test public void pickAfterResolved() throws Exception { loadBalancer.handleResolvedAddresses( - ResolvedAddresses.newBuilder().setServers(servers).setAttributes(affinity).build()); + ResolvedAddresses.newBuilder().setAddresses(servers).setAttributes(affinity).build()); verify(mockHelper).createSubchannel(createArgsCaptor.capture()); CreateSubchannelArgs args = createArgsCaptor.getValue(); @@ -127,10 +127,10 @@ public class PickFirstLoadBalancerTest { @Test public void pickAfterResolvedAndUnchanged() throws Exception { loadBalancer.handleResolvedAddresses( - ResolvedAddresses.newBuilder().setServers(servers).setAttributes(affinity).build()); + ResolvedAddresses.newBuilder().setAddresses(servers).setAttributes(affinity).build()); verify(mockSubchannel).requestConnection(); loadBalancer.handleResolvedAddresses( - ResolvedAddresses.newBuilder().setServers(servers).setAttributes(affinity).build()); + ResolvedAddresses.newBuilder().setAddresses(servers).setAttributes(affinity).build()); verifyNoMoreInteractions(mockSubchannel); verify(mockHelper).createSubchannel(createArgsCaptor.capture()); @@ -153,7 +153,7 @@ public class PickFirstLoadBalancerTest { InOrder inOrder = inOrder(mockHelper); loadBalancer.handleResolvedAddresses( - ResolvedAddresses.newBuilder().setServers(servers).setAttributes(affinity).build()); + ResolvedAddresses.newBuilder().setAddresses(servers).setAttributes(affinity).build()); inOrder.verify(mockHelper).createSubchannel(createArgsCaptor.capture()); CreateSubchannelArgs args = createArgsCaptor.getValue(); assertThat(args.getAddresses()).isEqualTo(servers); @@ -162,7 +162,7 @@ public class PickFirstLoadBalancerTest { assertEquals(mockSubchannel, pickerCaptor.getValue().pickSubchannel(mockArgs).getSubchannel()); loadBalancer.handleResolvedAddresses( - ResolvedAddresses.newBuilder().setServers(newServers).setAttributes(affinity).build()); + ResolvedAddresses.newBuilder().setAddresses(newServers).setAttributes(affinity).build()); inOrder.verify(mockHelper).updateSubchannelAddresses(eq(mockSubchannel), eq(newServers)); verifyNoMoreInteractions(mockSubchannel); @@ -174,7 +174,7 @@ public class PickFirstLoadBalancerTest { InOrder inOrder = inOrder(mockHelper); loadBalancer.handleResolvedAddresses( - ResolvedAddresses.newBuilder().setServers(servers).setAttributes(affinity).build()); + ResolvedAddresses.newBuilder().setAddresses(servers).setAttributes(affinity).build()); inOrder.verify(mockHelper).createSubchannel(createArgsCaptor.capture()); CreateSubchannelArgs args = createArgsCaptor.getValue(); assertThat(args.getAddresses()).isEqualTo(servers); @@ -221,7 +221,7 @@ public class PickFirstLoadBalancerTest { verify(mockSubchannel, never()).requestConnection(); loadBalancer.handleResolvedAddresses( - ResolvedAddresses.newBuilder().setServers(servers).setAttributes(affinity).build()); + ResolvedAddresses.newBuilder().setAddresses(servers).setAttributes(affinity).build()); inOrder.verify(mockHelper).createSubchannel(createArgsCaptor.capture()); CreateSubchannelArgs args = createArgsCaptor.getValue(); assertThat(args.getAddresses()).isEqualTo(servers); @@ -242,7 +242,7 @@ public class PickFirstLoadBalancerTest { public void nameResolutionErrorWithStateChanges() throws Exception { InOrder inOrder = inOrder(mockHelper); loadBalancer.handleResolvedAddresses( - ResolvedAddresses.newBuilder().setServers(servers).setAttributes(affinity).build()); + ResolvedAddresses.newBuilder().setAddresses(servers).setAttributes(affinity).build()); inOrder.verify(mockHelper).createSubchannel(createArgsCaptor.capture()); CreateSubchannelArgs args = createArgsCaptor.getValue(); assertThat(args.getAddresses()).isEqualTo(servers); @@ -279,7 +279,7 @@ public class PickFirstLoadBalancerTest { @Test public void requestConnection() { loadBalancer.handleResolvedAddresses( - ResolvedAddresses.newBuilder().setServers(servers).setAttributes(affinity).build()); + ResolvedAddresses.newBuilder().setAddresses(servers).setAttributes(affinity).build()); verify(mockHelper).createSubchannel(createArgsCaptor.capture()); CreateSubchannelArgs args = createArgsCaptor.getValue(); assertThat(args.getAddresses()).isEqualTo(servers); diff --git a/core/src/test/java/io/grpc/util/RoundRobinLoadBalancerTest.java b/core/src/test/java/io/grpc/util/RoundRobinLoadBalancerTest.java index f2a52a949c..6ac4c8a98e 100644 --- a/core/src/test/java/io/grpc/util/RoundRobinLoadBalancerTest.java +++ b/core/src/test/java/io/grpc/util/RoundRobinLoadBalancerTest.java @@ -154,7 +154,7 @@ public class RoundRobinLoadBalancerTest { public void pickAfterResolved() throws Exception { final Subchannel readySubchannel = subchannels.values().iterator().next(); loadBalancer.handleResolvedAddresses( - ResolvedAddresses.newBuilder().setServers(servers).setAttributes(affinity).build()); + ResolvedAddresses.newBuilder().setAddresses(servers).setAttributes(affinity).build()); deliverSubchannelState(readySubchannel, ConnectivityStateInfo.forNonError(READY)); verify(mockHelper, times(3)).createSubchannel(createArgsCaptor.capture()); @@ -209,7 +209,8 @@ public class RoundRobinLoadBalancerTest { InOrder inOrder = inOrder(mockHelper); loadBalancer.handleResolvedAddresses( - ResolvedAddresses.newBuilder().setServers(currentServers).setAttributes(affinity).build()); + ResolvedAddresses.newBuilder().setAddresses(currentServers).setAttributes(affinity) + .build()); inOrder.verify(mockHelper).updateBalancingState(eq(CONNECTING), pickerCaptor.capture()); @@ -232,7 +233,7 @@ public class RoundRobinLoadBalancerTest { new EquivalentAddressGroup(newAddr)); ; loadBalancer.handleResolvedAddresses( - ResolvedAddresses.newBuilder().setServers(latestServers).setAttributes(affinity).build()); + ResolvedAddresses.newBuilder().setAddresses(latestServers).setAttributes(affinity).build()); verify(newSubchannel, times(1)).requestConnection(); verify(removedSubchannel, times(1)).shutdown(); @@ -252,7 +253,7 @@ public class RoundRobinLoadBalancerTest { // test going from non-empty to empty loadBalancer.handleResolvedAddresses( ResolvedAddresses.newBuilder() - .setServers(Collections.emptyList()) + .setAddresses(Collections.emptyList()) .setAttributes(affinity) .build()); @@ -267,7 +268,8 @@ public class RoundRobinLoadBalancerTest { public void pickAfterStateChange() throws Exception { InOrder inOrder = inOrder(mockHelper); loadBalancer.handleResolvedAddresses( - ResolvedAddresses.newBuilder().setServers(servers).setAttributes(Attributes.EMPTY).build()); + ResolvedAddresses.newBuilder().setAddresses(servers).setAttributes(Attributes.EMPTY) + .build()); Subchannel subchannel = loadBalancer.getSubchannels().iterator().next(); Ref subchannelStateInfo = subchannel.getAttributes().get( STATE_INFO); @@ -347,7 +349,7 @@ public class RoundRobinLoadBalancerTest { public void nameResolutionErrorWithActiveChannels() throws Exception { final Subchannel readySubchannel = subchannels.values().iterator().next(); loadBalancer.handleResolvedAddresses( - ResolvedAddresses.newBuilder().setServers(servers).setAttributes(affinity).build()); + ResolvedAddresses.newBuilder().setAddresses(servers).setAttributes(affinity).build()); deliverSubchannelState(readySubchannel, ConnectivityStateInfo.forNonError(READY)); loadBalancer.handleNameResolutionError(Status.NOT_FOUND.withDescription("nameResolutionError")); @@ -377,7 +379,8 @@ public class RoundRobinLoadBalancerTest { Subchannel sc3 = subchannelIterator.next(); loadBalancer.handleResolvedAddresses( - ResolvedAddresses.newBuilder().setServers(servers).setAttributes(Attributes.EMPTY).build()); + ResolvedAddresses.newBuilder().setAddresses(servers).setAttributes(Attributes.EMPTY) + .build()); verify(sc1, times(1)).requestConnection(); verify(sc2, times(1)).requestConnection(); verify(sc3, times(1)).requestConnection(); @@ -416,7 +419,8 @@ public class RoundRobinLoadBalancerTest { @Test public void noStickinessEnabled_withStickyHeader() { loadBalancer.handleResolvedAddresses( - ResolvedAddresses.newBuilder().setServers(servers).setAttributes(Attributes.EMPTY).build()); + ResolvedAddresses.newBuilder().setAddresses(servers).setAttributes(Attributes.EMPTY) + .build()); for (Subchannel subchannel : subchannels.values()) { deliverSubchannelState(subchannel, ConnectivityStateInfo.forNonError(READY)); } @@ -450,7 +454,7 @@ public class RoundRobinLoadBalancerTest { Attributes attributes = Attributes.newBuilder() .set(GrpcAttributes.NAME_RESOLVER_SERVICE_CONFIG, serviceConfig).build(); loadBalancer.handleResolvedAddresses( - ResolvedAddresses.newBuilder().setServers(servers).setAttributes(attributes).build()); + ResolvedAddresses.newBuilder().setAddresses(servers).setAttributes(attributes).build()); for (Subchannel subchannel : subchannels.values()) { deliverSubchannelState(subchannel, ConnectivityStateInfo.forNonError(READY)); } @@ -483,7 +487,7 @@ public class RoundRobinLoadBalancerTest { Attributes attributes = Attributes.newBuilder() .set(GrpcAttributes.NAME_RESOLVER_SERVICE_CONFIG, serviceConfig).build(); loadBalancer.handleResolvedAddresses( - ResolvedAddresses.newBuilder().setServers(servers).setAttributes(attributes).build()); + ResolvedAddresses.newBuilder().setAddresses(servers).setAttributes(attributes).build()); for (Subchannel subchannel : subchannels.values()) { deliverSubchannelState(subchannel, ConnectivityStateInfo.forNonError(READY)); } @@ -514,7 +518,7 @@ public class RoundRobinLoadBalancerTest { Attributes attributes = Attributes.newBuilder() .set(GrpcAttributes.NAME_RESOLVER_SERVICE_CONFIG, serviceConfig).build(); loadBalancer.handleResolvedAddresses( - ResolvedAddresses.newBuilder().setServers(servers).setAttributes(attributes).build()); + ResolvedAddresses.newBuilder().setAddresses(servers).setAttributes(attributes).build()); for (Subchannel subchannel : subchannels.values()) { deliverSubchannelState(subchannel, ConnectivityStateInfo.forNonError(READY)); } @@ -560,7 +564,7 @@ public class RoundRobinLoadBalancerTest { Attributes attributes = Attributes.newBuilder() .set(GrpcAttributes.NAME_RESOLVER_SERVICE_CONFIG, serviceConfig).build(); loadBalancer.handleResolvedAddresses( - ResolvedAddresses.newBuilder().setServers(servers).setAttributes(attributes).build()); + ResolvedAddresses.newBuilder().setAddresses(servers).setAttributes(attributes).build()); for (Subchannel subchannel : subchannels.values()) { deliverSubchannelState(subchannel, ConnectivityStateInfo.forNonError(READY)); } @@ -608,7 +612,7 @@ public class RoundRobinLoadBalancerTest { Attributes attributes = Attributes.newBuilder() .set(GrpcAttributes.NAME_RESOLVER_SERVICE_CONFIG, serviceConfig).build(); loadBalancer.handleResolvedAddresses( - ResolvedAddresses.newBuilder().setServers(servers).setAttributes(attributes).build()); + ResolvedAddresses.newBuilder().setAddresses(servers).setAttributes(attributes).build()); for (Subchannel subchannel : subchannels.values()) { deliverSubchannelState(subchannel, ConnectivityStateInfo.forNonError(READY)); } @@ -662,7 +666,7 @@ public class RoundRobinLoadBalancerTest { Attributes attributes = Attributes.newBuilder() .set(GrpcAttributes.NAME_RESOLVER_SERVICE_CONFIG, serviceConfig).build(); loadBalancer.handleResolvedAddresses( - ResolvedAddresses.newBuilder().setServers(servers).setAttributes(attributes).build()); + ResolvedAddresses.newBuilder().setAddresses(servers).setAttributes(attributes).build()); for (Subchannel subchannel : subchannels.values()) { deliverSubchannelState(subchannel, ConnectivityStateInfo.forNonError(READY)); } @@ -698,7 +702,7 @@ public class RoundRobinLoadBalancerTest { newServers.remove(sc2.getAddresses()); loadBalancer.handleResolvedAddresses( - ResolvedAddresses.newBuilder().setServers(newServers).setAttributes(attributes).build()); + ResolvedAddresses.newBuilder().setAddresses(newServers).setAttributes(attributes).build()); verify(sc2, times(1)).shutdown(); @@ -719,7 +723,7 @@ public class RoundRobinLoadBalancerTest { Attributes attributes1 = Attributes.newBuilder() .set(GrpcAttributes.NAME_RESOLVER_SERVICE_CONFIG, serviceConfig1).build(); loadBalancer.handleResolvedAddresses( - ResolvedAddresses.newBuilder().setServers(servers).setAttributes(attributes1).build()); + ResolvedAddresses.newBuilder().setAddresses(servers).setAttributes(attributes1).build()); Map stickinessMap1 = loadBalancer.getStickinessMapForTest(); Map serviceConfig2 = new HashMap<>(); @@ -727,7 +731,7 @@ public class RoundRobinLoadBalancerTest { Attributes attributes2 = Attributes.newBuilder() .set(GrpcAttributes.NAME_RESOLVER_SERVICE_CONFIG, serviceConfig2).build(); loadBalancer.handleResolvedAddresses( - ResolvedAddresses.newBuilder().setServers(servers).setAttributes(attributes2).build()); + ResolvedAddresses.newBuilder().setAddresses(servers).setAttributes(attributes2).build()); Map stickinessMap2 = loadBalancer.getStickinessMapForTest(); assertNotSame(stickinessMap1, stickinessMap2); @@ -740,11 +744,11 @@ public class RoundRobinLoadBalancerTest { Attributes attributes1 = Attributes.newBuilder() .set(GrpcAttributes.NAME_RESOLVER_SERVICE_CONFIG, serviceConfig1).build(); loadBalancer.handleResolvedAddresses( - ResolvedAddresses.newBuilder().setServers(servers).setAttributes(attributes1).build()); + ResolvedAddresses.newBuilder().setAddresses(servers).setAttributes(attributes1).build()); Map stickinessMap1 = loadBalancer.getStickinessMapForTest(); loadBalancer.handleResolvedAddresses( - ResolvedAddresses.newBuilder().setServers(servers).setAttributes(attributes1).build()); + ResolvedAddresses.newBuilder().setAddresses(servers).setAttributes(attributes1).build()); Map stickinessMap2 = loadBalancer.getStickinessMapForTest(); assertSame(stickinessMap1, stickinessMap2); diff --git a/grpclb/src/main/java/io/grpc/grpclb/GrpclbLoadBalancer.java b/grpclb/src/main/java/io/grpc/grpclb/GrpclbLoadBalancer.java index e4e2bc86ab..8797c82d79 100644 --- a/grpclb/src/main/java/io/grpc/grpclb/GrpclbLoadBalancer.java +++ b/grpclb/src/main/java/io/grpc/grpclb/GrpclbLoadBalancer.java @@ -81,7 +81,7 @@ class GrpclbLoadBalancer extends LoadBalancer { @Override public void handleResolvedAddresses(ResolvedAddresses resolvedAddresses) { - List updatedServers = resolvedAddresses.getServers(); + List updatedServers = resolvedAddresses.getAddresses(); Attributes attributes = resolvedAddresses.getAttributes(); // LB addresses and backend addresses are treated separately List newLbAddressGroups = new ArrayList<>(); diff --git a/grpclb/src/test/java/io/grpc/grpclb/GrpclbLoadBalancerTest.java b/grpclb/src/test/java/io/grpc/grpclb/GrpclbLoadBalancerTest.java index a425b855b9..36c98cd734 100644 --- a/grpclb/src/test/java/io/grpc/grpclb/GrpclbLoadBalancerTest.java +++ b/grpclb/src/test/java/io/grpc/grpclb/GrpclbLoadBalancerTest.java @@ -2096,7 +2096,7 @@ public class GrpclbLoadBalancerTest { @Override public void run() { balancer.handleResolvedAddresses( - ResolvedAddresses.newBuilder().setServers(addrs).setAttributes(attrs).build()); + ResolvedAddresses.newBuilder().setAddresses(addrs).setAttributes(attrs).build()); } }); } diff --git a/services/src/test/java/io/grpc/services/HealthCheckingLoadBalancerFactoryTest.java b/services/src/test/java/io/grpc/services/HealthCheckingLoadBalancerFactoryTest.java index 331722cf1a..ef3d0a1e58 100644 --- a/services/src/test/java/io/grpc/services/HealthCheckingLoadBalancerFactoryTest.java +++ b/services/src/test/java/io/grpc/services/HealthCheckingLoadBalancerFactoryTest.java @@ -250,7 +250,7 @@ public class HealthCheckingLoadBalancerFactoryTest { public void typicalWorkflow() { Attributes resolutionAttrs = attrsWithHealthCheckService("FooService"); ResolvedAddresses result = ResolvedAddresses.newBuilder() - .setServers(resolvedAddressList) + .setAddresses(resolvedAddressList) .setAttributes(resolutionAttrs) .build(); hcLbEventDelivery.handleResolvedAddresses(result); @@ -362,7 +362,7 @@ public class HealthCheckingLoadBalancerFactoryTest { public void healthCheckDisabledWhenServiceNotImplemented() { Attributes resolutionAttrs = attrsWithHealthCheckService("BarService"); ResolvedAddresses result = ResolvedAddresses.newBuilder() - .setServers(resolvedAddressList) + .setAddresses(resolvedAddressList) .setAttributes(resolutionAttrs) .build(); hcLbEventDelivery.handleResolvedAddresses(result); @@ -433,7 +433,7 @@ public class HealthCheckingLoadBalancerFactoryTest { public void backoffRetriesWhenServerErroneouslyClosesRpcBeforeAnyResponse() { Attributes resolutionAttrs = attrsWithHealthCheckService("TeeService"); ResolvedAddresses result = ResolvedAddresses.newBuilder() - .setServers(resolvedAddressList) + .setAddresses(resolvedAddressList) .setAttributes(resolutionAttrs) .build(); hcLbEventDelivery.handleResolvedAddresses(result); @@ -506,7 +506,7 @@ public class HealthCheckingLoadBalancerFactoryTest { public void serverRespondResetsBackoff() { Attributes resolutionAttrs = attrsWithHealthCheckService("TeeService"); ResolvedAddresses result = ResolvedAddresses.newBuilder() - .setServers(resolvedAddressList) + .setAddresses(resolvedAddressList) .setAttributes(resolutionAttrs) .build(); hcLbEventDelivery.handleResolvedAddresses(result); @@ -603,7 +603,7 @@ public class HealthCheckingLoadBalancerFactoryTest { public void serviceConfigHasNoHealthCheckingInitiallyButDoesLater() { // No service config, thus no health check. ResolvedAddresses result1 = ResolvedAddresses.newBuilder() - .setServers(resolvedAddressList) + .setAddresses(resolvedAddressList) .setAttributes(Attributes.EMPTY) .build(); hcLbEventDelivery.handleResolvedAddresses(result1); @@ -625,7 +625,7 @@ public class HealthCheckingLoadBalancerFactoryTest { // Service config enables health check Attributes resolutionAttrs = attrsWithHealthCheckService("FooService"); ResolvedAddresses result2 = ResolvedAddresses.newBuilder() - .setServers(resolvedAddressList) + .setAddresses(resolvedAddressList) .setAttributes(resolutionAttrs) .build(); hcLbEventDelivery.handleResolvedAddresses(result2); @@ -648,7 +648,7 @@ public class HealthCheckingLoadBalancerFactoryTest { public void serviceConfigDisablesHealthCheckWhenRpcActive() { Attributes resolutionAttrs = attrsWithHealthCheckService("TeeService"); ResolvedAddresses result1 = ResolvedAddresses.newBuilder() - .setServers(resolvedAddressList) + .setAddresses(resolvedAddressList) .setAttributes(resolutionAttrs) .build(); hcLbEventDelivery.handleResolvedAddresses(result1); @@ -671,7 +671,7 @@ public class HealthCheckingLoadBalancerFactoryTest { // NameResolver gives an update without service config, thus health check will be disabled ResolvedAddresses result2 = ResolvedAddresses.newBuilder() - .setServers(resolvedAddressList) + .setAddresses(resolvedAddressList) .setAttributes(Attributes.EMPTY) .build(); hcLbEventDelivery.handleResolvedAddresses(result2); @@ -692,7 +692,7 @@ public class HealthCheckingLoadBalancerFactoryTest { public void serviceConfigDisablesHealthCheckWhenRetryPending() { Attributes resolutionAttrs = attrsWithHealthCheckService("TeeService"); ResolvedAddresses result = ResolvedAddresses.newBuilder() - .setServers(resolvedAddressList) + .setAddresses(resolvedAddressList) .setAttributes(resolutionAttrs) .build(); hcLbEventDelivery.handleResolvedAddresses(result); @@ -722,7 +722,7 @@ public class HealthCheckingLoadBalancerFactoryTest { // NameResolver gives an update without service config, thus health check will be disabled ResolvedAddresses result2 = ResolvedAddresses.newBuilder() - .setServers(resolvedAddressList) + .setAddresses(resolvedAddressList) .setAttributes(Attributes.EMPTY) .build(); hcLbEventDelivery.handleResolvedAddresses(result2); @@ -746,7 +746,7 @@ public class HealthCheckingLoadBalancerFactoryTest { public void serviceConfigDisablesHealthCheckWhenRpcInactive() { Attributes resolutionAttrs = attrsWithHealthCheckService("TeeService"); ResolvedAddresses result1 = ResolvedAddresses.newBuilder() - .setServers(resolvedAddressList) + .setAddresses(resolvedAddressList) .setAttributes(resolutionAttrs) .build(); hcLbEventDelivery.handleResolvedAddresses(result1); @@ -769,7 +769,7 @@ public class HealthCheckingLoadBalancerFactoryTest { // NameResolver gives an update without service config, thus health check will be disabled ResolvedAddresses result2 = ResolvedAddresses.newBuilder() - .setServers(resolvedAddressList) + .setAddresses(resolvedAddressList) .setAttributes(Attributes.EMPTY) .build(); hcLbEventDelivery.handleResolvedAddresses(result2); @@ -793,7 +793,7 @@ public class HealthCheckingLoadBalancerFactoryTest { public void serviceConfigChangesServiceNameWhenRpcActive() { Attributes resolutionAttrs = attrsWithHealthCheckService("TeeService"); ResolvedAddresses result1 = ResolvedAddresses.newBuilder() - .setServers(resolvedAddressList) + .setAddresses(resolvedAddressList) .setAttributes(resolutionAttrs) .build(); hcLbEventDelivery.handleResolvedAddresses(result1); @@ -830,7 +830,7 @@ public class HealthCheckingLoadBalancerFactoryTest { // Service config returns a different health check name. resolutionAttrs = attrsWithHealthCheckService("FooService"); ResolvedAddresses result2 = ResolvedAddresses.newBuilder() - .setServers(resolvedAddressList) + .setAddresses(resolvedAddressList) .setAttributes(resolutionAttrs) .build(); hcLbEventDelivery.handleResolvedAddresses(result2); @@ -853,7 +853,7 @@ public class HealthCheckingLoadBalancerFactoryTest { public void serviceConfigChangesServiceNameWhenRetryPending() { Attributes resolutionAttrs = attrsWithHealthCheckService("TeeService"); ResolvedAddresses result1 = ResolvedAddresses.newBuilder() - .setServers(resolvedAddressList) + .setAddresses(resolvedAddressList) .setAttributes(resolutionAttrs) .build(); hcLbEventDelivery.handleResolvedAddresses(result1); @@ -898,7 +898,7 @@ public class HealthCheckingLoadBalancerFactoryTest { // Service config returns a different health check name. resolutionAttrs = attrsWithHealthCheckService("FooService"); ResolvedAddresses result2 = ResolvedAddresses.newBuilder() - .setServers(resolvedAddressList) + .setAddresses(resolvedAddressList) .setAttributes(resolutionAttrs) .build(); hcLbEventDelivery.handleResolvedAddresses(result2); @@ -925,7 +925,7 @@ public class HealthCheckingLoadBalancerFactoryTest { public void serviceConfigChangesServiceNameWhenRpcInactive() { Attributes resolutionAttrs = attrsWithHealthCheckService("TeeService"); ResolvedAddresses result1 = ResolvedAddresses.newBuilder() - .setServers(resolvedAddressList) + .setAddresses(resolvedAddressList) .setAttributes(resolutionAttrs) .build(); hcLbEventDelivery.handleResolvedAddresses(result1); @@ -957,7 +957,7 @@ public class HealthCheckingLoadBalancerFactoryTest { // Service config returns a different health check name. resolutionAttrs = attrsWithHealthCheckService("FooService"); ResolvedAddresses result2 = ResolvedAddresses.newBuilder() - .setServers(resolvedAddressList) + .setAddresses(resolvedAddressList) .setAttributes(resolutionAttrs) .build(); hcLbEventDelivery.handleResolvedAddresses(result2); @@ -1011,7 +1011,7 @@ public class HealthCheckingLoadBalancerFactoryTest { public void balancerShutdown() { Attributes resolutionAttrs = attrsWithHealthCheckService("TeeService"); ResolvedAddresses result = ResolvedAddresses.newBuilder() - .setServers(resolvedAddressList) + .setAddresses(resolvedAddressList) .setAttributes(resolutionAttrs) .build(); hcLbEventDelivery.handleResolvedAddresses(result); @@ -1068,7 +1068,7 @@ public class HealthCheckingLoadBalancerFactoryTest { // Verify that HC works Attributes resolutionAttrs = attrsWithHealthCheckService("BarService"); ResolvedAddresses result = ResolvedAddresses.newBuilder() - .setServers(resolvedAddressList) + .setAddresses(resolvedAddressList) .setAttributes(resolutionAttrs) .build(); hcLbEventDelivery.handleResolvedAddresses(result); diff --git a/xds/src/main/java/io/grpc/xds/XdsLoadBalancer.java b/xds/src/main/java/io/grpc/xds/XdsLoadBalancer.java index e98738a598..75f321fe18 100644 --- a/xds/src/main/java/io/grpc/xds/XdsLoadBalancer.java +++ b/xds/src/main/java/io/grpc/xds/XdsLoadBalancer.java @@ -85,7 +85,7 @@ final class XdsLoadBalancer extends LoadBalancer { @Override public void handleResolvedAddresses(ResolvedAddresses resolvedAddresses) { - List servers = resolvedAddresses.getServers(); + List servers = resolvedAddresses.getAddresses(); Attributes attributes = resolvedAddresses.getAttributes(); Map newRawLbConfig = checkNotNull( attributes.get(ATTR_LOAD_BALANCING_CONFIG), "ATTR_LOAD_BALANCING_CONFIG not available"); @@ -256,7 +256,7 @@ final class XdsLoadBalancer extends LoadBalancer { // TODO(carl-mastrangelo): propagate the load balancing config policy fallbackBalancer.handleResolvedAddresses( ResolvedAddresses.newBuilder() - .setServers(fallbackServers) + .setAddresses(fallbackServers) .setAttributes(fallbackAttributes) .build()); @@ -278,7 +278,7 @@ final class XdsLoadBalancer extends LoadBalancer { // TODO(carl-mastrangelo): propagate the load balancing config policy fallbackBalancer.handleResolvedAddresses( ResolvedAddresses.newBuilder() - .setServers(fallbackServers) + .setAddresses(fallbackServers) .setAttributes(fallbackAttributes) .build()); } else { diff --git a/xds/src/test/java/io/grpc/xds/FallbackManagerTest.java b/xds/src/test/java/io/grpc/xds/FallbackManagerTest.java index 04131c15e6..a3f2a4f38b 100644 --- a/xds/src/test/java/io/grpc/xds/FallbackManagerTest.java +++ b/xds/src/test/java/io/grpc/xds/FallbackManagerTest.java @@ -127,7 +127,7 @@ public class FallbackManagerTest { verify(fakeLb).handleResolvedAddresses( ResolvedAddresses.newBuilder() - .setServers(eags) + .setAddresses(eags) .setAttributes( Attributes.newBuilder() .set( diff --git a/xds/src/test/java/io/grpc/xds/XdsLoadBalancerTest.java b/xds/src/test/java/io/grpc/xds/XdsLoadBalancerTest.java index 8cbaaf6687..facf05b1d6 100644 --- a/xds/src/test/java/io/grpc/xds/XdsLoadBalancerTest.java +++ b/xds/src/test/java/io/grpc/xds/XdsLoadBalancerTest.java @@ -262,7 +262,7 @@ public class XdsLoadBalancerTest { lb.handleResolvedAddresses( ResolvedAddresses.newBuilder() - .setServers(Collections.emptyList()) + .setAddresses(Collections.emptyList()) .setAttributes(attrs) .build()); @@ -284,7 +284,7 @@ public class XdsLoadBalancerTest { lb.handleResolvedAddresses( ResolvedAddresses.newBuilder() - .setServers(Collections.emptyList()) + .setAddresses(Collections.emptyList()) .setAttributes(attrs) .build()); @@ -313,7 +313,7 @@ public class XdsLoadBalancerTest { lb.handleResolvedAddresses( ResolvedAddresses.newBuilder() - .setServers(Collections.emptyList()) + .setAddresses(Collections.emptyList()) .setAttributes(attrs) .build()); verify(helper).createOobChannel(ArgumentMatchers.any(), anyString()); @@ -332,7 +332,7 @@ public class XdsLoadBalancerTest { lb.handleResolvedAddresses( ResolvedAddresses.newBuilder() - .setServers(Collections.emptyList()) + .setAddresses(Collections.emptyList()) .setAttributes(attrs) .build()); @@ -359,7 +359,7 @@ public class XdsLoadBalancerTest { lb.handleResolvedAddresses( ResolvedAddresses.newBuilder() - .setServers(Collections.emptyList()) + .setAddresses(Collections.emptyList()) .setAttributes(attrs) .build()); verify(helper).createOobChannel(ArgumentMatchers.any(), anyString()); @@ -380,7 +380,7 @@ public class XdsLoadBalancerTest { lb.handleResolvedAddresses( ResolvedAddresses.newBuilder() - .setServers(Collections.emptyList()) + .setAddresses(Collections.emptyList()) .setAttributes(attrs) .build()); @@ -406,7 +406,7 @@ public class XdsLoadBalancerTest { Attributes attrs = Attributes.newBuilder().set(ATTR_LOAD_BALANCING_CONFIG, lbConfig).build(); lb.handleResolvedAddresses( ResolvedAddresses.newBuilder() - .setServers(Collections.emptyList()) + .setAddresses(Collections.emptyList()) .setAttributes(attrs) .build()); @@ -427,7 +427,7 @@ public class XdsLoadBalancerTest { lb.handleResolvedAddresses( ResolvedAddresses.newBuilder() - .setServers(Collections.emptyList()) + .setAddresses(Collections.emptyList()) .setAttributes(attrs) .build()); @@ -453,7 +453,7 @@ public class XdsLoadBalancerTest { lb.handleResolvedAddresses( ResolvedAddresses.newBuilder() - .setServers(Collections.emptyList()) + .setAddresses(Collections.emptyList()) .setAttributes(attrs) .build()); verify(helper).createOobChannel(ArgumentMatchers.any(), anyString()); @@ -472,7 +472,7 @@ public class XdsLoadBalancerTest { lb.handleResolvedAddresses( ResolvedAddresses.newBuilder() - .setServers(Collections.emptyList()) + .setAddresses(Collections.emptyList()) .setAttributes(attrs) .build()); @@ -494,7 +494,7 @@ public class XdsLoadBalancerTest { public void fallback_AdsNotWorkingYetTimerExpired() throws Exception { lb.handleResolvedAddresses( ResolvedAddresses.newBuilder() - .setServers(Collections.emptyList()) + .setAddresses(Collections.emptyList()) .setAttributes(standardModeWithFallback1Attributes()) .build()); @@ -511,7 +511,7 @@ public class XdsLoadBalancerTest { public void fallback_AdsWorkingTimerCancelled() throws Exception { lb.handleResolvedAddresses( ResolvedAddresses.newBuilder() - .setServers(Collections.emptyList()) + .setAddresses(Collections.emptyList()) .setAttributes(standardModeWithFallback1Attributes()) .build()); serverResponseWriter.onNext(DiscoveryResponse.getDefaultInstance()); @@ -525,7 +525,7 @@ public class XdsLoadBalancerTest { public void fallback_AdsErrorAndNoActiveSubchannel() throws Exception { lb.handleResolvedAddresses( ResolvedAddresses.newBuilder() - .setServers(Collections.emptyList()) + .setAddresses(Collections.emptyList()) .setAttributes(standardModeWithFallback1Attributes()) .build()); @@ -547,7 +547,7 @@ public class XdsLoadBalancerTest { public void fallback_AdsErrorWithActiveSubchannel() throws Exception { lb.handleResolvedAddresses( ResolvedAddresses.newBuilder() - .setServers(Collections.emptyList()) + .setAddresses(Collections.emptyList()) .setAttributes(standardModeWithFallback1Attributes()) .build()); @@ -608,7 +608,7 @@ public class XdsLoadBalancerTest { Attributes attrs = Attributes.newBuilder().set(ATTR_LOAD_BALANCING_CONFIG, lbConfig).build(); lb.handleResolvedAddresses( ResolvedAddresses.newBuilder() - .setServers(Collections.emptyList()) + .setAddresses(Collections.emptyList()) .setAttributes(attrs) .build());