diff --git a/core/src/main/java/io/grpc/internal/GrpcUtil.java b/core/src/main/java/io/grpc/internal/GrpcUtil.java index 47cba3af5c..c7bfd38628 100644 --- a/core/src/main/java/io/grpc/internal/GrpcUtil.java +++ b/core/src/main/java/io/grpc/internal/GrpcUtil.java @@ -204,11 +204,6 @@ public final class GrpcUtil { private static final String IMPLEMENTATION_VERSION = "1.22.0-SNAPSHOT"; // CURRENT_GRPC_VERSION - /** - * The default delay in nanos before we send a keepalive. - */ - public static final long DEFAULT_KEEPALIVE_TIME_NANOS = TimeUnit.MINUTES.toNanos(1); - /** * The default timeout in nanos for a keepalive ping request. */ diff --git a/netty/src/main/java/io/grpc/netty/NettyChannelBuilder.java b/netty/src/main/java/io/grpc/netty/NettyChannelBuilder.java index 2b94cb4493..6cb7df3eaf 100644 --- a/netty/src/main/java/io/grpc/netty/NettyChannelBuilder.java +++ b/netty/src/main/java/io/grpc/netty/NettyChannelBuilder.java @@ -20,7 +20,6 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; import static io.grpc.internal.GrpcUtil.DEFAULT_KEEPALIVE_TIMEOUT_NANOS; -import static io.grpc.internal.GrpcUtil.DEFAULT_KEEPALIVE_TIME_NANOS; import static io.grpc.internal.GrpcUtil.KEEPALIVE_TIME_NANOS_DISABLED; import com.google.common.annotations.VisibleForTesting; @@ -318,34 +317,6 @@ public final class NettyChannelBuilder return this; } - /** - * Enable keepalive with default delay and timeout. - * - * @deprecated Please use {@link #keepAliveTime} and {@link #keepAliveTimeout} instead - */ - @Deprecated - public final NettyChannelBuilder enableKeepAlive(boolean enable) { - if (enable) { - return keepAliveTime(DEFAULT_KEEPALIVE_TIME_NANOS, TimeUnit.NANOSECONDS); - } - return keepAliveTime(KEEPALIVE_TIME_NANOS_DISABLED, TimeUnit.NANOSECONDS); - } - - /** - * Enable keepalive with custom delay and timeout. - * - * @deprecated Please use {@link #keepAliveTime} and {@link #keepAliveTimeout} instead - */ - @Deprecated - public final NettyChannelBuilder enableKeepAlive(boolean enable, long keepAliveTime, - TimeUnit delayUnit, long keepAliveTimeout, TimeUnit timeoutUnit) { - if (enable) { - return keepAliveTime(keepAliveTime, delayUnit) - .keepAliveTimeout(keepAliveTimeout, timeoutUnit); - } - return keepAliveTime(KEEPALIVE_TIME_NANOS_DISABLED, TimeUnit.NANOSECONDS); - } - /** * {@inheritDoc} * diff --git a/okhttp/src/main/java/io/grpc/okhttp/OkHttpChannelBuilder.java b/okhttp/src/main/java/io/grpc/okhttp/OkHttpChannelBuilder.java index a3fafef412..c6c590aa84 100644 --- a/okhttp/src/main/java/io/grpc/okhttp/OkHttpChannelBuilder.java +++ b/okhttp/src/main/java/io/grpc/okhttp/OkHttpChannelBuilder.java @@ -18,7 +18,6 @@ package io.grpc.okhttp; import static com.google.common.base.Preconditions.checkNotNull; import static io.grpc.internal.GrpcUtil.DEFAULT_KEEPALIVE_TIMEOUT_NANOS; -import static io.grpc.internal.GrpcUtil.DEFAULT_KEEPALIVE_TIME_NANOS; import static io.grpc.internal.GrpcUtil.KEEPALIVE_TIME_NANOS_DISABLED; import com.google.common.annotations.VisibleForTesting; @@ -198,36 +197,6 @@ public class OkHttpChannelBuilder extends return this; } - /** - * Enable keepalive with default delay and timeout. - * - * @deprecated Use {@link #keepAliveTime} instead - */ - @Deprecated - public final OkHttpChannelBuilder enableKeepAlive(boolean enable) { - if (enable) { - return keepAliveTime(DEFAULT_KEEPALIVE_TIME_NANOS, TimeUnit.NANOSECONDS); - } else { - return keepAliveTime(KEEPALIVE_TIME_NANOS_DISABLED, TimeUnit.NANOSECONDS); - } - } - - /** - * Enable keepalive with custom delay and timeout. - * - * @deprecated Use {@link #keepAliveTime} and {@link #keepAliveTimeout} instead - */ - @Deprecated - public final OkHttpChannelBuilder enableKeepAlive(boolean enable, long keepAliveTime, - TimeUnit delayUnit, long keepAliveTimeout, TimeUnit timeoutUnit) { - if (enable) { - return keepAliveTime(keepAliveTime, delayUnit) - .keepAliveTimeout(keepAliveTimeout, timeoutUnit); - } else { - return keepAliveTime(KEEPALIVE_TIME_NANOS_DISABLED, TimeUnit.NANOSECONDS); - } - } - /** * {@inheritDoc} *