From 25122f9e8394ab90d28d1733f85080137f59deb5 Mon Sep 17 00:00:00 2001
From: Chengyuan Zhang <chengyuanzhang@google.com>
Date: Tue, 15 Jun 2021 15:11:56 -0700
Subject: [PATCH] api: clean up duplicated method in InternalServerInterceptors
 (#8261)

---
 api/src/main/java/io/grpc/InternalServerInterceptors.java | 5 -----
 core/src/main/java/io/grpc/internal/ServerImpl.java       | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/api/src/main/java/io/grpc/InternalServerInterceptors.java b/api/src/main/java/io/grpc/InternalServerInterceptors.java
index 26c0b352b3..e48c1468f1 100644
--- a/api/src/main/java/io/grpc/InternalServerInterceptors.java
+++ b/api/src/main/java/io/grpc/InternalServerInterceptors.java
@@ -21,11 +21,6 @@ package io.grpc;
  */
 @Internal
 public final class InternalServerInterceptors {
-  public static <ReqT, RespT> ServerCallHandler<ReqT, RespT> interceptCallHandler(
-      ServerInterceptor interceptor, ServerCallHandler<ReqT, RespT> callHandler) {
-    return ServerInterceptors.InterceptCallHandler.create(interceptor, callHandler);
-  }
-
   public static <OrigReqT, OrigRespT, WrapReqT, WrapRespT>
       ServerMethodDefinition<WrapReqT, WrapRespT> wrapMethod(
       final ServerMethodDefinition<OrigReqT, OrigRespT> definition,
diff --git a/core/src/main/java/io/grpc/internal/ServerImpl.java b/core/src/main/java/io/grpc/internal/ServerImpl.java
index 6c66aac07a..21f13cf5b4 100644
--- a/core/src/main/java/io/grpc/internal/ServerImpl.java
+++ b/core/src/main/java/io/grpc/internal/ServerImpl.java
@@ -604,7 +604,7 @@ public final class ServerImpl extends io.grpc.Server implements InternalInstrume
               stream.getAuthority()));
       ServerCallHandler<ReqT, RespT> handler = methodDef.getServerCallHandler();
       for (ServerInterceptor interceptor : interceptors) {
-        handler = InternalServerInterceptors.interceptCallHandler(interceptor, handler);
+        handler = InternalServerInterceptors.interceptCallHandlerCreate(interceptor, handler);
       }
       ServerMethodDefinition<ReqT, RespT> interceptedDef = methodDef.withServerCallHandler(handler);
       ServerMethodDefinition<?, ?> wMethodDef = binlog == null