android: delete deprecated API methods (#6088)
diff --git a/android/src/main/java/io/grpc/android/AndroidChannelBuilder.java b/android/src/main/java/io/grpc/android/AndroidChannelBuilder.java
index dd685a9..ae3210e 100644
--- a/android/src/main/java/io/grpc/android/AndroidChannelBuilder.java
+++ b/android/src/main/java/io/grpc/android/AndroidChannelBuilder.java
@@ -37,12 +37,9 @@
import io.grpc.ManagedChannelBuilder;
import io.grpc.MethodDescriptor;
import io.grpc.internal.GrpcUtil;
-import java.util.concurrent.Executor;
-import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import javax.annotation.Nullable;
import javax.annotation.concurrent.GuardedBy;
-import javax.net.ssl.SSLSocketFactory;
/**
* Builds a {@link ManagedChannel} that, when provided with a {@link Context}, will automatically
@@ -139,62 +136,6 @@
return this;
}
- /**
- * Set the delegate channel builder's transportExecutor.
- *
- * @deprecated Use {@link #usingBuilder(ManagedChannelBuilder)} with a pre-configured
- * ManagedChannelBuilder instead.
- */
- @Deprecated
- public AndroidChannelBuilder transportExecutor(@Nullable Executor transportExecutor) {
- try {
- OKHTTP_CHANNEL_BUILDER_CLASS
- .getMethod("transportExecutor", Executor.class)
- .invoke(delegateBuilder, transportExecutor);
- return this;
- } catch (Exception e) {
- throw new RuntimeException("Failed to invoke transportExecutor on delegate builder", e);
- }
- }
-
- /**
- * Set the delegate channel builder's sslSocketFactory.
- *
- * @deprecated Use {@link #usingBuilder(ManagedChannelBuilder)} with a pre-configured
- * ManagedChannelBuilder instead.
- */
- @Deprecated
- public AndroidChannelBuilder sslSocketFactory(SSLSocketFactory factory) {
- try {
- OKHTTP_CHANNEL_BUILDER_CLASS
- .getMethod("sslSocketFactory", SSLSocketFactory.class)
- .invoke(delegateBuilder, factory);
- return this;
- } catch (Exception e) {
- throw new RuntimeException("Failed to invoke sslSocketFactory on delegate builder", e);
- }
- }
-
- /**
- * Set the delegate channel builder's scheduledExecutorService.
- *
- * @deprecated Use {@link #usingBuilder(ManagedChannelBuilder)} with a pre-configured
- * ManagedChannelBuilder instead.
- */
- @Deprecated
- public AndroidChannelBuilder scheduledExecutorService(
- ScheduledExecutorService scheduledExecutorService) {
- try {
- OKHTTP_CHANNEL_BUILDER_CLASS
- .getMethod("scheduledExecutorService", ScheduledExecutorService.class)
- .invoke(delegateBuilder, scheduledExecutorService);
- return this;
- } catch (Exception e) {
- throw new RuntimeException(
- "Failed to invoke scheduledExecutorService on delegate builder", e);
- }
- }
-
@Override
protected ManagedChannelBuilder<?> delegate() {
return delegateBuilder;
diff --git a/android/src/test/java/io/grpc/android/AndroidChannelBuilderTest.java b/android/src/test/java/io/grpc/android/AndroidChannelBuilderTest.java
index bc36531..c69f7d5 100644
--- a/android/src/test/java/io/grpc/android/AndroidChannelBuilderTest.java
+++ b/android/src/test/java/io/grpc/android/AndroidChannelBuilderTest.java
@@ -36,12 +36,10 @@
import java.util.HashSet;
import java.util.List;
import java.util.concurrent.Callable;
-import java.util.concurrent.Executor;
import java.util.concurrent.Future;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
-import javax.net.ssl.SSLSocketFactory;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -101,27 +99,6 @@
}
@Test
- public void transportExecutor() {
- AndroidChannelBuilder.forTarget("target")
- .transportExecutor(
- new Executor() {
- @Override
- public void execute(Runnable r) {}
- });
- }
-
- @Test
- public void sslSocketFactory() {
- AndroidChannelBuilder.forTarget("target")
- .sslSocketFactory((SSLSocketFactory) SSLSocketFactory.getDefault());
- }
-
- @Test
- public void scheduledExecutorService() {
- AndroidChannelBuilder.forTarget("target").scheduledExecutorService(new ScheduledExecutorImpl());
- }
-
- @Test
@Config(sdk = 23)
public void nullContextDoesNotThrow_api23() {
TestChannel delegateChannel = new TestChannel();
