fix conflict

elastic · Oct 27, 2021 · 3bbd2fe · 3bbd2fe
1 parent 7a28f1b
commit 3bbd2fe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/server/src/main/java/org/elasticsearch/index/IndexMode.java b/server/src/main/java/org/elasticsearch/index/IndexMode.java
@@ -117,8 +117,7 @@ public void completeMappings(MappingParserContext context, Map<String, Object> m
                         DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER,
                         context.scriptCompiler(),
                         DateFieldMapper.IGNORE_MALFORMED_SETTING.get(context.getSettings()),
-                        context.getIndexSettings().getIndexVersionCreated(),
-                        context.getIndexSettings().getIndex().getName()
+                        context.getIndexSettings().getIndexVersionCreated()
                     )
                 );
             }

diff --git a/server/src/main/java/org/elasticsearch/index/mapper/MappingParser.java b/server/src/main/java/org/elasticsearch/index/mapper/MappingParser.java
@@ -10,8 +10,8 @@
 
 import org.elasticsearch.common.compress.CompressedXContent;
 import org.elasticsearch.common.xcontent.XContentHelper;
-import org.elasticsearch.xcontent.XContentType;
 import org.elasticsearch.core.Nullable;
+import org.elasticsearch.xcontent.XContentType;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -94,8 +94,8 @@ Mapping parse(@Nullable String type, CompressedXContent source) throws MapperPar
 
     private Mapping parse(String type, Map<String, Object> mapping) throws MapperParsingException {
         MappingParserContext parserContext = parserContextSupplier.get();
-        RootObjectMapper rootObjectMapper
-            = rootObjectTypeParser.parse(type, mapping, parserContext).build(MapperBuilderContext.ROOT);
+        RootObjectMapper.Builder rootObjectMapperBuilder = rootObjectTypeParser.parse(type, mapping, parserContext);
+        parserContext.getIndexSettings().getMode().completeMappings(parserContext, mapping, rootObjectMapperBuilder);
 
         Map<Class<? extends MetadataFieldMapper>, MetadataFieldMapper> metadataMappers = metadataMappersSupplier.get();
         Map<String, Object> meta = null;
@@ -144,7 +144,7 @@ private Mapping parse(String type, Map<String, Object> mapping) throws MapperPar
         checkNoRemainingFields(mapping, "Root mapping definition has unsupported parameters: ");
 
         return new Mapping(
-            rootObjectMapper,
+            rootObjectMapperBuilder.build(MapperBuilderContext.ROOT),
             metadataMappers.values().toArray(new MetadataFieldMapper[0]),
             meta);
     }