Remove Task classes from HLRC

client/rest-high-level/src/main/java/org/elasticsearch/client/RequestConverters.java

@@ -45,7 +45,6 @@
 import org.elasticsearch.client.core.TermVectorsRequest;
 import org.elasticsearch.client.internal.Requests;
 import org.elasticsearch.client.security.RefreshPolicy;
-import org.elasticsearch.client.tasks.TaskId;
 import org.elasticsearch.cluster.health.ClusterHealthStatus;
 import org.elasticsearch.common.Priority;
 import org.elasticsearch.common.Strings;
@@ -581,26 +580,14 @@ static Request reindex(ReindexRequest reindexRequest) throws IOException {
         return prepareReindexRequest(reindexRequest, true);
     }
 
-    static Request submitReindex(ReindexRequest reindexRequest) throws IOException {
-        return prepareReindexRequest(reindexRequest, false);
-    }
-
     static Request deleteByQuery(DeleteByQueryRequest deleteByQueryRequest) throws IOException {
         return prepareDeleteByQueryRequest(deleteByQueryRequest, true);
     }
 
-    static Request submitDeleteByQuery(DeleteByQueryRequest deleteByQueryRequest) throws IOException {
-        return prepareDeleteByQueryRequest(deleteByQueryRequest, false);
-    }
-
     static Request updateByQuery(UpdateByQueryRequest updateByQueryRequest) throws IOException {
         return prepareUpdateByQueryRequest(updateByQueryRequest, true);
     }
 
-    static Request submitUpdateByQuery(UpdateByQueryRequest updateByQueryRequest) throws IOException {
-        return prepareUpdateByQueryRequest(updateByQueryRequest, false);
-    }
-
     private static Request prepareReindexRequest(ReindexRequest reindexRequest, boolean waitForCompletion) throws IOException {
         String endpoint = new EndpointBuilder().addPathPart("_reindex").build();
         Request request = new Request(HttpPost.METHOD_NAME, endpoint);
@@ -1137,34 +1124,6 @@ Params withActions(List<String> actions) {
             return this;
         }
 
-        Params withTaskId(org.elasticsearch.tasks.TaskId taskId) {
-            if (taskId != null && taskId.isSet()) {
-                return putParam("task_id", taskId.toString());
-            }
-            return this;
-        }
-
-        Params withParentTaskId(org.elasticsearch.tasks.TaskId parentTaskId) {
-            if (parentTaskId != null && parentTaskId.isSet()) {
-                return putParam("parent_task_id", parentTaskId.toString());
-            }
-            return this;
-        }
-
-        Params withTaskId(TaskId taskId) {
-            if (taskId != null && taskId.isSet()) {
-                return putParam("task_id", taskId.toString());
-            }
-            return this;
-        }
-
-        Params withParentTaskId(TaskId parentTaskId) {
-            if (parentTaskId != null && parentTaskId.isSet()) {
-                return putParam("parent_task_id", parentTaskId.toString());
-            }
-            return this;
-        }
-
         Params withWaitForStatus(ClusterHealthStatus status) {
             if (status != null) {
                 return putParam("wait_for_status", status.name().toLowerCase(Locale.ROOT));

client/rest-high-level/src/main/java/org/elasticsearch/client/RestHighLevelClient.java

@@ -64,7 +64,6 @@
 import org.elasticsearch.client.core.MultiTermVectorsResponse;
 import org.elasticsearch.client.core.TermVectorsRequest;
 import org.elasticsearch.client.core.TermVectorsResponse;
-import org.elasticsearch.client.tasks.TaskSubmissionResponse;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.util.concurrent.FutureUtils;
 import org.elasticsearch.common.util.concurrent.ListenableFuture;
@@ -430,23 +429,6 @@ public final BulkByScrollResponse reindex(ReindexRequest reindexRequest, Request
         );
     }
 
-    /**
-     * Submits a reindex task.
-     * See <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-reindex.html">Reindex API on elastic.co</a>
-     * @param reindexRequest the request
-     * @param options the request options (e.g. headers), use {@link RequestOptions#DEFAULT} if nothing needs to be customized
-     * @return the submission response
-     */
-    public final TaskSubmissionResponse submitReindexTask(ReindexRequest reindexRequest, RequestOptions options) throws IOException {
-        return performRequestAndParseEntity(
-            reindexRequest,
-            RequestConverters::submitReindex,
-            options,
-            TaskSubmissionResponse::fromXContent,
-            emptySet()
-        );
-    }
-
     /**
      * Asynchronously executes a reindex request.
      * See <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-reindex.html">Reindex API on elastic.co</a>
@@ -488,25 +470,6 @@ public final BulkByScrollResponse updateByQuery(UpdateByQueryRequest updateByQue
         );
     }
 
-    /**
-     * Submits a update by query task.
-     * See <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-update-by-query.html">
-     *     Update By Query API on elastic.co</a>
-     * @param updateByQueryRequest the request
-     * @param options the request options (e.g. headers), use {@link RequestOptions#DEFAULT} if nothing needs to be customized
-     * @return the submission response
-     */
-    public final TaskSubmissionResponse submitUpdateByQueryTask(UpdateByQueryRequest updateByQueryRequest, RequestOptions options)
-        throws IOException {
-        return performRequestAndParseEntity(
-            updateByQueryRequest,
-            RequestConverters::submitUpdateByQuery,
-            options,
-            TaskSubmissionResponse::fromXContent,
-            emptySet()
-        );
-    }
-
     /**
      * Asynchronously executes an update by query request.
      * See <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-update-by-query.html">
@@ -549,25 +512,6 @@ public final BulkByScrollResponse deleteByQuery(DeleteByQueryRequest deleteByQue
         );
     }
 
-    /**
-     * Submits a delete by query task
-     * See <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-delete-by-query.html">
-     *      Delete By Query API on elastic.co</a>
-     * @param deleteByQueryRequest the request
-     * @param options the request options (e.g. headers), use {@link RequestOptions#DEFAULT} if nothing needs to be customized
-     * @return the submission response
-     */
-    public final TaskSubmissionResponse submitDeleteByQueryTask(DeleteByQueryRequest deleteByQueryRequest, RequestOptions options)
-        throws IOException {
-        return performRequestAndParseEntity(
-            deleteByQueryRequest,
-            RequestConverters::submitDeleteByQuery,
-            options,
-            TaskSubmissionResponse::fromXContent,
-            emptySet()
-        );
-    }
-
     /**
      * Asynchronously executes a delete by query request.
      * See <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-delete-by-query.html">