API for nameResolverRegistry

Author: AgraVator

api/src/main/java/io/grpc/Grpc.java

@@ -102,12 +102,32 @@ public static ManagedChannelBuilder<?> newChannelBuilder(
   }
 
   /**
-   * Creates a channel builder with a target string, credentials and nameResolverRegistry.
+   * Creates a channel builder with a target string, credentials, and a specific
+   * name resolver registry.
+   *
+   * <p>This method uses the {@link ManagedChannelRegistry#getDefaultRegistry()} to
+   * find an appropriate underlying transport provider based on the target and credentials.
+   * The provided {@code nameResolverRegistry} is used to resolve the target address
+   * into physical addresses (e.g., DNS or custom schemes).
+   *
+   * @param target the target URI for the channel, such as {@code "localhost:8080"}
+   *     or {@code "dns:///example.com"}
+   * @param creds the channel credentials to use for secure communication
+   * @param nameResolverRegistry the registry used to look up {@link NameResolver}
+   *     providers for the target
+   * @return a {@link ManagedChannelBuilder} instance configured with the given parameters
+   * @throws IllegalArgumentException if no provider is available for the given target
+   *     or credentials
+   * @since 1.79.0
    */
-  public static ManagedChannelBuilder<?> newChannelBuilder(String target,
-      ChannelCredentials creds, NameResolverRegistry nameResolverRegistry) {
-    return ManagedChannelRegistry.getDefaultRegistry().newChannelBuilder(nameResolverRegistry,
-      target, creds);
+  public static ManagedChannelBuilder<?> newChannelBuilder(
+      String target,
+      ChannelCredentials creds,
+      NameResolverRegistry nameResolverRegistry) {
+    return ManagedChannelRegistry.getDefaultRegistry().newChannelBuilder(
+        nameResolverRegistry,
+        target,
+        creds);
   }
 
   /**

api/src/main/java/io/grpc/ManagedChannelProvider.java

@@ -82,13 +82,28 @@ protected NewChannelBuilderResult newChannelBuilder(String target, ChannelCreden
   }
 
   /**
-   * Creates a channel builder with a target string, credentials, NameResolverRegistry
-   * and NameResolverProvider. Returns an error-string result if unable to
-   * understand the credentials.
+   * Creates a channel builder using the provided target, credentials, and resolution
+   * components.
+   *
+   * <p>This method allows for fine-grained control over name resolution by providing
+   * both a {@link NameResolverRegistry} and a specific {@link NameResolverProvider}.
+   * Unlike the public factory methods, this returns a {@link NewChannelBuilderResult},
+   * which may contain an error string if the provided credentials or target are
+   * not supported by this provider.
+   *
+   * @param target the target URI for the channel
+   * @param creds the channel credentials to use
+   * @param nameResolverRegistry the registry used for looking up name resolvers
+   * @param nameResolverProvider a specific provider to use, or {@code null} to
+   *     search the registry
+   * @return a {@link NewChannelBuilderResult} containing either the builder or an
+   *     error description
+   * @since 1.79.0
    */
   protected NewChannelBuilderResult newChannelBuilder(String target, ChannelCredentials creds,
                                                       NameResolverRegistry nameResolverRegistry,
                                                       NameResolverProvider nameResolverProvider) {
+    // Implementation note: Currently delegates to the simplified version
     return newChannelBuilder(target, creds);
   }
 

api/src/main/java/io/grpc/ManagedChannelRegistry.java

@@ -191,7 +191,7 @@ ManagedChannelBuilder<?> newChannelBuilder(NameResolverRegistry nameResolverRegi
         continue;
       }
       ManagedChannelProvider.NewChannelBuilderResult result
-          = provider.newChannelBuilder(target, creds);
+          = provider.newChannelBuilder(target, creds, nameResolverRegistry, nameResolverProvider);
       if (result.getChannelBuilder() != null) {
         return result.getChannelBuilder();
       }

netty/src/test/java/io/grpc/netty/UdsNettyChannelProviderTest.java

@@ -28,9 +28,7 @@
 import io.grpc.ManagedChannelProvider;
 import io.grpc.ManagedChannelProvider.NewChannelBuilderResult;
 import io.grpc.ManagedChannelRegistryAccessor;
-import io.grpc.NameResolverRegistry;
 import io.grpc.TlsChannelCredentials;
-import io.grpc.internal.testing.FakeNameResolverProvider;
 import io.grpc.stub.StreamObserver;
 import io.grpc.testing.GrpcCleanupRule;
 import io.grpc.testing.protobuf.SimpleRequest;
@@ -122,24 +120,6 @@ public void managedChannelRegistry_newChannelBuilder() {
     channel.shutdownNow();
   }
 
-  @Test
-  public void managedChannelRegistry_newChannelBuilderForNameResolverRegistry() {
-    Assume.assumeTrue(Utils.isEpollAvailable());
-    NameResolverRegistry nameResolverRegistry = new NameResolverRegistry();
-    DomainSocketAddress socketAddress = new DomainSocketAddress("test-server");
-    FakeNameResolverProvider fakeNameResolverProvider = new FakeNameResolverProvider(
-            "unix:///sock.sock", socketAddress);
-    nameResolverRegistry.register(fakeNameResolverProvider);
-    ManagedChannelBuilder<?> managedChannelBuilder
-            = Grpc.newChannelBuilder("unix:///sock.sock",
-            InsecureChannelCredentials.create(), nameResolverRegistry);
-    assertThat(managedChannelBuilder).isNotNull();
-    ManagedChannel channel = managedChannelBuilder.build();
-    assertThat(channel).isNotNull();
-    assertThat(channel.authority()).isEqualTo("/sock.sock");
-    channel.shutdownNow();
-  }
-
   @Test
   public void udsClientServerTestUsingProvider() throws IOException {
     Assume.assumeTrue(Utils.isEpollAvailable());