2020package org .elasticsearch .indices .mapper ;
2121
2222import org .elasticsearch .Version ;
23- import org .elasticsearch .index .mapper .AllFieldMapper ;
2423import org .elasticsearch .index .mapper .Mapper ;
2524import org .elasticsearch .index .mapper .MetadataFieldMapper ;
2625import org .elasticsearch .plugins .MapperPlugin ;
@@ -38,19 +37,13 @@ public final class MapperRegistry {
3837
3938 private final Map <String , Mapper .TypeParser > mapperParsers ;
4039 private final Map <String , MetadataFieldMapper .TypeParser > metadataMapperParsers ;
41- private final Map <String , MetadataFieldMapper .TypeParser > metadataMapperParsers6x ;
4240 private final Function <String , Predicate <String >> fieldFilter ;
4341
4442
4543 public MapperRegistry (Map <String , Mapper .TypeParser > mapperParsers ,
4644 Map <String , MetadataFieldMapper .TypeParser > metadataMapperParsers , Function <String , Predicate <String >> fieldFilter ) {
4745 this .mapperParsers = Collections .unmodifiableMap (new LinkedHashMap <>(mapperParsers ));
4846 this .metadataMapperParsers = Collections .unmodifiableMap (new LinkedHashMap <>(metadataMapperParsers ));
49- // add the _all field mapper for indices created in 6x
50- Map <String , MetadataFieldMapper .TypeParser > metadata6x = new LinkedHashMap <>();
51- metadata6x .put (AllFieldMapper .NAME , new AllFieldMapper .TypeParser ());
52- metadata6x .putAll (metadataMapperParsers );
53- this .metadataMapperParsers6x = Collections .unmodifiableMap (metadata6x );
5447 this .fieldFilter = fieldFilter ;
5548 }
5649
@@ -67,7 +60,7 @@ public Map<String, Mapper.TypeParser> getMapperParsers() {
6760 * returned map uses the name of the field as a key.
6861 */
6962 public Map <String , MetadataFieldMapper .TypeParser > getMetadataMapperParsers (Version indexCreatedVersion ) {
70- return indexCreatedVersion . onOrAfter ( Version . V_7_0_0 ) ? metadataMapperParsers : metadataMapperParsers6x ;
63+ return metadataMapperParsers ;
7164 }
7265
7366 /**
0 commit comments