rename

rjernst · Sep 14, 2023 · bd8d567 · bd8d567
1 parent a499edc
commit bd8d567
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/server/src/main/java/module-info.java b/server/src/main/java/module-info.java
@@ -7,6 +7,7 @@
  */
 
 import org.elasticsearch.index.codec.tsdb.ES87TSDBDocValuesFormat;
+import org.elasticsearch.plugins.internal.RestExtension;
 
 /** The Elasticsearch Server Module. */
 module org.elasticsearch.server {
@@ -393,7 +394,7 @@
     uses org.elasticsearch.internal.VersionExtension;
     uses org.elasticsearch.internal.BuildExtension;
     uses org.elasticsearch.plugins.internal.SettingsExtension;
-    uses org.elasticsearch.plugins.internal.CatExtension;
+    uses RestExtension;
 
     provides org.apache.lucene.codecs.PostingsFormat
         with

diff --git a/server/src/main/java/org/elasticsearch/action/ActionModule.java b/server/src/main/java/org/elasticsearch/action/ActionModule.java
@@ -306,7 +306,7 @@
 import org.elasticsearch.plugins.ActionPlugin;
 import org.elasticsearch.plugins.ActionPlugin.ActionHandler;
 import org.elasticsearch.plugins.interceptor.RestServerActionPlugin;
-import org.elasticsearch.plugins.internal.CatExtension;
+import org.elasticsearch.plugins.internal.RestExtension;
 import org.elasticsearch.reservedstate.ReservedClusterStateHandler;
 import org.elasticsearch.reservedstate.service.ReservedClusterStateService;
 import org.elasticsearch.rest.RestController;
@@ -851,7 +851,13 @@ private static ActionFilters setupActionFilters(List<ActionPlugin> actionPlugins
 
     public void initRestHandlers(Supplier<DiscoveryNodes> nodesInCluster) {
         List<AbstractCatAction> catActions = new ArrayList<>();
-        Predicate<AbstractCatAction> catActionsFilter = CatExtension.load(a -> true).getCatActionsFilter();
+        var restExtension = RestExtension.load(() -> new RestExtension() {
+            @Override
+            public Predicate<AbstractCatAction> getCatActionsFilter() {
+                return action -> true;
+            }
+        });
+        Predicate<AbstractCatAction> catActionsFilter = restExtension.getCatActionsFilter();
         Consumer<RestHandler> registerHandler = handler -> {
             if (shouldKeepRestHandler(handler)) {
                 if (handler instanceof AbstractCatAction catAction && catActionsFilter.test(catAction)) {

diff --git a/...search/plugins/internal/CatExtension.java → ...earch/plugins/internal/RestExtension.java b/...search/plugins/internal/CatExtension.java → ...earch/plugins/internal/RestExtension.java
@@ -12,8 +12,9 @@
 
 import java.util.ServiceLoader;
 import java.util.function.Predicate;
+import java.util.function.Supplier;
 
-public interface CatExtension {
+public interface RestExtension {
     /**
      * Returns a filter that determines which cat actions are exposed in /_cat.
      *
@@ -22,16 +23,13 @@ public interface CatExtension {
      */
     Predicate<AbstractCatAction> getCatActionsFilter();
 
-    /**
-     * Loads a CatExtension.
-     */
-    static CatExtension load(Predicate<AbstractCatAction> defaultFilter) {
-        var loader = ServiceLoader.load(CatExtension.class);
+    static RestExtension load(Supplier<RestExtension> fallback) {
+        var loader = ServiceLoader.load(RestExtension.class);
         var extensions = loader.stream().toList();
         if (extensions.size() > 1) {
-            throw new IllegalStateException("More than one cat extension found");
+            throw new IllegalStateException("More than one rest extension found");
         } else if (extensions.size() == 0) {
-            return () -> defaultFilter;
+            return fallback.get();
         }
         return extensions.get(0).get();
     }