From 5a5bc46dde59229c0e73e4a560fc363de99530ae Mon Sep 17 00:00:00 2001 From: AgraVator Date: Tue, 25 Mar 2025 11:03:13 +0530 Subject: [PATCH 1/3] feat(api): adds new channel builder with name resolver registry and provider --- api/src/main/java/io/grpc/Grpc.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/api/src/main/java/io/grpc/Grpc.java b/api/src/main/java/io/grpc/Grpc.java index baa9f5f0ab6..7ffe5e04110 100644 --- a/api/src/main/java/io/grpc/Grpc.java +++ b/api/src/main/java/io/grpc/Grpc.java @@ -101,6 +101,15 @@ public static ManagedChannelBuilder newChannelBuilder( return ManagedChannelRegistry.getDefaultRegistry().newChannelBuilder(target, creds); } + /** + * Creates a channel builder with a target string, credentials, NameResolverRegistry adn NameResolverProvider. + */ + public static ManagedChannelBuilder newChannelBuilder( + String target, ChannelCredentials creds, NameResolverRegistry nameResolverRegistry, + NameResolverProvider nameResolverProvider) { + return ManagedChannelRegistry.getDefaultRegistry().newChannelBuilder(target, creds); + } + /** * Creates a channel builder from a host, port, and credentials. The host and port are combined to * form an authority string and then passed to {@link #newChannelBuilder(String, From 8cb30b3aeb79bac0e906bb0519988aea98e9c025 Mon Sep 17 00:00:00 2001 From: AgraVator Date: Tue, 25 Mar 2025 11:54:31 +0530 Subject: [PATCH 2/3] fix: exposes a new ManagedChannelProvider.newChannelBuilder with NameResolverRegistry and NameResolverProvider. --- api/src/main/java/io/grpc/Grpc.java | 9 --------- api/src/main/java/io/grpc/ManagedChannelProvider.java | 10 ++++++++++ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/api/src/main/java/io/grpc/Grpc.java b/api/src/main/java/io/grpc/Grpc.java index 7ffe5e04110..baa9f5f0ab6 100644 --- a/api/src/main/java/io/grpc/Grpc.java +++ b/api/src/main/java/io/grpc/Grpc.java @@ -101,15 +101,6 @@ public static ManagedChannelBuilder newChannelBuilder( return ManagedChannelRegistry.getDefaultRegistry().newChannelBuilder(target, creds); } - /** - * Creates a channel builder with a target string, credentials, NameResolverRegistry adn NameResolverProvider. - */ - public static ManagedChannelBuilder newChannelBuilder( - String target, ChannelCredentials creds, NameResolverRegistry nameResolverRegistry, - NameResolverProvider nameResolverProvider) { - return ManagedChannelRegistry.getDefaultRegistry().newChannelBuilder(target, creds); - } - /** * Creates a channel builder from a host, port, and credentials. The host and port are combined to * form an authority string and then passed to {@link #newChannelBuilder(String, diff --git a/api/src/main/java/io/grpc/ManagedChannelProvider.java b/api/src/main/java/io/grpc/ManagedChannelProvider.java index 42941dfc809..1a521ae75b0 100644 --- a/api/src/main/java/io/grpc/ManagedChannelProvider.java +++ b/api/src/main/java/io/grpc/ManagedChannelProvider.java @@ -81,6 +81,16 @@ protected NewChannelBuilderResult newChannelBuilder(String target, ChannelCreden return NewChannelBuilderResult.error("ChannelCredentials are unsupported"); } + /** + * Creates a channel builder with a target string, credentials, NameResolverRegistry adn NameResolverProvider. + * Returns an error-string result if unable to understand the credentials. + */ + protected NewChannelBuilderResult newChannelBuilder(String target, ChannelCredentials creds, + NameResolverRegistry nameResolverRegistry, + NameResolverProvider nameResolverProvider) { + return newChannelBuilder(target, creds); + } + /** * Returns the {@link SocketAddress} types this ManagedChannelProvider supports. */ From ae5c4a929e076cb67056c5032dcb517bb68f3c7a Mon Sep 17 00:00:00 2001 From: AgraVator Date: Tue, 25 Mar 2025 12:14:01 +0530 Subject: [PATCH 3/3] style: fixes checkstyle --- api/src/main/java/io/grpc/ManagedChannelProvider.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/api/src/main/java/io/grpc/ManagedChannelProvider.java b/api/src/main/java/io/grpc/ManagedChannelProvider.java index 1a521ae75b0..27638cb859c 100644 --- a/api/src/main/java/io/grpc/ManagedChannelProvider.java +++ b/api/src/main/java/io/grpc/ManagedChannelProvider.java @@ -82,8 +82,9 @@ protected NewChannelBuilderResult newChannelBuilder(String target, ChannelCreden } /** - * Creates a channel builder with a target string, credentials, NameResolverRegistry adn NameResolverProvider. - * Returns an error-string result if unable to understand the credentials. + * Creates a channel builder with a target string, credentials, NameResolverRegistry + * and NameResolverProvider. Returns an error-string result if unable to + * understand the credentials. */ protected NewChannelBuilderResult newChannelBuilder(String target, ChannelCredentials creds, NameResolverRegistry nameResolverRegistry,