From 6eced95a547be94f6cce31b4af9d28d48bd3f208 Mon Sep 17 00:00:00 2001
From: wanyingd1996 <68657274+wanyingd1996@users.noreply.github.com>
Date: Wed, 12 Aug 2020 15:29:30 -0700
Subject: [PATCH] api: removed deprecated method blockingExecutor (#7242)

---
 api/src/main/java/io/grpc/ForwardingChannelBuilder.java | 7 -------
 api/src/main/java/io/grpc/ManagedChannelBuilder.java    | 6 ------
 2 files changed, 13 deletions(-)

diff --git a/api/src/main/java/io/grpc/ForwardingChannelBuilder.java b/api/src/main/java/io/grpc/ForwardingChannelBuilder.java
index ca53b4df4c8..612779a7848 100644
--- a/api/src/main/java/io/grpc/ForwardingChannelBuilder.java
+++ b/api/src/main/java/io/grpc/ForwardingChannelBuilder.java
@@ -77,13 +77,6 @@ public T offloadExecutor(Executor executor) {
     return thisT();
   }
 
-  @Deprecated
-  @Override
-  public T blockingExecutor(Executor executor) {
-    delegate().blockingExecutor(executor);
-    return thisT();
-  }
-
   @Override
   public T intercept(List<ClientInterceptor> interceptors) {
     delegate().intercept(interceptors);
diff --git a/api/src/main/java/io/grpc/ManagedChannelBuilder.java b/api/src/main/java/io/grpc/ManagedChannelBuilder.java
index 0f915f9a341..e0c87d30715 100644
--- a/api/src/main/java/io/grpc/ManagedChannelBuilder.java
+++ b/api/src/main/java/io/grpc/ManagedChannelBuilder.java
@@ -124,12 +124,6 @@ public T offloadExecutor(Executor executor) {
     throw new UnsupportedOperationException();
   }
 
-  @Deprecated
-  @ExperimentalApi("https://github.com/grpc/grpc-java/issues/6279")
-  public T blockingExecutor(Executor executor) {
-    return offloadExecutor(executor);
-  }
-
   /**
    * Adds interceptors that will be called before the channel performs its real work. This is
    * functionally equivalent to using {@link ClientInterceptors#intercept(Channel, List)}, but while