From a9a7cd129cbb1119f2aa432cce879f4879e3c36d Mon Sep 17 00:00:00 2001
From: Eric Anderson <ejona@google.com>
Date: Tue, 28 Feb 2023 11:51:11 -0800
Subject: [PATCH] api: Forward getMethodDescriptor() in ForwardingServerCall

---
 api/src/main/java/io/grpc/ForwardingServerCall.java    | 10 +++++-----
 .../test/java/io/grpc/ForwardingServerCallTest.java    |  5 -----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/api/src/main/java/io/grpc/ForwardingServerCall.java b/api/src/main/java/io/grpc/ForwardingServerCall.java
index 6e64e7764f..d513d72dab 100644
--- a/api/src/main/java/io/grpc/ForwardingServerCall.java
+++ b/api/src/main/java/io/grpc/ForwardingServerCall.java
@@ -32,6 +32,11 @@ public abstract class ForwardingServerCall<ReqT, RespT>
     delegate().sendMessage(message);
   }
 
+  @Override
+  public MethodDescriptor<ReqT, RespT> getMethodDescriptor() {
+    return delegate().getMethodDescriptor();
+  }
+
   /**
    * A simplified version of {@link ForwardingServerCall} where subclasses can pass in a {@link
    * ServerCall} as the delegate.
@@ -49,10 +54,5 @@ public abstract class ForwardingServerCall<ReqT, RespT>
     protected ServerCall<ReqT, RespT> delegate() {
       return delegate;
     }
-
-    @Override
-    public MethodDescriptor<ReqT, RespT> getMethodDescriptor() {
-      return delegate.getMethodDescriptor();
-    }
   }
 }
diff --git a/api/src/test/java/io/grpc/ForwardingServerCallTest.java b/api/src/test/java/io/grpc/ForwardingServerCallTest.java
index f5a601a64a..e6cb63fdd2 100644
--- a/api/src/test/java/io/grpc/ForwardingServerCallTest.java
+++ b/api/src/test/java/io/grpc/ForwardingServerCallTest.java
@@ -44,11 +44,6 @@ public class ForwardingServerCallTest {
   public void setUp() {
     forwarder =
         new ForwardingServerCall<Integer, Integer>() {
-          @Override
-          public MethodDescriptor<Integer, Integer> getMethodDescriptor() {
-            return serverCall.getMethodDescriptor();
-          }
-
           @Override
           protected ServerCall<Integer, Integer> delegate() {
             return serverCall;