fix: suggested changes

Author: AgraVator

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

@@ -105,9 +105,7 @@ public static ManagedChannelBuilder<?> newChannelBuilder(
    * 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
+   * <p>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"}
@@ -118,8 +116,9 @@ public static ManagedChannelBuilder<?> newChannelBuilder(
    * @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
+   * @since 1.81.0
    */
+  @ExperimentalApi("https://github.com/grpc/grpc-java/issues/12694")
   public static ManagedChannelBuilder<?> newChannelBuilder(
       String target,
       ChannelCredentials creds,

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

@@ -87,7 +87,7 @@ protected NewChannelBuilderResult newChannelBuilder(String target, ChannelCreden
    *
    * <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},
+   * This returns a {@link NewChannelBuilderResult},
    * which may contain an error string if the provided credentials or target are
    * not supported by this provider.
    *

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

@@ -294,20 +294,14 @@ public ManagedChannelImplBuilder(
       String target, @Nullable ChannelCredentials channelCreds, @Nullable CallCredentials callCreds,
       ClientTransportFactoryBuilder clientTransportFactoryBuilder,
       @Nullable ChannelBuilderDefaultPortProvider channelBuilderDefaultPortProvider) {
-    this.target = checkNotNull(target, "target");
-    this.channelCredentials = channelCreds;
-    this.callCredentials = callCreds;
-    this.clientTransportFactoryBuilder = checkNotNull(clientTransportFactoryBuilder,
-        "clientTransportFactoryBuilder");
-    this.directServerAddress = null;
-
-    if (channelBuilderDefaultPortProvider != null) {
-      this.channelBuilderDefaultPortProvider = channelBuilderDefaultPortProvider;
-    } else {
-      this.channelBuilderDefaultPortProvider = new ManagedChannelDefaultPortProvider();
-    }
-    // TODO(dnvindhya): Move configurator to all the individual builders
-    InternalConfiguratorRegistry.configureChannelBuilder(this);
+    this(
+        target,
+        channelCreds,
+        callCreds,
+        clientTransportFactoryBuilder,
+        channelBuilderDefaultPortProvider,
+        null,
+        null);
   }
 
   /**
@@ -337,17 +331,15 @@ public ManagedChannelImplBuilder(
         "clientTransportFactoryBuilder");
     this.directServerAddress = null;
 
-    if (channelBuilderDefaultPortProvider != null) {
-      this.channelBuilderDefaultPortProvider = channelBuilderDefaultPortProvider;
-    } else {
-      this.channelBuilderDefaultPortProvider = new ManagedChannelDefaultPortProvider();
-    }
-    if (nameResolverRegistry != null) {
-      this.nameResolverRegistry = nameResolverRegistry;
-    }
-    if (nameResolverProvider != null) {
-      this.nameResolverProvider = nameResolverProvider;
-    }
+    this.channelBuilderDefaultPortProvider =
+        channelBuilderDefaultPortProvider != null
+            ? channelBuilderDefaultPortProvider
+            : new ManagedChannelDefaultPortProvider();
+    this.nameResolverRegistry =
+        nameResolverRegistry != null
+            ? nameResolverRegistry
+            : NameResolverRegistry.getDefaultRegistry();
+    this.nameResolverProvider = nameResolverProvider;
 
     // TODO(dnvindhya): Move configurator to all the individual builders
     InternalConfiguratorRegistry.configureChannelBuilder(this);
@@ -908,33 +900,32 @@ static ResolvedNameResolver getNameResolverProvider(
     if (targetUri != null) {
       // For "localhost:8080" this would likely cause provider to be null, because "localhost" is
       // parsed as the scheme. Will hit the next case and try "dns:///localhost:8080".
-      provider = nameResolverProvider;
-      if (provider == null) {
+      // Use the explicit provider if its scheme matches the target URI.
+      if (nameResolverProvider != null
+          && targetUri.getScheme().equals(nameResolverProvider.getDefaultScheme())) {
+        provider = nameResolverProvider;
+      } else {
         provider = nameResolverRegistry.getProviderForScheme(targetUri.getScheme());
       }
     }
 
-    if (!URI_PATTERN.matcher(target).matches()) {
+    if (provider == null && !URI_PATTERN.matcher(target).matches()) {
       // It doesn't look like a URI target. Maybe it's an authority string. Try with
       // the default scheme from the registry (if provider is not specified) or
       // the provider's default scheme (if provider is specified).
-      String scheme = (provider != null)
-          ? provider.getDefaultScheme()
-          : (nameResolverProvider != null
-              ? nameResolverProvider.getDefaultScheme()
-              : nameResolverRegistry.getDefaultScheme());
+      String scheme = nameResolverProvider != null
+          ? nameResolverProvider.getDefaultScheme()
+          : nameResolverRegistry.getDefaultScheme();
       try {
         targetUri = new URI(scheme, "", "/" + target, null);
       } catch (URISyntaxException e) {
-        // Should not happen because we just validated the URI.
+        // Should not be possible
         throw new IllegalArgumentException(e);
       }
-      if (provider == null) {
-        if (nameResolverProvider != null) {
-          provider = nameResolverProvider;
-        } else {
-          provider = nameResolverRegistry.getProviderForScheme(targetUri.getScheme());
-        }
+      if (nameResolverProvider != null) {
+        provider = nameResolverProvider;
+      } else {
+        provider = nameResolverRegistry.getProviderForScheme(targetUri.getScheme());
       }
     }