From 9e2c817cd875f8db89b73d941f18335b4feed30e Mon Sep 17 00:00:00 2001
From: Chengyuan Zhang <chengyuanzhang@google.com>
Date: Thu, 4 Mar 2021 18:23:09 -0800
Subject: [PATCH] Make AltsServerBuilder extend ForwardingServerBuilder.

---
 .../java/io/grpc/alts/AltsServerBuilder.java     | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/alts/src/main/java/io/grpc/alts/AltsServerBuilder.java b/alts/src/main/java/io/grpc/alts/AltsServerBuilder.java
index 1c98409944..e307fd1c63 100644
--- a/alts/src/main/java/io/grpc/alts/AltsServerBuilder.java
+++ b/alts/src/main/java/io/grpc/alts/AltsServerBuilder.java
@@ -20,6 +20,7 @@ import io.grpc.BindableService;
 import io.grpc.CompressorRegistry;
 import io.grpc.DecompressorRegistry;
 import io.grpc.ExperimentalApi;
+import io.grpc.ForwardingServerBuilder;
 import io.grpc.HandlerRegistry;
 import io.grpc.Server;
 import io.grpc.ServerBuilder;
@@ -30,7 +31,6 @@ import io.grpc.ServerTransportFilter;
 import io.grpc.netty.NettyServerBuilder;
 import java.io.File;
 import java.net.InetSocketAddress;
-import java.util.List;
 import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
 
@@ -39,7 +39,7 @@ import java.util.concurrent.TimeUnit;
  * a production server on Google Cloud Platform.
  */
 @ExperimentalApi("https://github.com/grpc/grpc-java/issues/4151")
-public final class AltsServerBuilder extends ServerBuilder<AltsServerBuilder> {
+public final class AltsServerBuilder extends ForwardingServerBuilder<AltsServerBuilder> {
   private final NettyServerBuilder delegate;
   private final AltsServerCredentials.Builder credentialsBuilder =
       new AltsServerCredentials.Builder();
@@ -69,6 +69,11 @@ public final class AltsServerBuilder extends ServerBuilder<AltsServerBuilder> {
     return this;
   }
 
+  @Override
+  protected ServerBuilder<?> delegate() {
+    return delegate;
+  }
+
   /** {@inheritDoc} */
   @Override
   public AltsServerBuilder handshakeTimeout(long timeout, TimeUnit unit) {
@@ -118,13 +123,6 @@ public final class AltsServerBuilder extends ServerBuilder<AltsServerBuilder> {
     return this;
   }
 
-  /** {@inheritDoc} */
-  @Override
-  public AltsServerBuilder addServices(List<ServerServiceDefinition> services) {
-    delegate.addServices(services);
-    return this;
-  }
-
   /** {@inheritDoc} */
   @Override
   public AltsServerBuilder fallbackHandlerRegistry(HandlerRegistry fallbackRegistry) {