1. refactors method name to make it overloaded

2. removes visibleForTesting 3. improves the test case
grpc · Feb 19, 2025 · 67548a9 · 67548a9
1 parent 1b5ab2c
commit 67548a9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/api/src/main/java/io/grpc/Grpc.java b/api/src/main/java/io/grpc/Grpc.java
@@ -104,7 +104,7 @@ public static ManagedChannelBuilder<?> newChannelBuilder(
   /**
    * Creates a channel builder with a target string, credentials and nameResolverRegistry.
    */
-  public static ManagedChannelBuilder<?> newChannelBuilderForNameResolverRegistry(String target,
+  public static ManagedChannelBuilder<?> newChannelBuilder(String target,
       ChannelCredentials creds, NameResolverRegistry nameResolverRegistry) {
     return ManagedChannelRegistry.getDefaultRegistry().newChannelBuilder(nameResolverRegistry,
       target, creds);

diff --git a/api/src/main/java/io/grpc/ManagedChannelRegistry.java b/api/src/main/java/io/grpc/ManagedChannelRegistry.java
@@ -155,7 +155,6 @@ ManagedChannelBuilder<?> newChannelBuilder(String target, ChannelCredentials cre
     return newChannelBuilder(NameResolverRegistry.getDefaultRegistry(), target, creds);
   }
 
-  @VisibleForTesting
   ManagedChannelBuilder<?> newChannelBuilder(NameResolverRegistry nameResolverRegistry,
       String target, ChannelCredentials creds) {
     NameResolverProvider nameResolverProvider = null;

diff --git a/netty/src/test/java/io/grpc/netty/UdsNettyChannelProviderTest.java b/netty/src/test/java/io/grpc/netty/UdsNettyChannelProviderTest.java
@@ -30,6 +30,7 @@
 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;
@@ -124,9 +125,14 @@ public void managedChannelRegistry_newChannelBuilder() {
   @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.newChannelBuilderForNameResolverRegistry("unix:///sock.sock",
-             InsecureChannelCredentials.create(), NameResolverRegistry.getDefaultRegistry());
+            = Grpc.newChannelBuilder("unix:///sock.sock",
+            InsecureChannelCredentials.create(), nameResolverRegistry);
     assertThat(managedChannelBuilder).isNotNull();
     ManagedChannel channel = managedChannelBuilder.build();
     assertThat(channel).isNotNull();