From 11a314e31a4af90eff8da11a1631a98993f99f57 Mon Sep 17 00:00:00 2001
From: Kun Zhang <zhangkun@google.com>
Date: Fri, 17 Jun 2016 09:54:02 -0700
Subject: [PATCH] Delete the old ClientCall.cancel().

It's deprecated since 0.14.0.
---
 core/src/main/java/io/grpc/ClientCall.java           | 11 -----------
 core/src/main/java/io/grpc/ForwardingClientCall.java |  6 ------
 2 files changed, 17 deletions(-)

diff --git a/core/src/main/java/io/grpc/ClientCall.java b/core/src/main/java/io/grpc/ClientCall.java
index 4bc39996a3..47bb8782ae 100644
--- a/core/src/main/java/io/grpc/ClientCall.java
+++ b/core/src/main/java/io/grpc/ClientCall.java
@@ -159,17 +159,6 @@ public abstract class ClientCall<ReqT, RespT> {
    */
   public abstract void request(int numMessages);
 
-  /**
-   * Equivalent as {@link #cancel(String, Throwable)} without passing any useful information.
-   *
-   * @deprecated Use or override {@link #cancel(String, Throwable)} instead. See
-   *             https://github.com/grpc/grpc-java/issues/1221
-   */
-  @Deprecated
-  public void cancel() {
-    cancel("Cancelled by ClientCall.cancel()", null);
-  }
-
   /**
    * Prevent any further processing for this {@code ClientCall}. No further messages may be sent or
    * will be received. The server is informed of cancellations, but may not stop processing the
diff --git a/core/src/main/java/io/grpc/ForwardingClientCall.java b/core/src/main/java/io/grpc/ForwardingClientCall.java
index 3f1dd61baf..88b0298935 100644
--- a/core/src/main/java/io/grpc/ForwardingClientCall.java
+++ b/core/src/main/java/io/grpc/ForwardingClientCall.java
@@ -52,12 +52,6 @@ public abstract class ForwardingClientCall<ReqT, RespT> extends ClientCall<ReqT,
     delegate().request(numMessages);
   }
 
-  @Deprecated
-  @Override
-  public void cancel() {
-    delegate().cancel();
-  }
-
   @Override
   public void cancel(@Nullable String message, @Nullable Throwable cause) {
     delegate().cancel(message, cause);