From 81ba42a1d68500cb3dbbfbb75c2397ade306ec3d Mon Sep 17 00:00:00 2001 From: Ran Date: Mon, 3 Jun 2019 09:34:04 -0700 Subject: [PATCH] core: expose some of AutoConfiguredLoadBalancer because some internal tests need to access them (#5821) * core: revert some changes to fix tests * fix style --- .../internal/AutoConfiguredLoadBalancerFactory.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/io/grpc/internal/AutoConfiguredLoadBalancerFactory.java b/core/src/main/java/io/grpc/internal/AutoConfiguredLoadBalancerFactory.java index 1d48b31bc4..33afe25f4e 100644 --- a/core/src/main/java/io/grpc/internal/AutoConfiguredLoadBalancerFactory.java +++ b/core/src/main/java/io/grpc/internal/AutoConfiguredLoadBalancerFactory.java @@ -45,7 +45,7 @@ import java.util.Map; import java.util.logging.Logger; import javax.annotation.Nullable; -final class AutoConfiguredLoadBalancerFactory { +public final class AutoConfiguredLoadBalancerFactory { private static final Logger logger = Logger.getLogger(AutoConfiguredLoadBalancerFactory.class.getName()); private static final String GRPCLB_POLICY_NAME = "grpclb"; @@ -63,7 +63,7 @@ final class AutoConfiguredLoadBalancerFactory { this.defaultPolicy = checkNotNull(defaultPolicy, "defaultPolicy"); } - AutoConfiguredLoadBalancer newLoadBalancer(Helper helper) { + public AutoConfiguredLoadBalancer newLoadBalancer(Helper helper) { return new AutoConfiguredLoadBalancer(helper); } @@ -84,7 +84,7 @@ final class AutoConfiguredLoadBalancerFactory { } @VisibleForTesting - final class AutoConfiguredLoadBalancer { + public final class AutoConfiguredLoadBalancer { private final Helper helper; private LoadBalancer delegate; private LoadBalancerProvider delegateProvider; @@ -101,6 +101,10 @@ final class AutoConfiguredLoadBalancerFactory { delegate = delegateProvider.newLoadBalancer(helper); } + public void handleResolvedAddresses(ResolvedAddresses resolvedAddresses) { + tryHandleResolvedAddresses(resolvedAddresses); + } + /** * Returns non-OK status if resolvedAddresses is rejected and should be considered as a * name-resolution error. @@ -179,7 +183,7 @@ final class AutoConfiguredLoadBalancerFactory { } @VisibleForTesting - LoadBalancer getDelegate() { + public LoadBalancer getDelegate() { return delegate; }