revert back previous implementation changes

Author: Samiul-TheSoccerFan

modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/SearchAsYouTypeFieldMapper.java

@@ -564,11 +564,6 @@ public Builder getMergeBuilder() {
         protected String contentType() {
             return "shingle";
         }
-
-        @Override
-        public String toString() {
-            return fieldType().name();
-        }
     }
 
     /**
@@ -766,17 +761,6 @@ public Iterator<Mapper> sourcePathUsedBy() {
         return subfieldsAndMultifieldsIterator();
     }
 
-    @Override
-    public List<Mapper> getSourceMappers() {
-        List<Mapper> fields = new ArrayList<>();
-        fields.add(this);
-        for (Iterator<Mapper> it = subfieldsAndMultifieldsIterator(); it.hasNext();) {
-            Mapper mapper = it.next();
-            fields.addAll(mapper.getSourceMappers());
-        }
-        return fields;
-    }
-
     /**
      * An analyzer wrapper to add a shingle token filter, an edge ngram token filter or both to its wrapped analyzer. When adding an edge
      * ngrams token filter, it also adds a {@link TrailingShingleTokenFilter} to add extra position increments at the end of the stream

server/src/main/java/org/elasticsearch/index/mapper/FieldAliasMapper.java

@@ -16,7 +16,6 @@
 import java.io.IOException;
 import java.util.Collections;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
@@ -120,11 +119,6 @@ public int getTotalFieldsCount() {
         return 1;
     }
 
-    @Override
-    public List<Mapper> getSourceMappers() {
-        return List.of(this);
-    }
-
     public static class TypeParser implements Mapper.TypeParser {
         @Override
         public Mapper.Builder parse(String name, Map<String, Object> node, MappingParserContext parserContext)

server/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java

@@ -449,16 +449,6 @@ public int getTotalFieldsCount() {
         return sum;
     }
 
-    @Override
-    public List<Mapper> getSourceMappers() {
-        List<Mapper> fields = new ArrayList<>();
-        for (FieldMapper mapper : builderParams.multiFields.mappers) {
-            fields.addAll(mapper.getSourceMappers());
-        }
-        fields.add(this);
-        return fields;
-    }
-
     public Map<String, NamedAnalyzer> indexAnalyzers() {
         return Map.of();
     }

server/src/main/java/org/elasticsearch/index/mapper/Mapper.java

@@ -22,7 +22,6 @@
 
 import java.io.IOException;
 import java.util.Arrays;
-import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
@@ -228,6 +227,4 @@ public final boolean supportStoringArrayOffsets() {
     public String getOffsetFieldName() {
         return null;
     }
-
-    public abstract List<Mapper> getSourceMappers();
 }

server/src/main/java/org/elasticsearch/index/mapper/MapperService.java

@@ -281,10 +281,7 @@ public DocumentParser documentParser() {
         return this.documentParser;
     }
 
-    /**
-     * Returns a Map of all metadata mappers
-     */
-    public Map<Class<? extends MetadataFieldMapper>, MetadataFieldMapper> getMetadataMappers() {
+    Map<Class<? extends MetadataFieldMapper>, MetadataFieldMapper> getMetadataMappers() {
         final MappingParserContext mappingParserContext = parserContext();
         final DocumentMapper existingMapper = mapper;
         final Map<String, MetadataFieldMapper.TypeParser> metadataMapperParsers = mapperRegistry.getMetadataMapperParsers(

server/src/main/java/org/elasticsearch/index/mapper/ObjectMapper.java

@@ -268,15 +268,6 @@ public int getTotalFieldsCount() {
         return sum;
     }
 
-    @Override
-    public List<Mapper> getSourceMappers() {
-        List<Mapper> fields = new ArrayList<>();
-        for (Mapper mapper : mappers.values()) {
-            fields.addAll(mapper.getSourceMappers());
-        }
-        return fields;
-    }
-
     public static class TypeParser implements Mapper.TypeParser {
         @Override
         public boolean supportsVersion(IndexVersion indexCreatedVersion) {

server/src/main/java/org/elasticsearch/index/mapper/PassThroughObjectMapper.java

@@ -14,10 +14,8 @@
 import org.elasticsearch.xcontent.XContentBuilder;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
@@ -240,18 +238,4 @@ public static void checkForDuplicatePriorities(Collection<PassThroughObjectMappe
             }
         }
     }
-
-    @Override
-    public List<Mapper> getSourceMappers() {
-        List<Mapper> fields = new ArrayList<>();
-        fields.add(this);
-        for (Mapper mapper : mappers.values()) {
-            if (mapper instanceof FieldMapper fieldMapper) {
-                fields.add(fieldMapper);
-            } else if (mapper instanceof PassThroughObjectMapper passThroughObjectMapper) {
-                fields.addAll(passThroughObjectMapper.getSourceMappers());
-            }
-        }
-        return fields;
-    }
 }

server/src/main/java/org/elasticsearch/index/mapper/RootObjectMapper.java

@@ -210,7 +210,7 @@ public DynamicTemplate[] dynamicTemplates() {
         return dynamicTemplates.value();
     }
 
-    public Collection<RuntimeField> runtimeFields() {
+    Collection<RuntimeField> runtimeFields() {
         return runtimeFields.values();
     }
 

server/src/main/java/org/elasticsearch/index/query/SearchExecutionContext.java

@@ -389,10 +389,6 @@ public boolean isFieldMapped(String name) {
         return fieldType(name) != null;
     }
 
-    public List<FieldMapper> getMetadataFields() {
-        return new ArrayList<>(mapperService.getMetadataMappers().values());
-    }
-
     public boolean isMetadataField(String field) {
         return mapperService.isMetadataField(field);
     }

server/src/test/java/org/elasticsearch/index/query/SearchExecutionContextTests.java

@@ -98,6 +98,7 @@
 import java.util.stream.Collectors;
 
 import static java.util.Collections.singletonMap;
+import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.notNullValue;
@@ -425,6 +426,7 @@ public void testAllowedFields() {
         assertNotNull(context.getFieldType("runtime"));
         assertEquals(3, context.getMatchingFieldNames("runtime*").size());
         assertEquals(2, context.getMatchingFieldNames("*cat").size());
+        assertThat(getFieldNames(context.getAllFields()), containsInAnyOrder("pig", "cat", "runtimecat", "runtimedog", "runtime"));
 
         context.setAllowedFields(s -> true);
         assertNotNull(context.getFieldType("pig"));
@@ -439,6 +441,7 @@ public void testAllowedFields() {
         assertTrue(context.isFieldMapped("runtime"));
         assertEquals(3, context.getMatchingFieldNames("runtime*").size());
         assertEquals(2, context.getMatchingFieldNames("*cat").size());
+        assertThat(getFieldNames(context.getAllFields()), containsInAnyOrder("pig", "cat", "runtimecat", "runtimedog", "runtime"));
 
         context.setAllowedFields(s -> s.equals("cat"));
         assertNull(context.getFieldType("pig"));
@@ -453,6 +456,7 @@ public void testAllowedFields() {
         assertFalse(context.isFieldMapped("runtime"));
         assertEquals(0, context.getMatchingFieldNames("runtime*").size());
         assertEquals(1, context.getMatchingFieldNames("*cat").size());
+        assertThat(getFieldNames(context.getAllFields()), containsInAnyOrder("cat"));
 
         context.setAllowedFields(s -> s.contains("dog") == false);
         assertNotNull(context.getFieldType("pig"));
@@ -467,6 +471,7 @@ public void testAllowedFields() {
         assertTrue(context.isFieldMapped("runtime"));
         assertEquals(2, context.getMatchingFieldNames("runtime*").size());
         assertEquals(2, context.getMatchingFieldNames("*cat").size());
+        assertThat(getFieldNames(context.getAllFields()), containsInAnyOrder("pig", "cat", "runtimecat", "runtime"));
     }
 
     private static List<String> getFieldNames(Iterable<Map.Entry<String, MappedFieldType>> fields) {