Skip to content

Commit a627be6

Browse files
committed
use the new API in channelProviders
1 parent 7d98147 commit a627be6

3 files changed

Lines changed: 40 additions & 1 deletion

File tree

core/src/main/java/io/grpc/internal/ManagedChannelImplBuilder.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,11 +486,16 @@ public ManagedChannelImplBuilder nameResolverFactory(NameResolver.Factory resolv
486486
return this;
487487
}
488488

489-
ManagedChannelImplBuilder nameResolverRegistry(NameResolverRegistry resolverRegistry) {
489+
public ManagedChannelImplBuilder nameResolverRegistry(NameResolverRegistry resolverRegistry) {
490490
this.nameResolverRegistry = resolverRegistry;
491491
return this;
492492
}
493493

494+
public ManagedChannelImplBuilder nameResolverProvider(NameResolverProvider provider) {
495+
this.nameResolverProvider = provider;
496+
return this;
497+
}
498+
494499
@Override
495500
public ManagedChannelImplBuilder defaultLoadBalancingPolicy(String policy) {
496501
Preconditions.checkState(directServerAddress == null,

netty/src/main/java/io/grpc/netty/NettyChannelBuilder.java

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -738,6 +738,24 @@ public NettyChannelBuilder nameResolverProvider(NameResolverProvider provider) {
738738
return this;
739739
}
740740

741+
/**
742+
* Sets the registry used for looking up name resolvers.
743+
*/
744+
@CanIgnoreReturnValue
745+
public NettyChannelBuilder nameResolverRegistry(NameResolverRegistry registry) {
746+
managedChannelImplBuilder.nameResolverRegistry(registry);
747+
return this;
748+
}
749+
750+
/**
751+
* Sets the {@link io.grpc.NameResolverProvider} to use.
752+
*/
753+
@CanIgnoreReturnValue
754+
public NettyChannelBuilder nameResolverProvider(NameResolverProvider provider) {
755+
managedChannelImplBuilder.nameResolverProvider(provider);
756+
return this;
757+
}
758+
741759

742760

743761
static Collection<Class<? extends SocketAddress>> getSupportedSocketAddressTypes() {

okhttp/src/main/java/io/grpc/okhttp/OkHttpChannelBuilder.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -600,6 +600,22 @@ SSLSocketFactory createSslSocketFactory() {
600600
}
601601
}
602602

603+
/**
604+
* Sets the registry used for looking up name resolvers.
605+
*/
606+
public OkHttpChannelBuilder nameResolverRegistry(NameResolverRegistry registry) {
607+
managedChannelImplBuilder.nameResolverRegistry(registry);
608+
return this;
609+
}
610+
611+
/**
612+
* Sets the {@link NameResolverProvider} to use.
613+
*/
614+
public OkHttpChannelBuilder nameResolverProvider(NameResolverProvider provider) {
615+
managedChannelImplBuilder.nameResolverProvider(provider);
616+
return this;
617+
}
618+
603619
private static final EnumSet<TlsChannelCredentials.Feature> understoodTlsFeatures =
604620
EnumSet.of(
605621
TlsChannelCredentials.Feature.MTLS, TlsChannelCredentials.Feature.CUSTOM_MANAGERS);

0 commit comments

Comments
 (0)