Fix: left over name changes

Author: AgraVator

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

@@ -244,8 +244,8 @@ public T disableServiceConfigLookUp() {
 
 
   @Override
-  public T childChannelConfigurator(ChannelConfigurator channelConfigurer) {
-    delegate().childChannelConfigurator(channelConfigurer);
+  public T childChannelConfigurator(ChannelConfigurator channelConfigurator) {
+    delegate().childChannelConfigurator(channelConfigurator);
     return thisT();
   }
 

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

@@ -271,8 +271,8 @@ public <X> T setNameResolverArg(NameResolver.Args.Key<X> key, X value) {
 
 
   @Override
-  public T childChannelConfigurator(ChannelConfigurator channelConfigurer) {
-    delegate().childChannelConfigurator(channelConfigurer);
+  public T childChannelConfigurator(ChannelConfigurator channelConfigurator) {
+    delegate().childChannelConfigurator(channelConfigurator);
     return thisT();
   }
 

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

@@ -193,8 +193,8 @@ public T setBinaryLog(BinaryLog binaryLog) {
   }
 
   @Override
-  public T childChannelConfigurator(ChannelConfigurator channelConfigurer) {
-    delegate().childChannelConfigurator(channelConfigurer);
+  public T childChannelConfigurator(ChannelConfigurator channelConfigurator) {
+    delegate().childChannelConfigurator(channelConfigurator);
     return thisT();
   }
 

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

@@ -168,7 +168,7 @@ protected T interceptWithTarget(InterceptorFactory factory) {
     throw new UnsupportedOperationException();
   }
 
-  public interface InterceptorFactory {
+  protected interface InterceptorFactory {
     ClientInterceptor newInterceptor(String target);
   }
 
@@ -660,17 +660,18 @@ public <X> T setNameResolverArg(NameResolver.Args.Key<X> key, X value) {
 
 
   /**
-   * Sets a configurer that will be applied to all internal child channels created by this channel.
+   * Sets a configurator that will be applied to all internal child channels created by this
+   * channel.
    *
    * <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 channelConfigurer the configurer to apply.
+   * @param channelConfigurator the configurator to apply.
    * @return this
    * @since 1.81.0
    */
   @ExperimentalApi("https://github.com/grpc/grpc-java/issues/12574")
-  public T childChannelConfigurator(ChannelConfigurator channelConfigurer) {
+  public T childChannelConfigurator(ChannelConfigurator channelConfigurator) {
     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 ChannelConfigurator channelConfigurer;
+    @Nullable private final ChannelConfigurator channelConfigurator;
 
     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.channelConfigurer = builder.channelConfigurer;
+      this.channelConfigurator = builder.channelConfigurator;
     }
 
     /**
@@ -473,14 +473,14 @@ public ChannelLogger getChannelLogger() {
     }
 
     /**
-     * Returns the configurer for child channels.
+     * Returns the configurator for child channels.
      *
      * @since 1.81.0
      */
     @Nullable
     @Internal
     public ChannelConfigurator getChildChannelConfigurator() {
-      return channelConfigurer;
+      return channelConfigurator;
     }
 
     /**
@@ -592,7 +592,7 @@ public static final class Builder {
       private MetricRecorder metricRecorder;
       private NameResolverRegistry nameResolverRegistry;
       private IdentityHashMap<Key<?>, Object> customArgs;
-      private ChannelConfigurator channelConfigurer = new ChannelConfigurator() {};
+      private ChannelConfigurator channelConfigurator = new ChannelConfigurator() {};
 
       Builder() {
       }
@@ -713,8 +713,8 @@ public Builder setNameResolverRegistry(NameResolverRegistry registry) {
        *
        * @since 1.81.0
        */
-      public Builder setChildChannelConfigurator(ChannelConfigurator channelConfigurer) {
-        this.channelConfigurer = channelConfigurer;
+      public Builder setChildChannelConfigurator(ChannelConfigurator channelConfigurator) {
+        this.channelConfigurator = channelConfigurator;
         return this;
       }
 

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

@@ -426,18 +426,18 @@ public T setBinaryLog(BinaryLog binaryLog) {
 
 
   /**
-   * Sets a configurer that will be applied to all internal child channels created by this server.
+   * Sets a configurator that will be applied to all internal child channels created by this server.
    *
    * <p>This allows injecting configuration (like credentials, interceptors, or flow control)
    * into auxiliary channels created by gRPC infrastructure, such as xDS control plane connections
    * or OOB load balancing channels.
    *
-   * @param channelConfigurer the configurer to apply.
+   * @param channelConfigurator the configurator to apply.
    * @return this
    * @since 1.81.0
    */
   @ExperimentalApi("https://github.com/grpc/grpc-java/issues/12574")
-  public T childChannelConfigurator(ChannelConfigurator channelConfigurer) {
+  public T childChannelConfigurator(ChannelConfigurator channelConfigurator) {
     throw new UnsupportedOperationException("Not implemented");
   }
 

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

@@ -105,7 +105,7 @@ public void args() {
   }
 
   private NameResolver.Args createArgs() {
-    ChannelConfigurator channelConfigurer = mock(ChannelConfigurator.class);
+    ChannelConfigurator channelConfigurator = mock(ChannelConfigurator.class);
     return NameResolver.Args.newBuilder()
         .setDefaultPort(defaultPort)
         .setProxyDetector(proxyDetector)
@@ -117,13 +117,13 @@ private NameResolver.Args createArgs() {
         .setOverrideAuthority(overrideAuthority)
         .setMetricRecorder(metricRecorder)
         .setArg(FOO_ARG_KEY, customArgValue)
-        .setChildChannelConfigurator(channelConfigurer)
+        .setChildChannelConfigurator(channelConfigurator)
         .build();
   }
 
   @Test
   public void args_childChannelConfigurator() {
-    ChannelConfigurator channelConfigurer = mock(ChannelConfigurator.class);
+    ChannelConfigurator channelConfigurator = mock(ChannelConfigurator.class);
 
     SynchronizationContext realSyncContext = new SynchronizationContext(
         new Thread.UncaughtExceptionHandler() {
@@ -139,15 +139,16 @@ public void uncaughtException(Thread t, Throwable e) {
         .setSynchronizationContext(realSyncContext)
         .setServiceConfigParser(mock(NameResolver.ServiceConfigParser.class))
         .setChannelLogger(mock(ChannelLogger.class))
-        .setChildChannelConfigurator(channelConfigurer)
+        .setChildChannelConfigurator(channelConfigurator)
         .build();
 
-    assertThat(args.getChildChannelConfigurator()).isSameInstanceAs(channelConfigurer);
+    ChannelConfigurator configurator = args.getChildChannelConfigurator();
+    assertThat(configurator).isSameInstanceAs(channelConfigurator);
 
-    // Validate configurer accepts builders
+    // Validate configurator accepts builders
     ManagedChannelBuilder<?> mockBuilder = mock(ManagedChannelBuilder.class);
-    args.getChildChannelConfigurator().configureChannelBuilder(mockBuilder);
-    verify(channelConfigurer).configureChannelBuilder(mockBuilder);
+    configurator.configureChannelBuilder(mockBuilder);
+    verify(channelConfigurator).configureChannelBuilder(mockBuilder);
   }
 
   @Test

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

@@ -162,7 +162,7 @@ public Result selectConfig(PickSubchannelArgs args) {
    * <p>This is intended for use by gRPC internal components
    * that are responsible for creating auxiliary {@code ManagedChannel} instances.
    */
-  private ChannelConfigurator channelConfigurer = new ChannelConfigurator() {};
+  private ChannelConfigurator channelConfigurator = new ChannelConfigurator() {};
 
   private final InternalLogId logId;
   private final String target;
@@ -554,8 +554,8 @@ ClientStream newSubstream(
       Supplier<Stopwatch> stopwatchSupplier,
       List<ClientInterceptor> interceptors,
       final TimeProvider timeProvider) {
-    if (builder.channelConfigurer != null) {
-      this.channelConfigurer = builder.channelConfigurer;
+    if (builder.channelConfigurator != null) {
+      this.channelConfigurator = builder.channelConfigurator;
     }
     this.target = checkNotNull(builder.target, "target");
     this.logId = InternalLogId.allocate("Channel", target);
@@ -602,7 +602,7 @@ ClientStream newSubstream(
             .setOverrideAuthority(this.authorityOverride)
             .setMetricRecorder(this.metricRecorder)
             .setNameResolverRegistry(builder.nameResolverRegistry)
-            .setChildChannelConfigurator(this.channelConfigurer);
+            .setChildChannelConfigurator(this.channelConfigurator);
     builder.copyAllNameResolverCustomArgsTo(nameResolverArgsBuilder);
     this.nameResolverArgs = nameResolverArgsBuilder.build();
     this.nameResolver = getNameResolver(
@@ -1501,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 (channelConfigurer != null) {
-        channelConfigurer.configureChannelBuilder(builder);
+      if (channelConfigurator != null) {
+        channelConfigurator.configureChannelBuilder(builder);
       }
 
       return builder

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

@@ -128,12 +128,12 @@ public static ManagedChannelBuilder<?> forTarget(String target) {
 
   private static final Method GET_CLIENT_INTERCEPTOR_METHOD;
 
-  ChannelConfigurator channelConfigurer = new ChannelConfigurator() {};
+  ChannelConfigurator channelConfigurator = new ChannelConfigurator() {};
 
   @Override
   public ManagedChannelImplBuilder childChannelConfigurator(
-      ChannelConfigurator channelConfigurer) {
-    this.channelConfigurer = checkNotNull(channelConfigurer,
+      ChannelConfigurator channelConfigurator) {
+    this.channelConfigurator = checkNotNull(channelConfigurator,
         "childChannelConfigurator");
     return this;
   }
@@ -414,7 +414,7 @@ public ManagedChannelImplBuilder intercept(ClientInterceptor... interceptors) {
   }
 
   @Override
-  public ManagedChannelImplBuilder interceptWithTarget(InterceptorFactory factory) {
+  protected ManagedChannelImplBuilder interceptWithTarget(InterceptorFactory factory) {
     // Add a placeholder instance to the interceptor list, and replace it with a real instance
     // during build().
     this.interceptors.add(new InterceptorFactoryWrapper(factory));

core/src/test/java/io/grpc/internal/ManagedChannelImplBuilderTest.java

@@ -786,9 +786,9 @@ public void setNameResolverExtArgs() {
 
   @Test
   public void childChannelConfigurator_setsField() {
-    ChannelConfigurator configurer = mock(ChannelConfigurator.class);
-    assertSame(builder, builder.childChannelConfigurator(configurer));
-    assertSame(configurer, builder.channelConfigurer);
+    ChannelConfigurator configurator = mock(ChannelConfigurator.class);
+    assertSame(builder, builder.childChannelConfigurator(configurator));
+    assertSame(configurator, builder.channelConfigurator);
   }
 
   @Test
@@ -804,8 +804,8 @@ public void childChannelConfigurator_propagatesMetricsAndInterceptors_xdsTarget(
     MetricSink mockMetricSink = mock(MetricSink.class);
     ClientInterceptor mockInterceptor = mock(ClientInterceptor.class);
 
-    // Define the Configurer
-    ChannelConfigurator configurer = new ChannelConfigurator() {
+    // Define the Configurator
+    ChannelConfigurator configurator = new ChannelConfigurator() {
       @Override
       public void configureChannelBuilder(ManagedChannelBuilder<?> builder) {
         builder.addMetricSink(mockMetricSink);
@@ -823,15 +823,15 @@ public void configureChannelBuilder(ManagedChannelBuilder<?> builder) {
     when(mockNameResolverFactory.newNameResolver((URI) any(),
         argsCaptor.capture())).thenReturn(mockNameResolver);
 
-    // Use the configurer and the mock factory
+    // Use the configurator and the mock factory
     NameResolverRegistry registry = new NameResolverRegistry();
     registry.register(new NameResolverFactoryToProviderFacade(mockNameResolverFactory));
 
     ManagedChannelBuilder<?> parentBuilder = new ManagedChannelImplBuilder(
         "xds:///my-service-target",
         mockClientTransportFactoryBuilder,
         new FixedPortProvider(DUMMY_PORT))
-        .childChannelConfigurator(configurer)
+        .childChannelConfigurator(configurator)
         .nameResolverRegistry(registry);
 
     ManagedChannel channel = parentBuilder.build();
@@ -842,19 +842,19 @@ public void configureChannelBuilder(ManagedChannelBuilder<?> builder) {
 
     // Extract the childChannelConfigurator from Args
     NameResolver.Args args = argsCaptor.getValue();
-    ChannelConfigurator channelConfigurerInArgs = args.getChildChannelConfigurator();
-    assertNotNull("Child channel configurer should be present in NameResolver.Args",
-        channelConfigurerInArgs);
+    ChannelConfigurator channelConfiguratorInArgs = args.getChildChannelConfigurator();
+    assertNotNull("Child channel configurator should be present in NameResolver.Args",
+        channelConfiguratorInArgs);
 
-    // Verify the configurer is the one we passed
-    assertThat(channelConfigurerInArgs).isSameInstanceAs(configurer);
+    // Verify the configurator is the one we passed
+    assertThat(channelConfiguratorInArgs).isSameInstanceAs(configurator);
 
-    // Verify the configurer logically applies (by running it on a mock)
+    // Verify the configurator logically applies (by running it on a mock)
     ManagedChannelBuilder<?> mockChildBuilder = mock(ManagedChannelBuilder.class);
     // Stub addMetricSink to return the builder to avoid generic return type issues
     doReturn(mockChildBuilder).when(mockChildBuilder).addMetricSink(any());
 
-    configurer.configureChannelBuilder(mockChildBuilder);
+    configurator.configureChannelBuilder(mockChildBuilder);
     verify(mockChildBuilder).addMetricSink(mockMetricSink);
   }