revert back all changes from MappedFieldtype and subclasses

Author: Samiul-TheSoccerFan

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

@@ -205,7 +205,6 @@ public static final class Builder extends FieldMapper.DimensionBuilder {
         private final IndexVersion indexCreatedVersion;
         private final boolean useDocValuesSkipper;
         private final SourceKeepMode indexSourceKeepMode;
-        private boolean excludeFromFieldCaps = false;
 
         public Builder(final String name, final MappingParserContext mappingParserContext) {
             this(
@@ -301,11 +300,6 @@ public Builder ignoreAbove(int ignoreAbove) {
             return this;
         }
 
-        public Builder excludeFromFieldCaps(boolean value) {
-            this.excludeFromFieldCaps = value;
-            return this;
-        }
-
         Builder normalizer(String normalizerName) {
             this.normalizer.setValue(normalizerName);
             return this;
@@ -415,8 +409,7 @@ private KeywordFieldType buildFieldType(MapperBuilderContext context, FieldType
                 searchAnalyzer,
                 quoteAnalyzer,
                 this,
-                context.isSourceSynthetic(),
-                excludeFromFieldCaps
+                context.isSourceSynthetic()
             );
         }
 
@@ -523,28 +516,14 @@ public KeywordFieldType(
             NamedAnalyzer quoteAnalyzer,
             Builder builder,
             boolean isSyntheticSource
-        ) {
-            this(name, fieldType, normalizer, searchAnalyzer, quoteAnalyzer, builder, isSyntheticSource, false);
-        }
-
-        public KeywordFieldType(
-            String name,
-            FieldType fieldType,
-            NamedAnalyzer normalizer,
-            NamedAnalyzer searchAnalyzer,
-            NamedAnalyzer quoteAnalyzer,
-            Builder builder,
-            boolean isSyntheticSource,
-            boolean excludeFromFieldCaps
         ) {
             super(
                 name,
                 fieldType.indexOptions() != IndexOptions.NONE && builder.indexCreatedVersion.isLegacyIndexVersion() == false,
                 fieldType.stored(),
                 builder.hasDocValues.getValue(),
                 textSearchInfo(fieldType, builder.similarity.getValue(), searchAnalyzer, quoteAnalyzer),
-                builder.meta.getValue(),
-                excludeFromFieldCaps
+                builder.meta.getValue()
             );
             this.eagerGlobalOrdinals = builder.eagerGlobalOrdinals.getValue();
             this.normalizer = normalizer;

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

@@ -68,7 +68,6 @@ public abstract class MappedFieldType {
     private final boolean isStored;
     private final TextSearchInfo textSearchInfo;
     private final Map<String, String> meta;
-    private final boolean excludeFromFieldCaps;
 
     public MappedFieldType(
         String name,
@@ -77,18 +76,6 @@ public MappedFieldType(
         boolean hasDocValues,
         TextSearchInfo textSearchInfo,
         Map<String, String> meta
-    ) {
-        this(name, isIndexed, isStored, hasDocValues, textSearchInfo, meta, false);
-    }
-
-    public MappedFieldType(
-        String name,
-        boolean isIndexed,
-        boolean isStored,
-        boolean hasDocValues,
-        TextSearchInfo textSearchInfo,
-        Map<String, String> meta,
-        boolean excludeFromFieldCaps
     ) {
         this.name = Mapper.internFieldName(name);
         this.isIndexed = isIndexed;
@@ -98,7 +85,6 @@ public MappedFieldType(
         // meta should be sorted but for the one item or empty case we can fall back to immutable maps to save some memory since order is
         // irrelevant
         this.meta = meta.size() <= 1 ? Map.copyOf(meta) : meta;
-        this.excludeFromFieldCaps = excludeFromFieldCaps;
     }
 
     /**
@@ -184,13 +170,6 @@ public final boolean isStored() {
         return isStored;
     }
 
-    /**
-     * @return true if the field should be excluded from field caps
-     */
-    public boolean excludeFromFieldCaps() {
-        return excludeFromFieldCaps;
-    }
-
     /**
      * If the field supports using the indexed data to speed up operations related to ordering of data, such as sorting or aggs, return
      * a function for doing that.  If it is unsupported for this field type, there is no need to override this method.

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

@@ -30,19 +30,7 @@ protected SimpleMappedFieldType(
         TextSearchInfo textSearchInfo,
         Map<String, String> meta
     ) {
-        this(name, isIndexed, isStored, hasDocValues, textSearchInfo, meta, false);
-    }
-
-    protected SimpleMappedFieldType(
-        String name,
-        boolean isIndexed,
-        boolean isStored,
-        boolean hasDocValues,
-        TextSearchInfo textSearchInfo,
-        Map<String, String> meta,
-        boolean excludeFromFieldCaps
-    ) {
-        super(name, isIndexed, isStored, hasDocValues, textSearchInfo, meta, excludeFromFieldCaps);
+        super(name, isIndexed, isStored, hasDocValues, textSearchInfo, meta);
     }
 
     @Override

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

@@ -51,19 +51,7 @@ public StringFieldType(
         TextSearchInfo textSearchInfo,
         Map<String, String> meta
     ) {
-        this(name, isIndexed, isStored, hasDocValues, textSearchInfo, meta, false);
-    }
-
-    public StringFieldType(
-        String name,
-        boolean isIndexed,
-        boolean isStored,
-        boolean hasDocValues,
-        TextSearchInfo textSearchInfo,
-        Map<String, String> meta,
-        boolean excludeFromFieldCaps
-    ) {
-        super(name, isIndexed, isStored, hasDocValues, textSearchInfo, meta, excludeFromFieldCaps);
+        super(name, isIndexed, isStored, hasDocValues, textSearchInfo, meta);
     }
 
     @Override

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

@@ -34,19 +34,7 @@ public TermBasedFieldType(
         TextSearchInfo textSearchInfo,
         Map<String, String> meta
     ) {
-        this(name, isIndexed, isStored, hasDocValues, textSearchInfo, meta, false);
-    }
-
-    public TermBasedFieldType(
-        String name,
-        boolean isIndexed,
-        boolean isStored,
-        boolean hasDocValues,
-        TextSearchInfo textSearchInfo,
-        Map<String, String> meta,
-        boolean excludeFromFieldCaps
-    ) {
-        super(name, isIndexed, isStored, hasDocValues, textSearchInfo, meta, excludeFromFieldCaps);
+        super(name, isIndexed, isStored, hasDocValues, textSearchInfo, meta);
     }
 
     /** Returns the indexed value used to construct search "values".

server/src/main/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapper.java

@@ -247,7 +247,6 @@ public static class Builder extends FieldMapper.Builder {
         private final Parameter<Map<String, String>> meta = Parameter.metaParam();
 
         final IndexVersion indexVersionCreated;
-        private boolean excludeFromFieldCaps = false;
 
         public Builder(String name, IndexVersion indexVersionCreated) {
             super(name);
@@ -362,11 +361,6 @@ public Builder indexOptions(IndexOptions indexOptions) {
             return this;
         }
 
-        public Builder excludeFromFieldCaps(boolean value) {
-            this.excludeFromFieldCaps = value;
-            return this;
-        }
-
         @Override
         public DenseVectorFieldMapper build(MapperBuilderContext context) {
             DenseVectorFieldType denseVectorFieldType = new DenseVectorFieldType(
@@ -377,8 +371,7 @@ public DenseVectorFieldMapper build(MapperBuilderContext context) {
                 indexed.getValue(),
                 similarity.getValue(),
                 indexOptions.getValue(),
-                meta.getValue(),
-                excludeFromFieldCaps
+                meta.getValue()
             );
             // Validate again here because the dimensions or element type could have been set programmatically,
             // which affects index option validity
@@ -2157,21 +2150,7 @@ public DenseVectorFieldType(
             IndexOptions indexOptions,
             Map<String, String> meta
         ) {
-            this(name, indexVersionCreated, elementType, dims, indexed, similarity, indexOptions, meta, false);
-        }
-
-        public DenseVectorFieldType(
-            String name,
-            IndexVersion indexVersionCreated,
-            ElementType elementType,
-            Integer dims,
-            boolean indexed,
-            VectorSimilarity similarity,
-            IndexOptions indexOptions,
-            Map<String, String> meta,
-            boolean excludeFromFieldCaps
-        ) {
-            super(name, indexed, false, indexed == false, TextSearchInfo.NONE, meta, excludeFromFieldCaps);
+            super(name, indexed, false, indexed == false, TextSearchInfo.NONE, meta);
             this.elementType = elementType;
             this.dims = dims;
             this.indexed = indexed;

server/src/main/java/org/elasticsearch/index/mapper/vectors/SparseVectorFieldMapper.java

@@ -73,7 +73,6 @@ private static SparseVectorFieldMapper toType(FieldMapper in) {
     public static class Builder extends FieldMapper.Builder {
         private final Parameter<Boolean> stored = Parameter.storeParam(m -> toType(m).fieldType().isStored(), false);
         private final Parameter<Map<String, String>> meta = Parameter.metaParam();
-        private boolean excludeFromFieldCaps = false;
 
         public Builder(String name) {
             super(name);
@@ -84,11 +83,6 @@ public Builder setStored(boolean value) {
             return this;
         }
 
-        public Builder excludeFromFieldCaps(boolean value) {
-            excludeFromFieldCaps = value;
-            return this;
-        }
-
         @Override
         protected Parameter<?>[] getParameters() {
             return new Parameter<?>[] { stored, meta };
@@ -99,8 +93,7 @@ public SparseVectorFieldMapper build(MapperBuilderContext context) {
             SparseVectorFieldType sparseVectorFieldType = new SparseVectorFieldType(
                 context.buildFullName(leafName()),
                 stored.getValue(),
-                meta.getValue(),
-                excludeFromFieldCaps
+                meta.getValue()
             );
             return new SparseVectorFieldMapper(leafName(), sparseVectorFieldType, builderParams(this, context));
         }
@@ -119,11 +112,7 @@ public SparseVectorFieldMapper build(MapperBuilderContext context) {
     public static final class SparseVectorFieldType extends MappedFieldType {
 
         public SparseVectorFieldType(String name, boolean isStored, Map<String, String> meta) {
-            this(name, isStored, meta, false);
-        }
-
-        public SparseVectorFieldType(String name, boolean isStored, Map<String, String> meta, boolean excludeFromFieldCaps) {
-            super(name, true, isStored, false, TextSearchInfo.SIMPLE_MATCH_ONLY, meta, excludeFromFieldCaps);
+            super(name, true, isStored, false, TextSearchInfo.SIMPLE_MATCH_ONLY, meta);
         }
 
         @Override

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/mapper/OffsetSourceFieldMapper.java

@@ -107,17 +107,11 @@ public static class Builder extends FieldMapper.Builder {
             CharsetFormat.class
         );
         private final Parameter<Map<String, String>> meta = Parameter.metaParam();
-        private boolean excludeFromFieldCaps = false;
 
         public Builder(String name) {
             super(name);
         }
 
-        public Builder excludeFromFieldCaps(boolean value) {
-            excludeFromFieldCaps = value;
-            return this;
-        }
-
         @Override
         protected Parameter<?>[] getParameters() {
             return new Parameter<?>[] { meta, charset };
@@ -128,8 +122,7 @@ public OffsetSourceFieldMapper build(MapperBuilderContext context) {
             OffsetSourceFieldType fieldType = new OffsetSourceFieldType(
                 context.buildFullName(leafName()),
                 charset.get(),
-                meta.getValue(),
-                this.excludeFromFieldCaps
+                meta.getValue()
             );
 
             return new OffsetSourceFieldMapper(leafName(), fieldType, builderParams(this, context));
@@ -142,11 +135,7 @@ public static final class OffsetSourceFieldType extends MappedFieldType {
         private final CharsetFormat charset;
 
         public OffsetSourceFieldType(String name, CharsetFormat charset, Map<String, String> meta) {
-            this(name, charset, meta, false);
-        }
-
-        public OffsetSourceFieldType(String name, CharsetFormat charset, Map<String, String> meta, boolean excludeFromFieldCaps) {
-            super(name, true, false, false, TextSearchInfo.NONE, meta, excludeFromFieldCaps);
+            super(name, true, false, false, TextSearchInfo.NONE, meta);
             this.charset = charset;
         }