CR fixes

Author: GalLalouche

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plugin/EsqlListQueriesResponse.java

@@ -9,6 +9,7 @@
 
 import org.elasticsearch.action.ActionResponse;
 import org.elasticsearch.common.io.stream.StreamOutput;
+import org.elasticsearch.tasks.TaskId;
 import org.elasticsearch.xcontent.ToXContentFragment;
 import org.elasticsearch.xcontent.ToXContentObject;
 import org.elasticsearch.xcontent.XContentBuilder;
@@ -19,9 +20,7 @@
 public class EsqlListQueriesResponse extends ActionResponse implements ToXContentObject {
     private final List<Query> queries;
 
-    public record Query(org.elasticsearch.tasks.TaskId taskId, long startTimeMillis, long runningTimeNanos, String query)
-        implements
-            ToXContentFragment {
+    public record Query(TaskId taskId, long startTimeMillis, long runningTimeNanos, String query) implements ToXContentFragment {
         @Override
         public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
             builder.startObject(taskId.toString());

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plugin/TransportEsqlGetQueryAction.java

@@ -26,6 +26,7 @@
 import org.elasticsearch.xpack.core.ClientHelper;
 import org.elasticsearch.xpack.esql.action.EsqlGetQueryAction;
 import org.elasticsearch.xpack.esql.action.EsqlGetQueryRequest;
+import org.elasticsearch.xpack.esql.action.EsqlQueryAction;
 
 import static org.elasticsearch.xpack.core.ClientHelper.ESQL_ORIGIN;
 
@@ -49,6 +50,10 @@ protected void doExecute(Task task, EsqlGetQueryRequest request, ActionListener<
                 @Override
                 public void onResponse(GetTaskResponse response) {
                     TaskInfo task = response.getTask().getTask();
+                    if (task.action().startsWith(EsqlQueryAction.NAME) == false) {
+                        listener.onFailure(new IllegalArgumentException("Task [" + request.id() + "] is not an ESQL query task"));
+                        return;
+                    }
                     ClientHelper.executeAsyncWithOrigin(
                         nodeClient,
                         ESQL_ORIGIN,