Make addServices() a final method on ServerBuilder and delete from its forwarders.

Author: voidzcy

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

@@ -19,7 +19,6 @@
 import com.google.common.base.MoreObjects;
 import java.io.File;
 import java.io.InputStream;
-import java.util.List;
 import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
 import javax.annotation.Nullable;
@@ -72,12 +71,6 @@ public T addService(BindableService bindableService) {
     return thisT();
   }
 
-  @Override
-  public T addServices(List<ServerServiceDefinition> services) {
-    delegate().addServices(services);
-    return thisT();
-  }
-
   @Override
   public T intercept(ServerInterceptor interceptor) {
     delegate().intercept(interceptor);

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

@@ -100,7 +100,7 @@ public static ServerBuilder<?> forPort(int port) {
    * @since 1.37.0
    */
   @ExperimentalApi("https://github.com/grpc/grpc-java/issues/7925")
-  public T addServices(List<ServerServiceDefinition> services) {
+  public final T addServices(List<ServerServiceDefinition> services) {
     checkNotNull(services, "services");
     for (ServerServiceDefinition service : services) {
       addService(service);

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

@@ -55,7 +55,9 @@ public void allMethodsForwarded() throws Exception {
   @Test
   public void allBuilderMethodsReturnThis() throws Exception {
     for (Method method : ServerBuilder.class.getDeclaredMethods()) {
-      if (Modifier.isStatic(method.getModifiers()) || Modifier.isPrivate(method.getModifiers())) {
+      if (Modifier.isStatic(method.getModifiers())
+          || Modifier.isPrivate(method.getModifiers())
+          || Modifier.isFinal(method.getModifiers())) {
         continue;
       }
       if (method.getName().equals("build")) {

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

@@ -83,6 +83,7 @@ public static <T> void testMethodsForwarded(
     for (Method method : delegateClass.getDeclaredMethods()) {
       if (Modifier.isStatic(method.getModifiers())
           || Modifier.isPrivate(method.getModifiers())
+          || Modifier.isFinal(method.getModifiers())
           || skippedMethods.contains(method)) {
         continue;
       }

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

@@ -30,7 +30,6 @@
 import io.grpc.ServerTransportFilter;
 import java.io.File;
 import java.io.InputStream;
-import java.util.List;
 import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
 import javax.annotation.Nullable;
@@ -86,12 +85,6 @@ public T addService(BindableService bindableService) {
     return thisT();
   }
 
-  @Override
-  public T addServices(List<ServerServiceDefinition> services) {
-    delegate().addServices(services);
-    return thisT();
-  }
-
   @Override
   public T intercept(ServerInterceptor interceptor) {
     delegate().intercept(interceptor);

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

@@ -59,7 +59,9 @@ public void allMethodsForwarded() throws Exception {
   @Test
   public void allBuilderMethodsReturnThis() throws Exception {
     for (Method method : ServerBuilder.class.getDeclaredMethods()) {
-      if (Modifier.isStatic(method.getModifiers()) || Modifier.isPrivate(method.getModifiers())) {
+      if (Modifier.isStatic(method.getModifiers())
+          || Modifier.isPrivate(method.getModifiers())
+          || Modifier.isFinal(method.getModifiers())) {
         continue;
       }
       if (method.getName().equals("build")) {