fix: refactor from ChildChannelConfigurer to ChannelConfigurer

Author: AgraVator

…java/io/grpc/ChildChannelConfigurer.java …main/java/io/grpc/ChannelConfigurer.javaapi/src/main/java/io/grpc/ChildChannelConfigurer.java renamed to api/src/main/java/io/grpc/ChannelConfigurer.java api/src/main/java/io/grpc/ChildChannelConfigurer.java renamed to api/src/main/java/io/grpc/ChannelConfigurer.java

@@ -32,8 +32,7 @@
  * <p><strong>Usage Example:</strong>
  * <pre>{@code
  * // 1. Define the configurer
- * ChildChannelConfigurer configurer = builder -> {
- *   builder.intercept(new MyAuthInterceptor());
+ * ChannelConfigurer configurer = builder -> {
  *   builder.maxInboundMessageSize(4 * 1024 * 1024);
  * };
  *
@@ -47,10 +46,10 @@
  * <p>Implementations must be thread-safe as the configure methods may be invoked concurrently
  * by multiple internal components.
  *
- * @since 1.79.0
+ * @since 1.81.0
  */
 @ExperimentalApi("https://github.com/grpc/grpc-java/issues/12574")
-public interface ChildChannelConfigurer {
+public interface ChannelConfigurer {
 
   /**
    * Configures a builder for a new child channel.

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

@@ -244,8 +244,8 @@ public T disableServiceConfigLookUp() {
 
 
   @Override
-  public T childChannelConfigurer(ChildChannelConfigurer childChannelConfigurer) {
-    delegate().childChannelConfigurer(childChannelConfigurer);
+  public T childChannelConfigurer(ChannelConfigurer channelConfigurer) {
+    delegate().childChannelConfigurer(channelConfigurer);
     return thisT();
   }
 

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

@@ -95,7 +95,7 @@ public T intercept(ClientInterceptor... interceptors) {
   }
 
   @Override
-  public T interceptWithTarget(InterceptorFactory factory) {
+  protected T interceptWithTarget(InterceptorFactory factory) {
     delegate().interceptWithTarget(factory);
     return thisT();
   }
@@ -271,8 +271,8 @@ public <X> T setNameResolverArg(NameResolver.Args.Key<X> key, X value) {
 
 
   @Override
-  public T childChannelConfigurer(ChildChannelConfigurer childChannelConfigurer) {
-    delegate().childChannelConfigurer(childChannelConfigurer);
+  public T childChannelConfigurer(ChannelConfigurer channelConfigurer) {
+    delegate().childChannelConfigurer(channelConfigurer);
     return thisT();
   }
 

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

@@ -193,8 +193,8 @@ public T setBinaryLog(BinaryLog binaryLog) {
   }
 
   @Override
-  public T childChannelConfigurer(ChildChannelConfigurer childChannelConfigurer) {
-    delegate().childChannelConfigurer(childChannelConfigurer);
+  public T childChannelConfigurer(ChannelConfigurer channelConfigurer) {
+    delegate().childChannelConfigurer(channelConfigurer);
     return thisT();
   }
 

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

@@ -160,10 +160,11 @@ public T offloadExecutor(Executor executor) {
   public abstract T intercept(ClientInterceptor... interceptors);
 
   /**
-   * Adds a factory that will construct an interceptor based on the channel's target.
+   * Internal-only: Adds a factory that will construct an interceptor based on the channel's target.
    * This can be used to work around nameResolverFactory() changing the target string.
    */
-  public T interceptWithTarget(InterceptorFactory factory) {
+  @Internal
+  protected T interceptWithTarget(InterceptorFactory factory) {
     throw new UnsupportedOperationException();
   }
 
@@ -664,12 +665,12 @@ public <X> T setNameResolverArg(NameResolver.Args.Key<X> key, X value) {
    * <p>This allows injecting configuration (like credentials, interceptors, or flow control)
    * into auxiliary channels created by gRPC infrastructure, such as xDS control plane connections.
    *
-   * @param childChannelConfigurer the configurer to apply.
+   * @param channelConfigurer the configurer to apply.
    * @return this
-   * @since 1.79.0
+   * @since 1.81.0
    */
   @ExperimentalApi("https://github.com/grpc/grpc-java/issues/12574")
-  public T childChannelConfigurer(ChildChannelConfigurer childChannelConfigurer) {
+  public T childChannelConfigurer(ChannelConfigurer channelConfigurer) {
     throw new UnsupportedOperationException("Not implemented");
   }
 

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

@@ -358,7 +358,7 @@ public static final class Args {
     @Nullable private final MetricRecorder metricRecorder;
     @Nullable private final NameResolverRegistry nameResolverRegistry;
     @Nullable private final IdentityHashMap<Key<?>, Object> customArgs;
-    @Nullable private final ChildChannelConfigurer childChannelConfigurer;
+    @Nullable private final ChannelConfigurer channelConfigurer;
 
     private Args(Builder builder) {
       this.defaultPort = checkNotNull(builder.defaultPort, "defaultPort not set");
@@ -373,7 +373,7 @@ private Args(Builder builder) {
       this.metricRecorder = builder.metricRecorder;
       this.nameResolverRegistry = builder.nameResolverRegistry;
       this.customArgs = cloneCustomArgs(builder.customArgs);
-      this.childChannelConfigurer = builder.childChannelConfigurer;
+      this.channelConfigurer = builder.channelConfigurer;
     }
 
     /**
@@ -479,8 +479,8 @@ public ChannelLogger getChannelLogger() {
      */
     @Nullable
     @Internal
-    public ChildChannelConfigurer getChildChannelConfigurer() {
-      return childChannelConfigurer;
+    public ChannelConfigurer getChildChannelConfigurer() {
+      return channelConfigurer;
     }
 
     /**
@@ -592,7 +592,7 @@ public static final class Builder {
       private MetricRecorder metricRecorder;
       private NameResolverRegistry nameResolverRegistry;
       private IdentityHashMap<Key<?>, Object> customArgs;
-      private ChildChannelConfigurer childChannelConfigurer;
+      private ChannelConfigurer channelConfigurer = new ChannelConfigurer() {};
 
       Builder() {
       }
@@ -713,8 +713,8 @@ public Builder setNameResolverRegistry(NameResolverRegistry registry) {
        *
        * @since 1.81.0
        */
-      public Builder setChildChannelConfigurer(ChildChannelConfigurer childChannelConfigurer) {
-        this.childChannelConfigurer = childChannelConfigurer;
+      public Builder setChildChannelConfigurer(ChannelConfigurer channelConfigurer) {
+        this.channelConfigurer = channelConfigurer;
         return this;
       }
 

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

@@ -432,12 +432,12 @@ public T setBinaryLog(BinaryLog binaryLog) {
    * into auxiliary channels created by gRPC infrastructure, such as xDS control plane connections
    * or OOB load balancing channels.
    *
-   * @param childChannelConfigurer the configurer to apply.
+   * @param channelConfigurer the configurer to apply.
    * @return this
-   * @since 1.79.0
+   * @since 1.81.0
    */
   @ExperimentalApi("https://github.com/grpc/grpc-java/issues/12574")
-  public T childChannelConfigurer(ChildChannelConfigurer childChannelConfigurer) {
+  public T childChannelConfigurer(ChannelConfigurer channelConfigurer) {
     throw new UnsupportedOperationException("Not implemented");
   }
 

…/io/grpc/ChildChannelConfigurerTest.java …/java/io/grpc/ChannelConfigurerTest.javaapi/src/test/java/io/grpc/ChildChannelConfigurerTest.java renamed to api/src/test/java/io/grpc/ChannelConfigurerTest.java api/src/test/java/io/grpc/ChildChannelConfigurerTest.java renamed to api/src/test/java/io/grpc/ChannelConfigurerTest.java

@@ -24,11 +24,11 @@
 import org.junit.runners.JUnit4;
 
 @RunWith(JUnit4.class)
-public class ChildChannelConfigurerTest {
+public class ChannelConfigurerTest {
 
   @Test
   public void defaultMethods_doNothing() {
-    ChildChannelConfigurer configurer = new ChildChannelConfigurer() {};
+    ChannelConfigurer configurer = new ChannelConfigurer() {};
 
     ManagedChannelBuilder<?> mockChannelBuilder = mock(ManagedChannelBuilder.class);
     configurer.configureChannelBuilder(mockChannelBuilder);

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

@@ -105,7 +105,7 @@ public void args() {
   }
 
   private NameResolver.Args createArgs() {
-    ChildChannelConfigurer childChannelConfigurer = mock(ChildChannelConfigurer.class);
+    ChannelConfigurer channelConfigurer = mock(ChannelConfigurer.class);
     return NameResolver.Args.newBuilder()
         .setDefaultPort(defaultPort)
         .setProxyDetector(proxyDetector)
@@ -117,15 +117,14 @@ private NameResolver.Args createArgs() {
         .setOverrideAuthority(overrideAuthority)
         .setMetricRecorder(metricRecorder)
         .setArg(FOO_ARG_KEY, customArgValue)
-        .setChildChannelConfigurer(childChannelConfigurer)
+        .setChildChannelConfigurer(channelConfigurer)
         .build();
   }
 
   @Test
   public void args_childChannelConfigurer() {
-    ChildChannelConfigurer childChannelConfigurer = mock(ChildChannelConfigurer.class);
+    ChannelConfigurer channelConfigurer = mock(ChannelConfigurer.class);
 
-    // Create a real SynchronizationContext instead of mocking it
     SynchronizationContext realSyncContext = new SynchronizationContext(
         new Thread.UncaughtExceptionHandler() {
           @Override
@@ -140,15 +139,15 @@ public void uncaughtException(Thread t, Throwable e) {
         .setSynchronizationContext(realSyncContext)
         .setServiceConfigParser(mock(NameResolver.ServiceConfigParser.class))
         .setChannelLogger(mock(ChannelLogger.class))
-        .setChildChannelConfigurer(childChannelConfigurer)
+        .setChildChannelConfigurer(channelConfigurer)
         .build();
 
-    assertThat(args.getChildChannelConfigurer()).isSameInstanceAs(childChannelConfigurer);
+    assertThat(args.getChildChannelConfigurer()).isSameInstanceAs(channelConfigurer);
 
     // Validate configurer accepts builders
     ManagedChannelBuilder<?> mockBuilder = mock(ManagedChannelBuilder.class);
     args.getChildChannelConfigurer().configureChannelBuilder(mockBuilder);
-    verify(childChannelConfigurer).configureChannelBuilder(mockBuilder);
+    verify(channelConfigurer).configureChannelBuilder(mockBuilder);
   }
 
   @Test

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

@@ -37,10 +37,10 @@
 import io.grpc.CallCredentials;
 import io.grpc.CallOptions;
 import io.grpc.Channel;
+import io.grpc.ChannelConfigurer;
 import io.grpc.ChannelCredentials;
 import io.grpc.ChannelLogger;
 import io.grpc.ChannelLogger.ChannelLogLevel;
-import io.grpc.ChildChannelConfigurer;
 import io.grpc.ClientCall;
 import io.grpc.ClientInterceptor;
 import io.grpc.ClientInterceptors;
@@ -156,7 +156,13 @@ public Result selectConfig(PickSubchannelArgs args) {
   private static final LoadBalancer.PickDetailsConsumer NOOP_PICK_DETAILS_CONSUMER =
       new LoadBalancer.PickDetailsConsumer() {};
 
-  private ChildChannelConfigurer childChannelConfigurer = new ChildChannelConfigurer() {};
+  /**
+   * Retrieves the user-provided configuration function for internal child channels.
+   *
+   * <p>This is intended for use by gRPC internal components
+   * that are responsible for creating auxiliary {@code ManagedChannel} instances.
+   */
+  private ChannelConfigurer channelConfigurer = new ChannelConfigurer() {};
 
   private final InternalLogId logId;
   private final String target;
@@ -548,8 +554,8 @@ ClientStream newSubstream(
       Supplier<Stopwatch> stopwatchSupplier,
       List<ClientInterceptor> interceptors,
       final TimeProvider timeProvider) {
-    if (builder.childChannelConfigurer != null) {
-      this.childChannelConfigurer = builder.childChannelConfigurer;
+    if (builder.channelConfigurer != null) {
+      this.channelConfigurer = builder.channelConfigurer;
     }
     this.target = checkNotNull(builder.target, "target");
     this.logId = InternalLogId.allocate("Channel", target);
@@ -596,7 +602,7 @@ ClientStream newSubstream(
             .setOverrideAuthority(this.authorityOverride)
             .setMetricRecorder(this.metricRecorder)
             .setNameResolverRegistry(builder.nameResolverRegistry)
-            .setChildChannelConfigurer(this.childChannelConfigurer);
+            .setChildChannelConfigurer(this.channelConfigurer);
     builder.copyAllNameResolverCustomArgsTo(nameResolverArgsBuilder);
     this.nameResolverArgs = nameResolverArgsBuilder.build();
     this.nameResolver = getNameResolver(
@@ -672,15 +678,6 @@ public CallTracer create() {
     }
   }
 
-  /**
-   * Retrieves the user-provided configuration function for internal child channels.
-   *
-   * <p>This method is intended for use by gRPC internal components
-   * that are responsible for creating auxiliary {@code ManagedChannel} instances.
-   *
-   * @return the ChildChannelConfigurer, guaranteed to be not null (defaults to no-op).
-   */
-
   @VisibleForTesting
   static NameResolver getNameResolver(
       UriWrapper targetUri, @Nullable final String overrideAuthority,
@@ -1504,8 +1501,8 @@ protected ManagedChannelBuilder<?> delegate() {
 
       // Note that we follow the global configurator pattern and try to fuse the configurations as
       // soon as the builder gets created
-      if (childChannelConfigurer != null) {
-        childChannelConfigurer.configureChannelBuilder(builder);
+      if (channelConfigurer != null) {
+        channelConfigurer.configureChannelBuilder(builder);
       }
 
       return builder