[ML] Get Filters should use executeAsyncWithOrigin (elastic/x-pack-elasticsearch#3295)

* Get Filters should use executeAsyncWithOrigin

Original commit: elastic/x-pack-elasticsearch@786c7bfd06

plugin/src/main/java/org/elasticsearch/xpack/ml/action/DeleteFilterAction.java

@@ -202,8 +202,7 @@ public class DeleteFilterAction extends Action<DeleteFilterAction.Request, Delet
 
                         @Override
                         public void onFailure(Exception e) {
-                            logger.error("Could not delete filter with ID [" + filterId + "]", e);
+                            listener.onFailure(ExceptionsHelper.serverError("Could not delete filter with ID [" + filterId + "]", e));
-                            listener.onFailure(new IllegalStateException("Could not delete filter with ID [" + filterId + "]", e));
                         }
             });
         }

plugin/src/main/java/org/elasticsearch/xpack/ml/action/GetFiltersAction.java

@@ -11,14 +11,14 @@ import org.elasticsearch.action.ActionRequest;
 import org.elasticsearch.action.ActionRequestBuilder;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.ActionResponse;
+import org.elasticsearch.action.get.GetAction;
 import org.elasticsearch.action.get.GetRequest;
 import org.elasticsearch.action.get.GetResponse;
-import org.elasticsearch.action.get.TransportGetAction;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
-import org.elasticsearch.action.search.TransportSearchAction;
 import org.elasticsearch.action.support.ActionFilters;
 import org.elasticsearch.action.support.HandledTransportAction;
+import org.elasticsearch.client.Client;
 import org.elasticsearch.client.ElasticsearchClient;
 import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
 import org.elasticsearch.common.Strings;
@@ -51,6 +51,8 @@ import java.util.List;
 import java.util.Objects;
 
 import static org.elasticsearch.action.ValidateActions.addValidationError;
+import static org.elasticsearch.xpack.ClientHelper.ML_ORIGIN;
+import static org.elasticsearch.xpack.ClientHelper.executeAsyncWithOrigin;
 
 
 public class GetFiltersAction extends Action<GetFiltersAction.Request, GetFiltersAction.Response, GetFiltersAction.RequestBuilder> {
@@ -81,10 +83,6 @@ public class GetFiltersAction extends Action<GetFiltersAction.Request, GetFilter
         }
 
         public void setFilterId(String filterId) {
-            if (pageParams != null) {
-                throw new IllegalArgumentException("Param [" + MlFilter.ID.getPreferredName() + "] is incompatible with ["
-                        + PageParams.FROM.getPreferredName()+ ", " + PageParams.SIZE.getPreferredName() + "].");
-            }
             this.filterId = filterId;
         }
 
@@ -97,21 +95,16 @@ public class GetFiltersAction extends Action<GetFiltersAction.Request, GetFilter
         }
 
         public void setPageParams(PageParams pageParams) {
-            if (filterId != null) {
-                throw new IllegalArgumentException("Param [" + PageParams.FROM.getPreferredName()
-                        + ", " + PageParams.SIZE.getPreferredName() + "] is incompatible with ["
-                        + MlFilter.ID.getPreferredName() + "].");
-            }
             this.pageParams = pageParams;
         }
 
         @Override
         public ActionRequestValidationException validate() {
             ActionRequestValidationException validationException = null;
-            if (pageParams == null && filterId == null) {
+            if (pageParams != null && filterId != null) {
-                validationException = addValidationError("Both [" + MlFilter.ID.getPreferredName() + "] and ["
+                validationException = addValidationError("Params [" + PageParams.FROM.getPreferredName() +
-                        + PageParams.FROM.getPreferredName() + ", " + PageParams.SIZE.getPreferredName() + "] "
+                        ", " + PageParams.SIZE.getPreferredName() + "] are incompatible with ["
-                        + "cannot be null" , validationException);
+                        + MlFilter.ID.getPreferredName() + "]", validationException);
             }
             return validationException;
         }
@@ -218,18 +211,16 @@ public class GetFiltersAction extends Action<GetFiltersAction.Request, GetFilter
 
     public static class TransportAction extends HandledTransportAction<Request, Response> {
 
-        private final TransportGetAction transportGetAction;
+        private final Client client;
-        private final TransportSearchAction transportSearchAction;
 
         @Inject
         public TransportAction(Settings settings, ThreadPool threadPool,
                 TransportService transportService, ActionFilters actionFilters,
                 IndexNameExpressionResolver indexNameExpressionResolver,
-                TransportGetAction transportGetAction, TransportSearchAction transportSearchAction) {
+                Client client) {
             super(settings, NAME, threadPool, transportService, actionFilters,
                     indexNameExpressionResolver, Request::new);
-            this.transportGetAction = transportGetAction;
+            this.client = client;
-            this.transportSearchAction = transportSearchAction;
         }
 
         @Override
@@ -237,16 +228,18 @@ public class GetFiltersAction extends Action<GetFiltersAction.Request, GetFilter
             final String filterId = request.getFilterId();
             if (!Strings.isNullOrEmpty(filterId)) {
                 getFilter(filterId, listener);
-            } else if (request.getPageParams() != null) {
+            } else  {
-                getFilters(request.getPageParams(), listener);
+                PageParams pageParams = request.getPageParams();
-            } else {
+                if (pageParams == null) {
-                throw new IllegalStateException("Both filterId and pageParams are null");
+                    pageParams = PageParams.defaultParams();
+                }
+                getFilters(pageParams, listener);
             }
         }
 
         private void getFilter(String filterId, ActionListener<Response> listener) {
             GetRequest getRequest = new GetRequest(MlMetaIndex.INDEX_NAME, MlMetaIndex.TYPE, MlFilter.documentId(filterId));
-            transportGetAction.execute(getRequest, new ActionListener<GetResponse>() {
+            executeAsyncWithOrigin(client, ML_ORIGIN, GetAction.INSTANCE, getRequest, new ActionListener<GetResponse>() {
                 @Override
                 public void onResponse(GetResponse getDocResponse) {
 
@@ -287,7 +280,7 @@ public class GetFiltersAction extends Action<GetFiltersAction.Request, GetFilter
                     .indicesOptions(JobProvider.addIgnoreUnavailable(SearchRequest.DEFAULT_INDICES_OPTIONS))
                     .source(sourceBuilder);
 
-            transportSearchAction.execute(searchRequest, new ActionListener<SearchResponse>() {
+            executeAsyncWithOrigin(client.threadPool().getThreadContext(), ML_ORIGIN, searchRequest, new ActionListener<SearchResponse>() {
                 @Override
                 public void onResponse(SearchResponse response) {
                     List<MlFilter> docs = new ArrayList<>();
@@ -310,7 +303,8 @@ public class GetFiltersAction extends Action<GetFiltersAction.Request, GetFilter
                 public void onFailure(Exception e) {
                     listener.onFailure(e);
                 }
-            });
+            },
+            client::search);
         }
     }
 }

plugin/src/main/java/org/elasticsearch/xpack/ml/action/PutCalendarAction.java

@@ -213,7 +213,8 @@ public class PutCalendarAction extends Action<PutCalendarAction.Request, PutCale
 
                         @Override
                         public void onFailure(Exception e) {
-                            listener.onFailure(e);
+                            listener.onFailure(
+                                    ExceptionsHelper.serverError("Error putting calendar with id [" + calendar.getId() + "]", e));
                         }
                     });
         }

plugin/src/main/java/org/elasticsearch/xpack/ml/action/PutFilterAction.java

@@ -5,7 +5,6 @@
  */
 package org.elasticsearch.xpack.ml.action;
 
-import org.elasticsearch.ResourceNotFoundException;
 import org.elasticsearch.action.Action;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.ActionRequest;
@@ -199,8 +198,7 @@ public class PutFilterAction extends Action<PutFilterAction.Request, PutFilterAc
 
                         @Override
                         public void onFailure(Exception e) {
-                            listener.onFailure(
+                            listener.onFailure(ExceptionsHelper.serverError("Error putting filter with id [" + filter.getId() + "]", e));
-                                    new ResourceNotFoundException("Could not create filter with ID [" + filter.getId() + "]", e));
                         }
                     });
         }

plugin/src/main/java/org/elasticsearch/xpack/ml/rest/filter/RestGetFiltersAction.java

@@ -40,10 +40,9 @@ public class RestGetFiltersAction extends BaseRestHandler {
         if (!Strings.isNullOrEmpty(filterId)) {
             getListRequest.setFilterId(filterId);
         }
-        if (restRequest.hasParam(PageParams.FROM.getPreferredName())
+        if (restRequest.hasParam(PageParams.FROM.getPreferredName()) || restRequest.hasParam(PageParams.SIZE.getPreferredName())) {
-                || restRequest.hasParam(PageParams.SIZE.getPreferredName())
+            getListRequest.setPageParams(
-                || Strings.isNullOrEmpty(filterId)) {
+                    new PageParams(restRequest.paramAsInt(PageParams.FROM.getPreferredName(), PageParams.DEFAULT_FROM),
-            getListRequest.setPageParams(new PageParams(restRequest.paramAsInt(PageParams.FROM.getPreferredName(), PageParams.DEFAULT_FROM),
                     restRequest.paramAsInt(PageParams.SIZE.getPreferredName(), PageParams.DEFAULT_SIZE)));
         }
         return channel -> client.execute(GetFiltersAction.INSTANCE, getListRequest, new RestStatusToXContentListener<>(channel));

plugin/src/test/resources/rest-api-spec/test/ml/filter_crud.yml

@@ -202,3 +202,19 @@ setup:
       catch: missing
       xpack.ml.get_filters:
         filter_id: "filter-foo"
+
+---
+"Test get all filter given no filter exists":
+
+  - do:
+      xpack.ml.delete_filter:
+        filter_id: "filter-foo"
+
+  - do:
+      xpack.ml.delete_filter:
+        filter_id: "filter-foo2"
+
+  - do:
+      xpack.ml.get_filters: {}
+  - match: { count: 0 }
+  - match: { filters: [] }

plugin/src/test/resources/rest-api-spec/test/ml/get_filters.yml

@@ -1,20 +0,0 @@
----
-"Test get all filter given no filter exists":
-
-  - do:
-      xpack.ml.put_filter:
-        filter_id: filter-foo
-        body:  >
-          {
-            "filter_id": "filter-foo",
-            "items": ["abc", "xyz"]
-          }
-
-  - do:
-      xpack.ml.delete_filter:
-        filter_id: "filter-foo"
-
-  - do:
-      xpack.ml.get_filters: {}
-  - match: { count: 0 }
-  - match: { filters: [] }