Fix: rename ChannelConfigurer to ChannelConfigurator and removes the ServerConfigurer

Author: AgraVator

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

@@ -19,7 +19,7 @@
 
 
 /**
- * A configurer for child channels created by gRPC's internal infrastructure.
+ * A configurator for child channels created by gRPC's internal infrastructure.
  *
  * <p>This interface allows users to inject configuration (such as credentials, interceptors,
  * or flow control settings) into channels created automatically by gRPC for control plane
@@ -31,15 +31,15 @@
  *
  * <p><strong>Usage Example:</strong>
  * <pre>{@code
- * // 1. Define the configurer
- * ChannelConfigurer configurer = builder -> {
+ * // 1. Define the configurator
+ * ChannelConfigurator configurator = builder -> {
  *   builder.maxInboundMessageSize(4 * 1024 * 1024);
  * };
  *
  * // 2. Apply to parent channel - automatically used for ALL child channels
  * ManagedChannel channel = ManagedChannelBuilder
  *     .forTarget("xds:///my-service")
- *     .childChannelConfigurer(configurer)
+ *     .childChannelConfigurator(configurator)
  *     .build();
  * }</pre>
  *
@@ -49,7 +49,7 @@
  * @since 1.81.0
  */
 @ExperimentalApi("https://github.com/grpc/grpc-java/issues/12574")
-public interface ChannelConfigurer {
+public interface ChannelConfigurator {
 
   /**
    * Configures a builder for a new child channel.
@@ -60,14 +60,4 @@ public interface ChannelConfigurer {
    * @param builder the mutable channel builder for the new child channel
    */
   default void configureChannelBuilder(ManagedChannelBuilder<?> builder) {}
-
-  /**
-   * Configures a builder for a new child server.
-   *
-   * <p>This method is invoked synchronously during the creation of the child server,
-   * before {@link ServerBuilder#build()} is called.
-   *
-   * @param builder the mutable server builder for the new child server
-   */
-  default void configureServerBuilder(ServerBuilder<?> builder) {}
 }

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

@@ -244,8 +244,8 @@ public T disableServiceConfigLookUp() {
 
 
   @Override
-  public T childChannelConfigurer(ChannelConfigurer channelConfigurer) {
-    delegate().childChannelConfigurer(channelConfigurer);
+  public T childChannelConfigurator(ChannelConfigurator channelConfigurer) {
+    delegate().childChannelConfigurator(channelConfigurer);
     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 childChannelConfigurer(ChannelConfigurer channelConfigurer) {
-    delegate().childChannelConfigurer(channelConfigurer);
+  public T childChannelConfigurator(ChannelConfigurator channelConfigurer) {
+    delegate().childChannelConfigurator(channelConfigurer);
     return thisT();
   }
 

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

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

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

@@ -670,7 +670,7 @@ public <X> T setNameResolverArg(NameResolver.Args.Key<X> key, X value) {
    * @since 1.81.0
    */
   @ExperimentalApi("https://github.com/grpc/grpc-java/issues/12574")
-  public T childChannelConfigurer(ChannelConfigurer channelConfigurer) {
+  public T childChannelConfigurator(ChannelConfigurator channelConfigurer) {
     throw new UnsupportedOperationException("Not implemented");
   }
 

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

@@ -27,13 +27,6 @@
 @Internal
 public interface MetricRecorder {
 
-  /**
-   * Returns a {@link MetricRecorder} that performs no operations.
-   * The returned instance ignores all calls and skips all validation checks.
-   */
-  static MetricRecorder noOp() {
-    return NoOpMetricRecorder.INSTANCE;
-  }
 
   /**
    * Adds a value for a double-precision counter metric instrument.
@@ -186,46 +179,5 @@ interface Registration extends AutoCloseable {
     void close();
   }
 
-  /**
-   * No-Op implementation of MetricRecorder.
-   * Overrides all default methods to skip validation checks for maximum performance.
-   */
-  final class NoOpMetricRecorder implements MetricRecorder {
-    private static final NoOpMetricRecorder INSTANCE = new NoOpMetricRecorder();
 
-    @Override
-    public void addDoubleCounter(DoubleCounterMetricInstrument metricInstrument, double value,
-                                 List<String> requiredLabelValues,
-                                 List<String> optionalLabelValues) {
-    }
-
-    @Override
-    public void addLongCounter(LongCounterMetricInstrument metricInstrument, long value,
-                               List<String> requiredLabelValues, List<String> optionalLabelValues) {
-    }
-
-    @Override
-    public void addLongUpDownCounter(LongUpDownCounterMetricInstrument metricInstrument, long value,
-                                     List<String> requiredLabelValues,
-                                     List<String> optionalLabelValues) {
-    }
-
-    @Override
-    public void recordDoubleHistogram(DoubleHistogramMetricInstrument metricInstrument,
-                                      double value, List<String> requiredLabelValues,
-                                      List<String> optionalLabelValues) {
-    }
-
-    @Override
-    public void recordLongHistogram(LongHistogramMetricInstrument metricInstrument, long value,
-                                    List<String> requiredLabelValues,
-                                    List<String> optionalLabelValues) {
-    }
-
-    @Override
-    public Registration registerBatchCallback(BatchCallback callback,
-                                              CallbackMetricInstrument... metricInstruments) {
-      return () -> { };
-    }
-  }
 }

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 ChannelConfigurer channelConfigurer;
+    @Nullable private final ChannelConfigurator channelConfigurer;
 
     private Args(Builder builder) {
       this.defaultPort = checkNotNull(builder.defaultPort, "defaultPort not set");
@@ -479,7 +479,7 @@ public ChannelLogger getChannelLogger() {
      */
     @Nullable
     @Internal
-    public ChannelConfigurer getChildChannelConfigurer() {
+    public ChannelConfigurator getChildChannelConfigurator() {
       return channelConfigurer;
     }
 
@@ -592,7 +592,7 @@ public static final class Builder {
       private MetricRecorder metricRecorder;
       private NameResolverRegistry nameResolverRegistry;
       private IdentityHashMap<Key<?>, Object> customArgs;
-      private ChannelConfigurer channelConfigurer = new ChannelConfigurer() {};
+      private ChannelConfigurator channelConfigurer = new ChannelConfigurator() {};
 
       Builder() {
       }
@@ -709,11 +709,11 @@ public Builder setNameResolverRegistry(NameResolverRegistry registry) {
       }
 
       /**
-       * See {@link Args#getChildChannelConfigurer()}. This is an optional field.
+       * See {@link Args#getChildChannelConfigurator()}. This is an optional field.
        *
        * @since 1.81.0
        */
-      public Builder setChildChannelConfigurer(ChannelConfigurer channelConfigurer) {
+      public Builder setChildChannelConfigurator(ChannelConfigurator channelConfigurer) {
         this.channelConfigurer = channelConfigurer;
         return this;
       }

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

@@ -437,7 +437,7 @@ public T setBinaryLog(BinaryLog binaryLog) {
    * @since 1.81.0
    */
   @ExperimentalApi("https://github.com/grpc/grpc-java/issues/12574")
-  public T childChannelConfigurer(ChannelConfigurer channelConfigurer) {
+  public T childChannelConfigurator(ChannelConfigurator channelConfigurer) {
     throw new UnsupportedOperationException("Not implemented");
   }
 

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

@@ -24,18 +24,14 @@
 import org.junit.runners.JUnit4;
 
 @RunWith(JUnit4.class)
-public class ChannelConfigurerTest {
+public class ChannelConfiguratorTest {
 
   @Test
   public void defaultMethods_doNothing() {
-    ChannelConfigurer configurer = new ChannelConfigurer() {};
+    ChannelConfigurator configurator = new ChannelConfigurator() {};
 
     ManagedChannelBuilder<?> mockChannelBuilder = mock(ManagedChannelBuilder.class);
-    configurer.configureChannelBuilder(mockChannelBuilder);
+    configurator.configureChannelBuilder(mockChannelBuilder);
     verifyNoInteractions(mockChannelBuilder);
-
-    ServerBuilder<?> mockServerBuilder = mock(ServerBuilder.class);
-    configurer.configureServerBuilder(mockServerBuilder);
-    verifyNoInteractions(mockServerBuilder);
   }
 }

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

@@ -105,7 +105,7 @@ public void args() {
   }
 
   private NameResolver.Args createArgs() {
-    ChannelConfigurer channelConfigurer = mock(ChannelConfigurer.class);
+    ChannelConfigurator channelConfigurer = 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)
-        .setChildChannelConfigurer(channelConfigurer)
+        .setChildChannelConfigurator(channelConfigurer)
         .build();
   }
 
   @Test
-  public void args_childChannelConfigurer() {
-    ChannelConfigurer channelConfigurer = mock(ChannelConfigurer.class);
+  public void args_childChannelConfigurator() {
+    ChannelConfigurator channelConfigurer = mock(ChannelConfigurator.class);
 
     SynchronizationContext realSyncContext = new SynchronizationContext(
         new Thread.UncaughtExceptionHandler() {
@@ -139,14 +139,14 @@ public void uncaughtException(Thread t, Throwable e) {
         .setSynchronizationContext(realSyncContext)
         .setServiceConfigParser(mock(NameResolver.ServiceConfigParser.class))
         .setChannelLogger(mock(ChannelLogger.class))
-        .setChildChannelConfigurer(channelConfigurer)
+        .setChildChannelConfigurator(channelConfigurer)
         .build();
 
-    assertThat(args.getChildChannelConfigurer()).isSameInstanceAs(channelConfigurer);
+    assertThat(args.getChildChannelConfigurator()).isSameInstanceAs(channelConfigurer);
 
     // Validate configurer accepts builders
     ManagedChannelBuilder<?> mockBuilder = mock(ManagedChannelBuilder.class);
-    args.getChildChannelConfigurer().configureChannelBuilder(mockBuilder);
+    args.getChildChannelConfigurator().configureChannelBuilder(mockBuilder);
     verify(channelConfigurer).configureChannelBuilder(mockBuilder);
   }