grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

core: expose some of AutoConfiguredLoadBalancer because some internal tests need to access them (#5821) 

* core: revert some changes to fix tests

* fix style
This commit is contained in:
Ran 2019-06-03 09:34:04 -07:00 committed by GitHub
parent 93551719b9
commit 81ba42a1d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/main/java/io/grpc/internal/AutoConfiguredLoadBalancerFactory.java
View File

@ -45,7 +45,7 @@ import java.util.Map;
import java.util.logging.Logger; import java.util.logging.Logger;
import javax.annotation.Nullable; import javax.annotation.Nullable;
final class AutoConfiguredLoadBalancerFactory { public final class AutoConfiguredLoadBalancerFactory {
private static final Logger logger = private static final Logger logger =
Logger.getLogger(AutoConfiguredLoadBalancerFactory.class.getName()); Logger.getLogger(AutoConfiguredLoadBalancerFactory.class.getName());
private static final String GRPCLB_POLICY_NAME = "grpclb"; private static final String GRPCLB_POLICY_NAME = "grpclb";
@ -63,7 +63,7 @@ final class AutoConfiguredLoadBalancerFactory {
this.defaultPolicy = checkNotNull(defaultPolicy, "defaultPolicy"); this.defaultPolicy = checkNotNull(defaultPolicy, "defaultPolicy");
} }
AutoConfiguredLoadBalancer newLoadBalancer(Helper helper) { public AutoConfiguredLoadBalancer newLoadBalancer(Helper helper) {
return new AutoConfiguredLoadBalancer(helper); return new AutoConfiguredLoadBalancer(helper);
} }
@ -84,7 +84,7 @@ final class AutoConfiguredLoadBalancerFactory {
} }
@VisibleForTesting @VisibleForTesting
final class AutoConfiguredLoadBalancer { public final class AutoConfiguredLoadBalancer {
private final Helper helper; private final Helper helper;
private LoadBalancer delegate; private LoadBalancer delegate;
private LoadBalancerProvider delegateProvider; private LoadBalancerProvider delegateProvider;
@ -101,6 +101,10 @@ final class AutoConfiguredLoadBalancerFactory {
delegate = delegateProvider.newLoadBalancer(helper); 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 * Returns non-OK status if resolvedAddresses is rejected and should be considered as a
* name-resolution error. * name-resolution error.
@ -179,7 +183,7 @@ final class AutoConfiguredLoadBalancerFactory {
} }
@VisibleForTesting @VisibleForTesting
LoadBalancer getDelegate() { public LoadBalancer getDelegate() {
return delegate; return delegate;
} }