Add back filtering for actual getFieldFilter() overriding

carlosdelest · Dec 11, 2023 · fd83fe9 · fd83fe9
1 parent d7d8d5e
commit fd83fe9
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/...lugin/core/src/test/java/org/elasticsearch/xpack/core/LocalStateCompositeXPackPlugin.java b/...lugin/core/src/test/java/org/elasticsearch/xpack/core/LocalStateCompositeXPackPlugin.java
@@ -448,8 +448,10 @@ public void onIndexModule(IndexModule indexModule) {
 
     @Override
     public Function<String, Predicate<String>> getFieldFilter() {
-        List<Function<String, Predicate<String>>> items = filterPlugins(MapperPlugin.class).stream().map(p -> p.getFieldFilter()).toList();
-        if (items.size() > 1) {
+        List<Function<String, Predicate<String>>> items = filterPlugins(MapperPlugin.class).stream()
+            .map(p -> p.getFieldFilter())
+            .filter(p -> p.equals(NOOP_FIELD_FILTER) == false)
+            .toList();        if (items.size() > 1) {
             throw new UnsupportedOperationException("Only the security MapperPlugin should override this");
         } else if (items.size() == 1) {
             return items.get(0);