Reverted merge flip

Author: Kubik42

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

@@ -734,7 +734,8 @@ protected void writeValue(Object value, XContentBuilder b) throws IOException {
         var kwd = TextFieldMapper.SyntheticSourceHelper.getKeywordFieldMapperForSyntheticSource(this);
         if (kwd != null) {
             // merge the two field loaders into one
-            return kwd.syntheticFieldLoader(fullPath(), leafName()).mergedWith(fieldLoader);
+            var kwdFieldLoader = kwd.syntheticFieldLoader(fullPath(), leafName());
+            return fieldLoader.mergedWith(kwdFieldLoader);
         }
 
         return fieldLoader;

modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/match_only_text/10_basic.yml

@@ -689,8 +689,8 @@ synthetic_source match_only_text with ignored multi-field and multiple values in
               foo: this value is
 
   - match: { "hits.total.value": 1 }
-  - match: { hits.hits.0._source.foo.0: "This value is too long and will be ignored" }
-  - match: { hits.hits.0._source.foo.1: "This value is short" }
+  - match: { hits.hits.0._source.foo.0: "This value is short" }
+  - match: { hits.hits.0._source.foo.1: "This value is too long and will be ignored" }
 
 ---
 synthetic_source match_only_text with stored multi-field:

plugins/mapper-annotated-text/src/main/java/org/elasticsearch/index/mapper/annotatedtext/AnnotatedTextFieldMapper.java

@@ -621,7 +621,8 @@ protected void writeValue(Object value, XContentBuilder b) throws IOException {
         var kwd = TextFieldMapper.SyntheticSourceHelper.getKeywordFieldMapperForSyntheticSource(this);
         if (kwd != null) {
             // merge the two field loaders into one
-            return kwd.syntheticFieldLoader(fullPath(), leafName()).mergedWith(fieldLoader);
+            var kwdFieldLoader = kwd.syntheticFieldLoader(fullPath(), leafName());
+            return fieldLoader.mergedWith(kwdFieldLoader);
         }
 
         return fieldLoader;

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/mapping/20_synthetic_source.yml

@@ -161,5 +161,5 @@ synthetic_source text with ignored multi-field and multiple values in the same d
               foo: this value is
 
   - match: { "hits.total.value": 1 }
-  - match: { hits.hits.0._source.foo: "This value is too long and will be ignored" }
-  - match: { hits.hits.0._source.foo: "This value is short" }
+  - match: { hits.hits.0._source.foo.0: "This value is short" }
+  - match: { hits.hits.0._source.foo.1: "This value is too long and will be ignored" }

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

@@ -1636,7 +1636,8 @@ protected void writeValue(Object value, XContentBuilder b) throws IOException {
         var kwd = TextFieldMapper.SyntheticSourceHelper.getKeywordFieldMapperForSyntheticSource(this);
         if (kwd != null) {
             // merge the two field loaders into one
-            return kwd.syntheticFieldLoader(fullPath(), leafName()).mergedWith(fieldLoader);
+            var kwdFieldLoader = kwd.syntheticFieldLoader(fullPath(), leafName());
+            return fieldLoader.mergedWith(kwdFieldLoader);
         }
 
         return fieldLoader;