Removed TextFamilyFieldType in favor of StringFieldType

Author: Kubik42

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

@@ -53,6 +53,7 @@
 import org.elasticsearch.index.mapper.MapperBuilderContext;
 import org.elasticsearch.index.mapper.SourceLoader;
 import org.elasticsearch.index.mapper.SourceValueFetcher;
+import org.elasticsearch.index.mapper.StringFieldType;
 import org.elasticsearch.index.mapper.TextFamilyFieldMapper;
 import org.elasticsearch.index.mapper.TextFieldMapper;
 import org.elasticsearch.index.mapper.TextFieldMapper.TextFieldType;
@@ -189,7 +190,7 @@ private static boolean isSyntheticSourceStoredFieldInBinaryFormat(IndexVersion i
         )
     );
 
-    public static class MatchOnlyTextFieldType extends TextFamilyFieldType {
+    public static class MatchOnlyTextFieldType extends StringFieldType {
 
         private final Analyzer indexAnalyzer;
         private final TextFieldType textFieldType;

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

@@ -550,7 +550,7 @@ private static boolean indexSortConfigByHostName(final IndexSortConfig indexSort
 
     public static final TypeParser PARSER = createTypeParserWithLegacySupport(Builder::new);
 
-    public static final class KeywordFieldType extends TextFamilyFieldMapper.TextFamilyFieldType {
+    public static final class KeywordFieldType extends StringFieldType {
 
         private final int ignoreAbove;
         private final String nullValue;

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

@@ -43,15 +43,34 @@ public abstract class StringFieldType extends TermBasedFieldType {
 
     private static final Pattern WILDCARD_PATTERN = Pattern.compile("(\\\\.)|([?*]+)");
 
+    // using Boolean instead of boolean is deliberate as not all children of this class care about these two fields
+    protected final Boolean isSyntheticSourceEnabled;
+    protected final Boolean isWithinMultiField;
+
     public StringFieldType(
         String name,
         boolean isIndexed,
         boolean isStored,
         boolean hasDocValues,
         TextSearchInfo textSearchInfo,
         Map<String, String> meta
+    ) {
+        this(name, isIndexed, isStored, hasDocValues, textSearchInfo, meta, null, null);
+    }
+
+    public StringFieldType(
+        String name,
+        boolean isIndexed,
+        boolean isStored,
+        boolean hasDocValues,
+        TextSearchInfo textSearchInfo,
+        Map<String, String> meta,
+        Boolean isSyntheticSourceEnabled,
+        Boolean isWithinMultiField
     ) {
         super(name, isIndexed, isStored, hasDocValues, textSearchInfo, meta);
+        this.isSyntheticSourceEnabled = isSyntheticSourceEnabled;
+        this.isWithinMultiField = isWithinMultiField;
     }
 
     @Override
@@ -224,4 +243,12 @@ public Query rangeQuery(
             includeUpper
         );
     }
+
+    /**
+     * Returns the name of the "fallback" field that can be used for synthetic source when the "main" field was not
+     * stored for whatever reason.
+     */
+    public String syntheticSourceFallbackFieldName() {
+        return isSyntheticSourceEnabled ? name() + "._original" : null;
+    }
 }

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

@@ -12,8 +12,6 @@
 import org.elasticsearch.index.IndexVersion;
 import org.elasticsearch.index.IndexVersions;
 
-import java.util.Map;
-
 /**
  * This class is meant to contain common functionality that is needed by the Text family of field mappers. Namely
  * {@link TextFieldMapper} and anything strongly related to it.
@@ -58,34 +56,4 @@ private boolean multiFieldsNotStoredByDefaultIndexVersionCheck() {
             );
     }
 
-    public abstract static class TextFamilyFieldType extends StringFieldType {
-
-        protected final boolean isSyntheticSourceEnabled;
-        protected final boolean isWithinMultiField;
-
-        public TextFamilyFieldType(
-            String name,
-            boolean isIndexed,
-            boolean isStored,
-            boolean hasDocValues,
-            TextSearchInfo textSearchInfo,
-            Map<String, String> meta,
-            boolean isSyntheticSourceEnabled,
-            boolean isWithinMultiField
-        ) {
-            super(name, isIndexed, isStored, hasDocValues, textSearchInfo, meta);
-            this.isSyntheticSourceEnabled = isSyntheticSourceEnabled;
-            this.isWithinMultiField = isWithinMultiField;
-        }
-
-        /**
-         * Returns the name of the "fallback" field that can be used for synthetic source when the "main" field was not
-         * stored for whatever reason.
-         */
-        public String syntheticSourceFallbackFieldName() {
-            return isSyntheticSourceEnabled ? name() + "._original" : null;
-        }
-
-    }
-
 }

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

@@ -668,7 +668,7 @@ private static final class SubFieldInfo {
 
     }
 
-    public static class TextFieldType extends TextFamilyFieldType {
+    public static class TextFieldType extends StringFieldType {
 
         private boolean fielddata;
         private FielddataFrequencyFilter filter;

x-pack/plugin/logsdb/src/main/java/org/elasticsearch/xpack/logsdb/patternedtext/PatternedTextFieldType.java

@@ -73,7 +73,7 @@ public class PatternedTextFieldType extends StringFieldType {
     ) {
         // Though this type is based on doc_values, hasDocValues is set to false as the patterned_text type is not aggregatable.
         // This does not stop its child .template type from being aggregatable.
-        super(name, true, false, false, tsi, meta);
+        super(name, true, false, false, tsi, meta, isSyntheticSource, isWithinMultiField);
         this.indexAnalyzer = Objects.requireNonNull(indexAnalyzer);
         this.textFieldType = new TextFieldMapper.TextFieldType(name, isSyntheticSource, isWithinMultiField);
     }