Skip to content

Commit e67c0cb

Browse files
committed
use the new API in channelProviders
1 parent e65d7ca commit e67c0cb

3 files changed

Lines changed: 24 additions & 3 deletions

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
@@ -481,11 +481,16 @@ public ManagedChannelImplBuilder nameResolverFactory(NameResolver.Factory resolv
481481
return this;
482482
}
483483

484-
ManagedChannelImplBuilder nameResolverRegistry(NameResolverRegistry resolverRegistry) {
484+
public ManagedChannelImplBuilder nameResolverRegistry(NameResolverRegistry resolverRegistry) {
485485
this.nameResolverRegistry = resolverRegistry;
486486
return this;
487487
}
488488

489+
public ManagedChannelImplBuilder nameResolverProvider(NameResolverProvider provider) {
490+
this.nameResolverProvider = provider;
491+
return this;
492+
}
493+
489494
@Override
490495
public ManagedChannelImplBuilder defaultLoadBalancingPolicy(String policy) {
491496
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
@@ -720,6 +720,24 @@ NettyChannelBuilder setTransportTracerFactory(TransportTracer.Factory transportT
720720
return this;
721721
}
722722

723+
/**
724+
* Sets the registry used for looking up name resolvers.
725+
*/
726+
@CanIgnoreReturnValue
727+
public NettyChannelBuilder nameResolverRegistry(NameResolverRegistry registry) {
728+
managedChannelImplBuilder.nameResolverRegistry(registry);
729+
return this;
730+
}
731+
732+
/**
733+
* Sets the {@link io.grpc.NameResolverProvider} to use.
734+
*/
735+
@CanIgnoreReturnValue
736+
public NettyChannelBuilder nameResolverProvider(NameResolverProvider provider) {
737+
managedChannelImplBuilder.nameResolverProvider(provider);
738+
return this;
739+
}
740+
723741

724742

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

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

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

603-
604-
605603
private static final EnumSet<TlsChannelCredentials.Feature> understoodTlsFeatures =
606604
EnumSet.of(
607605
TlsChannelCredentials.Feature.MTLS, TlsChannelCredentials.Feature.CUSTOM_MANAGERS);

0 commit comments

Comments
 (0)