Make MappedActionFilter its own interface (#108187) (#108210)

This commit reapplies the change from #107960

server/src/main/java/org/elasticsearch/action/ActionModule.java

@@ -800,13 +800,7 @@ public class ActionModule extends AbstractModule {
         List<ActionFilter> finalFilters = new ArrayList<>();
         List<MappedActionFilter> mappedFilters = new ArrayList<>();
         for (var plugin : actionPlugins) {
-            for (var filter : plugin.getActionFilters()) {
-                if (filter instanceof MappedActionFilter mappedFilter) {
-                    mappedFilters.add(mappedFilter);
-                } else {
-                    finalFilters.add(filter);
-                }
-            }
+            finalFilters.addAll(plugin.getActionFilters());
             mappedFilters.addAll(plugin.getMappedActionFilters());
         }
         if (mappedFilters.isEmpty() == false) {

server/src/main/java/org/elasticsearch/action/support/MappedActionFilter.java

@@ -8,6 +8,31 @@
 
 package org.elasticsearch.action.support;
 
-public interface MappedActionFilter extends ActionFilter {
+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 */
     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
+    );
 }

server/src/test/java/org/elasticsearch/action/support/MappedActionFiltersTests.java

@@ -59,11 +59,6 @@ public class MappedActionFiltersTests extends ESTestCase {
                 return "dummyAction";
             }
 
-            @Override
-            public int order() {
-                return 0;
-            }
-
             @Override
             public <Request extends ActionRequest, Response extends ActionResponse> void apply(
                 Task task,
@@ -100,11 +95,6 @@ public class MappedActionFiltersTests extends ESTestCase {
                 return "dummyAction";
             }
 
-            @Override
-            public int order() {
-                return 0;
-            }
-
             @Override
             public <Request extends ActionRequest, Response extends ActionResponse> void apply(
                 Task task,
@@ -123,11 +113,6 @@ public class MappedActionFiltersTests extends ESTestCase {
                 return "dummyAction";
             }
 
-            @Override
-            public int order() {
-                return 0;
-            }
-
             @Override
             public <Request extends ActionRequest, Response extends ActionResponse> void apply(
                 Task task,
@@ -164,11 +149,6 @@ public class MappedActionFiltersTests extends ESTestCase {
                 return "dummyAction";
             }
 
-            @Override
-            public int order() {
-                return 0;
-            }
-
             @Override
             public <Request extends ActionRequest, Response extends ActionResponse> void apply(
                 Task task,

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/api/filtering/ApiFilteringActionFilter.java

@@ -31,11 +31,6 @@ public abstract class ApiFilteringActionFilter<Res extends ActionResponse> imple
         this.responseClass = responseClass;
     }
 
-    @Override
-    public int order() {
-        return 0;
-    }
-
     @Override
     public final String actionName() {
         return actionName;

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/InferencePlugin.java

@@ -10,7 +10,7 @@ package org.elasticsearch.xpack.inference;
 import org.apache.lucene.util.SetOnce;
 import org.elasticsearch.action.ActionRequest;
 import org.elasticsearch.action.ActionResponse;
-import org.elasticsearch.action.support.ActionFilter;
+import org.elasticsearch.action.support.MappedActionFilter;
 import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
 import org.elasticsearch.cluster.node.DiscoveryNodes;
 import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
@@ -286,7 +286,7 @@ public class InferencePlugin extends Plugin implements ActionPlugin, ExtensibleP
     }
 
     @Override
-    public Collection<ActionFilter> getActionFilters() {
+    public Collection<MappedActionFilter> getMappedActionFilters() {
         if (SemanticTextFeature.isEnabled()) {
             return singletonList(shardBulkInferenceActionFilter.get());
         }

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/action/filter/ShardBulkInferenceActionFilter.java

@@ -81,12 +81,6 @@ public class ShardBulkInferenceActionFilter implements MappedActionFilter {
         this.batchSize = batchSize;
     }
 
-    @Override
-    public int order() {
-        // must execute last (after the security action filter)
-        return Integer.MAX_VALUE;
-    }
-
     @Override
     public String actionName() {
         return TransportShardBulkAction.ACTION_NAME;