Cleaned up

Author: Kubik42

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

@@ -100,7 +100,7 @@ public static class Defaults {
 
     }
 
-    public static class Builder extends BuilderWithSyntheticSourceSupport {
+    public static class Builder extends BuilderWithSyntheticSourceContext {
 
         private final Parameter<Map<String, String>> meta = Parameter.metaParam();
 

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

@@ -81,7 +81,7 @@ private static NamedAnalyzer wrapAnalyzer(NamedAnalyzer in) {
         );
     }
 
-    public static class Builder extends BuilderWithSyntheticSourceSupport {
+    public static class Builder extends BuilderWithSyntheticSourceContext {
 
         final Parameter<SimilarityProvider> similarity = TextParams.similarity(m -> builder(m).similarity.getValue());
         final Parameter<String> indexOptions = TextParams.textIndexOptions(m -> builder(m).indexOptions.getValue());
@@ -107,14 +107,12 @@ public Builder(
                 m -> builder(m).analyzers.positionIncrementGap.getValue(),
                 indexCreatedVersion
             );
-            this.store = Parameter.storeParam(m -> builder(m).store.getValue(), this::storeDefault);
-        }
-
-        private boolean storeDefault() {
-            if (TextFieldMapper.keywordMultiFieldsNotStoredWhenIgnoredIndexVersionCheck(indexCreatedVersion())) {
-                return false;
-            }
-            return isSyntheticSourceEnabled() && multiFieldsBuilder.hasSyntheticSourceCompatibleKeywordField() == false;
+            this.store = Parameter.storeParam(m -> builder(m).store.getValue(), () -> {
+                if (TextFieldMapper.keywordMultiFieldsNotStoredWhenIgnoredIndexVersionCheck(indexCreatedVersion())) {
+                    return false;
+                }
+                return isSyntheticSourceEnabled() && multiFieldsBuilder.hasSyntheticSourceCompatibleKeywordField() == false;
+            });
         }
 
         @Override

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

@@ -1663,13 +1663,13 @@ protected boolean inheritDimensionParameterFromParentObject(MapperBuilderContext
     /**
      * Creates mappers for fields that require additional context for supporting synthetic source.
      */
-    public abstract static class BuilderWithSyntheticSourceSupport extends Builder {
+    public abstract static class BuilderWithSyntheticSourceContext extends Builder {
 
         private final IndexVersion indexCreatedVersion;
         private final boolean isSyntheticSourceEnabled;
         private final boolean isWithinMultiField;
 
-        protected BuilderWithSyntheticSourceSupport(
+        protected BuilderWithSyntheticSourceContext(
             String name,
             IndexVersion indexCreatedVersion,
             boolean isSyntheticSourceEnabled,

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

@@ -11,6 +11,9 @@
 
 import java.util.Map;
 
+/**
+ * This is a quality of life class that adds synthetic source context for text fields that need it.
+ */
 public abstract class TextFamilyFieldType extends StringFieldType {
 
     private final boolean isSyntheticSourceEnabled;

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

@@ -237,7 +237,7 @@ private static FielddataFrequencyFilter parseFrequencyFilter(String name, Mappin
         return new FielddataFrequencyFilter(minFrequency, maxFrequency, minSegmentSize);
     }
 
-    public static class Builder extends BuilderWithSyntheticSourceSupport {
+    public static class Builder extends BuilderWithSyntheticSourceContext {
 
         private final Parameter<Boolean> store;
         private final Parameter<Boolean> norms;

x-pack/plugin/logsdb/src/main/java/org/elasticsearch/xpack/logsdb/patterntext/PatternTextFieldMapper.java

@@ -30,9 +30,9 @@
 import org.elasticsearch.index.mapper.MapperBuilderContext;
 import org.elasticsearch.index.mapper.MapperParsingException;
 import org.elasticsearch.index.mapper.MappingParserContext;
+import org.elasticsearch.index.mapper.SourceFieldMapper;
 import org.elasticsearch.index.mapper.SourceLoader;
 import org.elasticsearch.index.mapper.StringStoredFieldFieldLoader;
-import org.elasticsearch.index.mapper.SourceFieldMapper;
 import org.elasticsearch.index.mapper.TextParams;
 import org.elasticsearch.index.mapper.TextSearchInfo;
 import org.elasticsearch.xcontent.XContentBuilder;
@@ -90,7 +90,7 @@ public static class Defaults {
         }
     }
 
-    public static class Builder extends BuilderWithSyntheticSourceSupport {
+    public static class Builder extends BuilderWithSyntheticSourceContext {
 
         private final IndexSettings indexSettings;
         private final Parameter<Map<String, String>> meta = Parameter.metaParam();
@@ -133,9 +133,9 @@ private PatternTextFieldType buildFieldType(FieldType fieldType, MapperBuilderCo
                 context.buildFullName(leafName()),
                 tsi,
                 analyzer,
-                context.isSourceSynthetic(),
                 disableTemplating.getValue(),
                 meta.getValue(),
+                context.isSourceSynthetic(),
                 isWithinMultiField()
             );
         }
@@ -251,7 +251,13 @@ public Map<String, NamedAnalyzer> indexAnalyzers() {
 
     @Override
     public FieldMapper.Builder getMergeBuilder() {
-        return new Builder(leafName(), indexCreatedVersion, indexSettings, fieldType().isSyntheticSourceEnabled(), fieldType().isWithinMultiField()).init(this);
+        return new Builder(
+            leafName(),
+            indexCreatedVersion,
+            indexSettings,
+            fieldType().isSyntheticSourceEnabled(),
+            fieldType().isWithinMultiField()
+        ).init(this);
     }
 
     @Override

x-pack/plugin/logsdb/src/main/java/org/elasticsearch/xpack/logsdb/patterntext/PatternTextFieldType.java

@@ -31,8 +31,6 @@
 import org.elasticsearch.index.fieldvisitor.StoredFieldLoader;
 import org.elasticsearch.index.mapper.BlockLoader;
 import org.elasticsearch.index.mapper.BlockStoredFieldsReader;
-import org.elasticsearch.index.mapper.StringFieldType;
-import org.elasticsearch.index.mapper.SourceValueFetcher;
 import org.elasticsearch.index.mapper.TextFamilyFieldType;
 import org.elasticsearch.index.mapper.TextFieldMapper;
 import org.elasticsearch.index.mapper.TextSearchInfo;
@@ -68,7 +66,7 @@ public class PatternTextFieldType extends TextFamilyFieldType {
 
     private final boolean disableTemplating;
 
-    PatternedTextFieldType(
+    PatternTextFieldType(
         String name,
         TextSearchInfo tsi,
         Analyzer indexAnalyzer,