From f9a5f1aa14c4f0188026aa77823f88cac121233c Mon Sep 17 00:00:00 2001
From: Niels Bauman <33722607+nielsbauman@users.noreply.github.com>
Date: Thu, 2 May 2024 13:40:56 +0200
Subject: [PATCH] Revert "Make MappedActionFilter its own interface (#107960)"

This reverts commit 4dcf371208c6a633f4ab5c4a6aa8281a06127dee.
---
 .../action/support/MappedActionFilter.java    | 27 +------------------
 .../support/MappedActionFiltersTests.java     | 20 ++++++++++++++
 .../filtering/ApiFilteringActionFilter.java   |  5 ++++
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/server/src/main/java/org/elasticsearch/action/support/MappedActionFilter.java b/server/src/main/java/org/elasticsearch/action/support/MappedActionFilter.java
index deff2d371e633..82e1804716cbc 100644
--- a/server/src/main/java/org/elasticsearch/action/support/MappedActionFilter.java
+++ b/server/src/main/java/org/elasticsearch/action/support/MappedActionFilter.java
@@ -8,31 +8,6 @@
 
 package org.elasticsearch.action.support;
 
-import org.elasticsearch.action.ActionListener;
-import org.elasticsearch.action.ActionRequest;
-import org.elasticsearch.action.ActionResponse;
-import org.elasticsearch.tasks.Task;
-
-/**
- * An action filter that is run only for a single action.
- *
- * Note: This is an independent interface from {@link ActionFilter} so that it does not
- * have an order. The relative order of executed MappedActionFilter with the same action name
- * is undefined.
- */
-public interface MappedActionFilter {
-    /** Return the name of the action for which this filter should be run */
+public interface MappedActionFilter extends ActionFilter {
     String actionName();
-
-    /**
-     * Enables filtering the execution of an action on the request side, either by sending a response through the
-     * {@link ActionListener} or by continuing the execution through the given {@link ActionFilterChain chain}
-     */
-    <Request extends ActionRequest, Response extends ActionResponse> void apply(
-        Task task,
-        String action,
-        Request request,
-        ActionListener<Response> listener,
-        ActionFilterChain<Request, Response> chain
-    );
 }
diff --git a/server/src/test/java/org/elasticsearch/action/support/MappedActionFiltersTests.java b/server/src/test/java/org/elasticsearch/action/support/MappedActionFiltersTests.java
index e4a3a7ca01b73..7df0c1c40a6cc 100644
--- a/server/src/test/java/org/elasticsearch/action/support/MappedActionFiltersTests.java
+++ b/server/src/test/java/org/elasticsearch/action/support/MappedActionFiltersTests.java
@@ -59,6 +59,11 @@ public String actionName() {
                 return "dummyAction";
             }
 
+            @Override
+            public int order() {
+                return 0;
+            }
+
             @Override
             public <Request extends ActionRequest, Response extends ActionResponse> void apply(
                 Task task,
@@ -95,6 +100,11 @@ public String actionName() {
                 return "dummyAction";
             }
 
+            @Override
+            public int order() {
+                return 0;
+            }
+
             @Override
             public <Request extends ActionRequest, Response extends ActionResponse> void apply(
                 Task task,
@@ -113,6 +123,11 @@ public String actionName() {
                 return "dummyAction";
             }
 
+            @Override
+            public int order() {
+                return 0;
+            }
+
             @Override
             public <Request extends ActionRequest, Response extends ActionResponse> void apply(
                 Task task,
@@ -149,6 +164,11 @@ public String actionName() {
                 return "dummyAction";
             }
 
+            @Override
+            public int order() {
+                return 0;
+            }
+
             @Override
             public <Request extends ActionRequest, Response extends ActionResponse> void apply(
                 Task task,
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/api/filtering/ApiFilteringActionFilter.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/api/filtering/ApiFilteringActionFilter.java
index 509259ec147c0..dee076631d407 100644
--- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/api/filtering/ApiFilteringActionFilter.java
+++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/api/filtering/ApiFilteringActionFilter.java
@@ -31,6 +31,11 @@ protected ApiFilteringActionFilter(ThreadContext threadContext, String actionNam
         this.responseClass = responseClass;
     }
 
+    @Override
+    public int order() {
+        return 0;
+    }
+
     @Override
     public final String actionName() {
         return actionName;