use constructor instead of public method

Author: AgraVator

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

@@ -191,7 +191,7 @@ public abstract static class Factory {
      */
     public NameResolver newNameResolver(Uri targetUri, final Args args) {
       // Not every io.grpc.Uri can be converted but in the ordinary ManagedChannel creation flow,
-      // any IllegalArgumentException thrown here would happened anyway, just earlier. That's
+      // any IllegalArgumentException thrown here would have happened anyway, just earlier. That's
       // because parse/toString is transparent so java.net.URI#create here sees the original target
       // string just like it did before the io.grpc.Uri migration.
       //

api/src/test/java/io/grpc/ManagedChannelRegistryTest.java

@@ -223,6 +223,53 @@ public NewChannelBuilderResult newChannelBuilder(
         mcb);
   }
 
+  @Test
+  public void newChannelBuilder_propagatesRegistry() {
+    final NameResolverRegistry nameResolverRegistry = new NameResolverRegistry();
+    class SocketAddress1 extends SocketAddress {
+    }
+
+    ManagedChannelRegistry registry = new ManagedChannelRegistry();
+    class MockChannelBuilder extends ForwardingChannelBuilder2<MockChannelBuilder> {
+      @Override
+      public ManagedChannelBuilder<?> delegate() {
+        throw new UnsupportedOperationException();
+      }
+    }
+
+    final ManagedChannelBuilder<?> mcb = new MockChannelBuilder();
+    registry.register(new BaseProvider(true, 4) {
+      @Override
+      protected Collection<Class<? extends SocketAddress>> getSupportedSocketAddressTypes() {
+        return Collections.singleton(SocketAddress1.class);
+      }
+
+      @Override
+      public NewChannelBuilderResult newChannelBuilder(
+          String passedTarget, ChannelCredentials passedCreds,
+          NameResolverRegistry passedRegistry, NameResolverProvider passedProvider) {
+        assertThat(passedRegistry).isSameInstanceAs(nameResolverRegistry);
+        return NewChannelBuilderResult.channelBuilder(mcb);
+      }
+    });
+
+    // ManagedChannelRegistry.newChannelBuilder(NameResolverRegistry, String, ChannelCredentials)
+    // gets the scheme from target. Then it gets NameResolverProvider from registry for that scheme.
+    // Then it gets producedSocketAddressTypes from that provider.
+    // Then it finds a ManagedChannelProvider that supports those types.
+    // So we need a registered NameResolverProvider for the scheme.
+    nameResolverRegistry.register(new BaseNameResolverProvider(true, 5, "sc1") {
+      @Override
+      public Collection<Class<? extends SocketAddress>> getProducedSocketAddressTypes() {
+        return Collections.singleton(SocketAddress1.class);
+      }
+    });
+
+    assertThat(
+        registry.newChannelBuilder(nameResolverRegistry, "sc1:" + target, creds)).isSameInstanceAs(
+            mcb);
+  }
+
   @Test
   public void newChannelBuilder_unsupportedSocketAddressTypes() {
     NameResolverRegistry nameResolverRegistry = new NameResolverRegistry();

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

@@ -318,6 +318,49 @@ public ManagedChannelImplBuilder(
     InternalConfiguratorRegistry.configureChannelBuilder(this);
   }
 
+  /**
+   * Creates a new managed channel builder with a target string, which can be
+   * either a valid {@link io.grpc.NameResolver}-compliant URI, or an authority
+   * string. Transport
+   * implementors must provide client transport factory builder, and may set
+   * custom channel default
+   * port provider.
+   *
+   * @param channelCreds         The ChannelCredentials provided by the user.
+   *                             These may be used when
+   *                             creating derivative channels.
+   * @param nameResolverRegistry the registry used to look up name resolvers.
+   * @param nameResolverProvider the provider used to look up name resolvers.
+   */
+  public ManagedChannelImplBuilder(
+      String target, @Nullable ChannelCredentials channelCreds, @Nullable CallCredentials callCreds,
+      ClientTransportFactoryBuilder clientTransportFactoryBuilder,
+      @Nullable ChannelBuilderDefaultPortProvider channelBuilderDefaultPortProvider,
+      @Nullable NameResolverRegistry nameResolverRegistry,
+      @Nullable NameResolverProvider nameResolverProvider) {
+    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();
+    }
+    if (nameResolverRegistry != null) {
+      this.nameResolverRegistry = nameResolverRegistry;
+    }
+    if (nameResolverProvider != null) {
+      this.nameResolverProvider = nameResolverProvider;
+    }
+
+    // TODO(dnvindhya): Move configurator to all the individual builders
+    InternalConfiguratorRegistry.configureChannelBuilder(this);
+  }
+
   /**
    * Returns a target string for the SocketAddress. It is only used as a placeholder, because
    * DirectAddressNameResolverProvider will not actually try to use it. However, it must be a valid
@@ -447,16 +490,11 @@ public ManagedChannelImplBuilder nameResolverFactory(NameResolver.Factory resolv
     return this;
   }
 
-  public ManagedChannelImplBuilder nameResolverRegistry(NameResolverRegistry resolverRegistry) {
+  ManagedChannelImplBuilder nameResolverRegistry(NameResolverRegistry resolverRegistry) {
     this.nameResolverRegistry = resolverRegistry;
     return this;
   }
 
-  public ManagedChannelImplBuilder nameResolverProvider(NameResolverProvider provider) {
-    this.nameResolverProvider = provider;
-    return this;
-  }
-
   @Override
   public ManagedChannelImplBuilder defaultLoadBalancingPolicy(String policy) {
     Preconditions.checkState(directServerAddress == null,

netty/src/main/java/io/grpc/netty/NettyChannelBuilder.java

@@ -209,10 +209,20 @@ public int getDefaultPort() {
   NettyChannelBuilder(
       String target, ChannelCredentials channelCreds, CallCredentials callCreds,
       ProtocolNegotiator.ClientFactory negotiator) {
+    this(target, channelCreds, callCreds, negotiator, null, null);
+  }
+
+  NettyChannelBuilder(
+      String target, ChannelCredentials channelCreds, CallCredentials callCreds,
+      ProtocolNegotiator.ClientFactory negotiator,
+      NameResolverRegistry nameResolverRegistry,
+      NameResolverProvider nameResolverProvider) {
     managedChannelImplBuilder = new ManagedChannelImplBuilder(
         target, channelCreds, callCreds,
         new NettyChannelTransportFactoryBuilder(),
-        new NettyChannelDefaultPortProvider());
+        new NettyChannelDefaultPortProvider(),
+        nameResolverRegistry,
+        nameResolverProvider);
     this.protocolNegotiatorFactory = checkNotNull(negotiator, "negotiator");
     this.freezeProtocolNegotiatorFactory = true;
   }
@@ -710,23 +720,7 @@ NettyChannelBuilder setTransportTracerFactory(TransportTracer.Factory transportT
     return this;
   }
 
-  /**
-   * Sets the registry used for looking up name resolvers.
-   */
-  @CanIgnoreReturnValue
-  public NettyChannelBuilder nameResolverRegistry(NameResolverRegistry registry) {
-    managedChannelImplBuilder.nameResolverRegistry(registry);
-    return this;
-  }
 
-  /**
-   * Sets the {@link io.grpc.NameResolverProvider} to use.
-   */
-  @CanIgnoreReturnValue
-  public NettyChannelBuilder nameResolverProvider(NameResolverProvider provider) {
-    managedChannelImplBuilder.nameResolverProvider(provider);
-    return this;
-  }
 
   static Collection<Class<? extends SocketAddress>> getSupportedSocketAddressTypes() {
     return Collections.singleton(InetSocketAddress.class);

netty/src/main/java/io/grpc/netty/NettyChannelProvider.java

@@ -66,13 +66,7 @@ public NewChannelBuilderResult newChannelBuilder(String target, ChannelCredentia
       return NewChannelBuilderResult.error(result.error);
     }
     NettyChannelBuilder builder = new NettyChannelBuilder(target, creds,
-        result.callCredentials, result.negotiator);
-    if (nameResolverRegistry != null) {
-      builder.nameResolverRegistry(nameResolverRegistry);
-    }
-    if (nameResolverProvider != null) {
-      builder.nameResolverProvider(nameResolverProvider);
-    }
+        result.callCredentials, result.negotiator, nameResolverRegistry, nameResolverProvider);
     return NewChannelBuilderResult.channelBuilder(builder);
   }
 

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

@@ -216,10 +216,20 @@ private OkHttpChannelBuilder(String target) {
   OkHttpChannelBuilder(
       String target, ChannelCredentials channelCreds, CallCredentials callCreds,
       SSLSocketFactory factory) {
+    this(target, channelCreds, callCreds, factory, null, null);
+  }
+
+  OkHttpChannelBuilder(
+      String target, ChannelCredentials channelCreds, CallCredentials callCreds,
+      SSLSocketFactory factory,
+      NameResolverRegistry nameResolverRegistry,
+      NameResolverProvider nameResolverProvider) {
     managedChannelImplBuilder = new ManagedChannelImplBuilder(
         target, channelCreds, callCreds,
         new OkHttpChannelTransportFactoryBuilder(),
-        new OkHttpChannelDefaultPortProvider());
+        new OkHttpChannelDefaultPortProvider(),
+        nameResolverRegistry,
+        nameResolverProvider);
     this.sslSocketFactory = factory;
     this.negotiationType = factory == null ? NegotiationType.PLAINTEXT : NegotiationType.TLS;
     this.freezeSecurityConfiguration = true;
@@ -590,21 +600,7 @@ SSLSocketFactory createSslSocketFactory() {
     }
   }
 
-  /**
-   * Sets the registry used for looking up name resolvers.
-   */
-  public OkHttpChannelBuilder nameResolverRegistry(NameResolverRegistry registry) {
-    managedChannelImplBuilder.nameResolverRegistry(registry);
-    return this;
-  }
 
-  /**
-   * Sets the {@link NameResolverProvider} to use.
-   */
-  public OkHttpChannelBuilder nameResolverProvider(NameResolverProvider provider) {
-    managedChannelImplBuilder.nameResolverProvider(provider);
-    return this;
-  }
 
   private static final EnumSet<TlsChannelCredentials.Feature> understoodTlsFeatures =
       EnumSet.of(

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

@@ -72,13 +72,8 @@ public NewChannelBuilderResult newChannelBuilder(String target, ChannelCredentia
       return NewChannelBuilderResult.error(result.error);
     }
     OkHttpChannelBuilder builder = new OkHttpChannelBuilder(
-        target, creds, result.callCredentials, result.factory);
-    if (nameResolverRegistry != null) {
-      builder.nameResolverRegistry(nameResolverRegistry);
-    }
-    if (nameResolverProvider != null) {
-      builder.nameResolverProvider(nameResolverProvider);
-    }
+        target, creds, result.callCredentials, result.factory,
+        nameResolverRegistry, nameResolverProvider);
     return NewChannelBuilderResult.channelBuilder(builder);
   }