From 7e219c349ef2009e6865d62a195c745460d54bd5 Mon Sep 17 00:00:00 2001
From: Eric Anderson <ejona@google.com>
Date: Thu, 18 Apr 2019 10:32:45 -0700
Subject: [PATCH] alts: Use normal defaults in Alts{Channel,Server}Builder

The ALTS builders are supposed to act like ChannelCreds, as done in
other languages. ChannelCreds don't have the opportunity to change
settings like this. In addition, the options here weren't set in
GoogleDefaultChannelBuilder and ComputeEngineChannelBuilder.
---
 alts/src/main/java/io/grpc/alts/AltsChannelBuilder.java | 7 +------
 alts/src/main/java/io/grpc/alts/AltsServerBuilder.java  | 8 +-------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/alts/src/main/java/io/grpc/alts/AltsChannelBuilder.java b/alts/src/main/java/io/grpc/alts/AltsChannelBuilder.java
index 8252884b24..8e61e2a7f5 100644
--- a/alts/src/main/java/io/grpc/alts/AltsChannelBuilder.java
+++ b/alts/src/main/java/io/grpc/alts/AltsChannelBuilder.java
@@ -41,7 +41,6 @@ import io.grpc.internal.ObjectPool;
 import io.grpc.internal.SharedResourcePool;
 import io.grpc.netty.InternalNettyChannelBuilder;
 import io.grpc.netty.NettyChannelBuilder;
-import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.annotation.Nullable;
@@ -74,11 +73,7 @@ public final class AltsChannelBuilder extends ForwardingChannelBuilder<AltsChann
   }
 
   private AltsChannelBuilder(String target) {
-    delegate =
-        NettyChannelBuilder.forTarget(target)
-            .keepAliveTime(20, TimeUnit.SECONDS)
-            .keepAliveTimeout(10, TimeUnit.SECONDS)
-            .keepAliveWithoutCalls(true);
+    delegate = NettyChannelBuilder.forTarget(target);
     InternalNettyChannelBuilder.setProtocolNegotiatorFactory(
         delegate(), new ProtocolNegotiatorFactory());
   }
diff --git a/alts/src/main/java/io/grpc/alts/AltsServerBuilder.java b/alts/src/main/java/io/grpc/alts/AltsServerBuilder.java
index 7cffef0283..8c8d55725b 100644
--- a/alts/src/main/java/io/grpc/alts/AltsServerBuilder.java
+++ b/alts/src/main/java/io/grpc/alts/AltsServerBuilder.java
@@ -70,13 +70,7 @@ public final class AltsServerBuilder extends ServerBuilder<AltsServerBuilder> {
 
   /** Creates a gRPC server builder for the given port. */
   public static AltsServerBuilder forPort(int port) {
-    NettyServerBuilder nettyDelegate =
-        NettyServerBuilder.forAddress(new InetSocketAddress(port))
-            .maxConnectionIdle(1, TimeUnit.HOURS)
-            .keepAliveTime(270, TimeUnit.SECONDS)
-            .keepAliveTimeout(20, TimeUnit.SECONDS)
-            .permitKeepAliveTime(10, TimeUnit.SECONDS)
-            .permitKeepAliveWithoutCalls(true);
+    NettyServerBuilder nettyDelegate = NettyServerBuilder.forAddress(new InetSocketAddress(port));
     return new AltsServerBuilder(nettyDelegate);
   }