Fix merge from main

carlosdelest · Dec 11, 2023 · d7d8d5e · d7d8d5e
1 parent 07613ae
commit d7d8d5e
Showing 1 changed file with 1 addition and 4 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,10 +448,7 @@ 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())
-            .filter(p -> p.equals(NOOP_FIELD_FILTER) == false)
-            .toList();
+        List<Function<String, Predicate<String>>> items = filterPlugins(MapperPlugin.class).stream().map(p -> p.getFieldFilter()).toList();
         if (items.size() > 1) {
             throw new UnsupportedOperationException("Only the security MapperPlugin should override this");
         } else if (items.size() == 1) {