Changes

Author: Tim-Brooks

server/src/main/java/org/elasticsearch/action/index/IndexRequest.java

@@ -952,7 +952,13 @@ public Index getConcreteWriteIndex(IndexAbstraction ia, ProjectMetadata project)
 
     @Override
     public int route(IndexRouting indexRouting) {
-        return indexRouting.indexShard(id, routing, contentType, source());
+        // TODO: avoid materializing the source atm when not using extract from source. Extract from source can be changed to use structured
+        // source.
+        if (indexRouting instanceof IndexRouting.ExtractFromSource) {
+            return indexRouting.indexShard(id, routing, contentType, source());
+        } else {
+            return indexRouting.indexShard(id, routing, contentType, null);
+        }
     }
 
     public IndexRequest setRequireAlias(boolean requireAlias) {

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

@@ -28,12 +28,15 @@
 import org.elasticsearch.plugins.internal.XContentMeteringParserDecorator;
 import org.elasticsearch.search.lookup.SearchLookup;
 import org.elasticsearch.search.lookup.Source;
+import org.elasticsearch.xcontent.DeprecationHandler;
+import org.elasticsearch.xcontent.NamedXContentRegistry;
 import org.elasticsearch.xcontent.XContentBuilder;
 import org.elasticsearch.xcontent.XContentLocation;
 import org.elasticsearch.xcontent.XContentParseException;
 import org.elasticsearch.xcontent.XContentParser;
 import org.elasticsearch.xcontent.XContentParserConfiguration;
 import org.elasticsearch.xcontent.XContentType;
+import org.elasticsearch.xcontent.support.MapXContentParser;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -128,9 +131,11 @@ private XContentParser getParser(SourceToParse source, @Nullable Map<String, Obj
                 xContentType
             );
         } else {
-            return XContentHelper.mapToXContentParser(
-                parserConfiguration.withIncludeSourceOnError(source.getIncludeSourceOnError()),
-                structuredSource
+            return new MapXContentParser(
+                NamedXContentRegistry.EMPTY,
+                DeprecationHandler.IGNORE_DEPRECATIONS,
+                structuredSource,
+                xContentType
             );
         }
     }