From e5b639f3c6351c4fc252aef3546014aa76a21ce6 Mon Sep 17 00:00:00 2001
From: Apurva Mehta <apurva@confluent.io>
Date: Thu, 30 May 2019 22:21:04 -0700
Subject: [PATCH] Now that the upstream changes for KIP-460 have been merged,
 we need to reapply https://github.com/confluentinc/ksql/pull/2896

This reverts commit 437c145e36c6d3133de458322b7f4a859bd3ff0a.
---
 .../ksql/services/SandboxedAdminClient.java         | 13 +++++++++++++
 .../io/confluent/ksql/test/util/TestMethods.java    |  2 ++
 2 files changed, 15 insertions(+)

diff --git a/ksql-engine/src/main/java/io/confluent/ksql/services/SandboxedAdminClient.java b/ksql-engine/src/main/java/io/confluent/ksql/services/SandboxedAdminClient.java
index 26a85c0142fe..da5125b301fb 100644
--- a/ksql-engine/src/main/java/io/confluent/ksql/services/SandboxedAdminClient.java
+++ b/ksql-engine/src/main/java/io/confluent/ksql/services/SandboxedAdminClient.java
@@ -18,6 +18,7 @@
 import java.time.Duration;
 import java.util.Collection;
 import java.util.Map;
+import java.util.Set;
 import org.apache.kafka.clients.admin.AdminClient;
 import org.apache.kafka.clients.admin.AlterConfigOp;
 import org.apache.kafka.clients.admin.AlterConfigsOptions;
@@ -57,6 +58,8 @@
 import org.apache.kafka.clients.admin.DescribeReplicaLogDirsResult;
 import org.apache.kafka.clients.admin.DescribeTopicsOptions;
 import org.apache.kafka.clients.admin.DescribeTopicsResult;
+import org.apache.kafka.clients.admin.ElectLeadersOptions;
+import org.apache.kafka.clients.admin.ElectLeadersResult;
 import org.apache.kafka.clients.admin.ExpireDelegationTokenOptions;
 import org.apache.kafka.clients.admin.ExpireDelegationTokenResult;
 import org.apache.kafka.clients.admin.ListConsumerGroupOffsetsOptions;
@@ -70,6 +73,7 @@
 import org.apache.kafka.clients.admin.RecordsToDelete;
 import org.apache.kafka.clients.admin.RenewDelegationTokenOptions;
 import org.apache.kafka.clients.admin.RenewDelegationTokenResult;
+import org.apache.kafka.common.ElectionType;
 import org.apache.kafka.common.Metric;
 import org.apache.kafka.common.MetricName;
 import org.apache.kafka.common.TopicPartition;
@@ -286,6 +290,15 @@ public org.apache.kafka.clients.admin.ElectPreferredLeadersResult electPreferred
     throw new UnsupportedOperationException();
   }
 
+  @Override
+  public ElectLeadersResult electLeaders(
+      final ElectionType electionType,
+      final Set<TopicPartition> set,
+      final ElectLeadersOptions electLeadersOptions
+  ) {
+    throw new UnsupportedOperationException();
+  }
+
   @Override
   public Map<MetricName, ? extends Metric> metrics() {
     throw new UnsupportedOperationException();
diff --git a/ksql-test-util/src/main/java/io/confluent/ksql/test/util/TestMethods.java b/ksql-test-util/src/main/java/io/confluent/ksql/test/util/TestMethods.java
index 6a7c06eaf09e..af4f0afe9fc6 100644
--- a/ksql-test-util/src/main/java/io/confluent/ksql/test/util/TestMethods.java
+++ b/ksql-test-util/src/main/java/io/confluent/ksql/test/util/TestMethods.java
@@ -34,6 +34,7 @@
 import java.util.Set;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
+import org.apache.kafka.clients.admin.ElectLeadersOptions;
 
 /**
  * Find methods within a class on which to run tests.
@@ -51,6 +52,7 @@ public final class TestMethods {
       .put(String.class, "")
       .put(Duration.class, Duration.ofMillis(1))
       .put(Pattern.class, Pattern.compile(".*"))
+      .put(ElectLeadersOptions.class, new ElectLeadersOptions())
       .build();
 
   private TestMethods() {