small cleanup

Author: jimczi

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

@@ -402,7 +402,7 @@ public boolean isComplete() {
     }
 
     @Override
-    public void postParse(DocumentParserContext context) throws IOException {
+    public void preParse(DocumentParserContext context) throws IOException {
         BytesReference originalSource = context.sourceToParse().source();
         XContentType contentType = context.sourceToParse().getXContentType();
         final BytesReference adaptedSource = applyFilters(context, originalSource, contentType);
@@ -445,6 +445,10 @@ public BytesReference applyFilters(
         if (context != null
             && InferenceMetadataFieldsMapper.isEnabled(context.mappingLookup())
             && context.mappingLookup().inferenceFields().isEmpty() == false) {
+            /**
+             * Removes {@link InferenceMetadataFieldsMapper} content from _source.
+             * This content is re-generated at query time (if requested) using stored fields and doc values.
+             */
             String[] modExcludes = new String[excludes != null ? excludes.length + 1 : 1];
             if (excludes != null) {
                 System.arraycopy(excludes, 0, modExcludes, 0, excludes.length);

server/src/main/java/org/elasticsearch/search/SearchHit.java

@@ -517,7 +517,7 @@ public void addDocumentFields(Map<String, DocumentField> docFields, Map<String,
         this.metaFields.putAll(metaFields);
     }
 
-    public DocumentField removeMetadataFields(String field) {
+    public DocumentField removeDocumentField(String field) {
         return documentFields.remove(field);
     }
 

server/src/main/java/org/elasticsearch/search/fetch/subphase/FetchSourcePhase.java

@@ -94,7 +94,7 @@ private Source replaceInferenceMetadataFields(SearchHit hit, Source source) {
                     return source;
                 }
 
-                var field = hit.removeMetadataFields(InferenceMetadataFieldsMapper.NAME);
+                var field = hit.removeDocumentField(InferenceMetadataFieldsMapper.NAME);
                 if (field == null || field.getValues().isEmpty()) {
                     return source;
                 }

test/framework/src/main/java/org/elasticsearch/test/AbstractQueryTestCase.java

@@ -69,6 +69,7 @@
 import static org.hamcrest.Matchers.instanceOf;
 
 public abstract class AbstractQueryTestCase<QB extends AbstractQueryBuilder<QB>> extends AbstractBuilderTestCase {
+
     private static final int NUMBER_OF_TESTQUERIES = 20;
 
     public final QB createTestQueryBuilder() {

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/search/WeightedTokensQueryBuilderTests.java

@@ -75,7 +75,7 @@ private WeightedTokensQueryBuilder createTestQueryBuilder(boolean onlyScorePrune
 
     @Override
     protected Collection<Class<? extends Plugin>> getPlugins() {
-        return List.of(MapperExtrasPlugin.class, XPackClientPlugin.class);
+        return List.of(XPackClientPlugin.class, MapperExtrasPlugin.class);
     }
 
     @Override

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/highlight/SemanticTextHighlighterTests.java

@@ -26,7 +26,7 @@
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentHelper;
 import org.elasticsearch.index.IndexVersion;
-import org.elasticsearch.index.IndexVersions;
+import org.elasticsearch.index.mapper.InferenceMetadataFieldsMapper;
 import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.index.mapper.MapperServiceTestCase;
 import org.elasticsearch.index.mapper.SourceToParse;
@@ -46,7 +46,6 @@
 import org.elasticsearch.search.lookup.Source;
 import org.elasticsearch.search.rank.RankDoc;
 import org.elasticsearch.search.vectors.KnnVectorQueryBuilder;
-import org.elasticsearch.test.index.IndexVersionUtils;
 import org.elasticsearch.xcontent.XContentType;
 import org.elasticsearch.xpack.core.ml.search.SparseVectorQueryBuilder;
 import org.elasticsearch.xpack.core.ml.search.WeightedToken;
@@ -79,12 +78,6 @@ protected Collection<? extends Plugin> getPlugins() {
         return List.of(new InferencePlugin(Settings.EMPTY));
     }
 
-    @Override
-    protected IndexVersion getVersion() {
-        // TODO: Update once highlighter supports inference metadata fields
-        return IndexVersionUtils.getPreviousVersion(IndexVersions.INFERENCE_METADATA_FIELDS);
-    }
-
     @Override
     @Before
     public void setUp() throws Exception {
@@ -174,7 +167,8 @@ public void testSparseVector() throws Exception {
 
     private MapperService createDefaultMapperService() throws IOException {
         var mappings = Streams.readFully(SemanticTextHighlighterTests.class.getResourceAsStream("mappings.json"));
-        return createMapperService(mappings.utf8ToString());
+        var settings = Settings.builder().put(InferenceMetadataFieldsMapper.USE_LEGACY_SEMANTIC_TEXT_FORMAT.getKey(), true).build();
+        return createMapperService(settings, mappings.utf8ToString());
     }
 
     private float[] readDenseVector(Object value) {