cleanup

Author: martijnvg

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

@@ -47,7 +47,6 @@
 import org.elasticsearch.index.mapper.BlockStoredFieldsReader;
 import org.elasticsearch.index.mapper.DocumentParserContext;
 import org.elasticsearch.index.mapper.FieldMapper;
-import org.elasticsearch.index.mapper.KeywordFieldMapper;
 import org.elasticsearch.index.mapper.MapperBuilderContext;
 import org.elasticsearch.index.mapper.SourceValueFetcher;
 import org.elasticsearch.index.mapper.StringFieldType;
@@ -124,7 +123,7 @@ protected Parameter<?>[] getParameters() {
             return new Parameter<?>[] { meta };
         }
 
-        private MatchOnlyTextFieldType buildFieldType(MapperBuilderContext context, boolean storeSource) {
+        private MatchOnlyTextFieldType buildFieldType(MapperBuilderContext context) {
             NamedAnalyzer searchAnalyzer = analyzers.getSearchAnalyzer();
             NamedAnalyzer searchQuoteAnalyzer = analyzers.getSearchQuoteAnalyzer();
             NamedAnalyzer indexAnalyzer = analyzers.getIndexAnalyzer();
@@ -151,7 +150,7 @@ public MatchOnlyTextFieldMapper build(MapperBuilderContext context) {
             } else {
                 storeSource = context.isSourceSynthetic();
             }
-            MatchOnlyTextFieldType tft = buildFieldType(context, storeSource);
+            MatchOnlyTextFieldType tft = buildFieldType(context);
             return new MatchOnlyTextFieldMapper(leafName(), Defaults.FIELD_TYPE, tft, builderParams(this, context), storeSource, this);
         }
     }
@@ -535,15 +534,12 @@ protected void write(XContentBuilder b, Object value) throws IOException {
                 }
             );
         } else {
-            for (FieldMapper multiField : multiFields()) {
-                if (multiField instanceof KeywordFieldMapper kwd) {
-                    if (kwd.hasNormalizer() == false && (kwd.fieldType().hasDocValues() || kwd.fieldType().isStored())) {
-                        return new SyntheticSourceSupport.Native(() -> kwd.syntheticFieldLoader(fullPath(), leafName()));
-                    }
-                }
+            var kwd = TextFieldMapper.SyntheticSourceHelper.getKeywordFieldMapperForSyntheticSource(this);
+            if (kwd != null) {
+                return new SyntheticSourceSupport.Native(() -> kwd.syntheticFieldLoader(fullPath(), leafName()));
             }
             assert false : "there should be a suite field mapper with native synthetic source support";
-            return null;
+            return super.syntheticSourceSupport();
         }
     }
 }

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

@@ -1261,7 +1261,7 @@ public void doValidate(MappingLookup lookup) {
         }
     }
 
-    public boolean hasNormalizer() {
+    boolean hasNormalizer() {
         return normalizerName != null;
     }
 
@@ -1275,7 +1275,7 @@ private String originalName() {
     }
 
     @Override
-    public SyntheticSourceSupport syntheticSourceSupport() {
+    protected SyntheticSourceSupport syntheticSourceSupport() {
         if (hasNormalizer()) {
             // NOTE: no matter if we have doc values or not we use fallback synthetic source
             // to store the original value whose doc values would be altered by the normalizer