refactoring to use builder and setting exclude value from semantic_text mapper

Author: Samiul-TheSoccerFan

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

@@ -301,8 +301,8 @@ public Builder ignoreAbove(int ignoreAbove) {
             return this;
         }
 
-        public Builder excludeFromFieldCaps(boolean excludeFromFieldCaps) {
-            this.excludeFromFieldCaps = excludeFromFieldCaps;
+        public Builder excludeFromFieldCaps(boolean value) {
+            this.excludeFromFieldCaps = value;
             return this;
         }
 
@@ -415,7 +415,8 @@ private KeywordFieldType buildFieldType(MapperBuilderContext context, FieldType
                 searchAnalyzer,
                 quoteAnalyzer,
                 this,
-                context.isSourceSynthetic()
+                context.isSourceSynthetic(),
+                excludeFromFieldCaps
             );
         }
 
@@ -456,7 +457,6 @@ public KeywordFieldMapper build(MapperBuilderContext context) {
             );
 
             KeywordFieldType keywordFieldType = buildFieldType(context, fieldtype);
-            keywordFieldType.setExcludeFromFieldCaps(excludeFromFieldCaps);
             return new KeywordFieldMapper(
                 leafName(),
                 fieldtype,
@@ -525,14 +525,37 @@ 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()
+                builder.meta.getValue(),
+                excludeFromFieldCaps
             );
             this.eagerGlobalOrdinals = builder.eagerGlobalOrdinals.getValue();
             this.normalizer = normalizer;

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

@@ -188,11 +188,6 @@ public static class Builder extends FieldMapper.Builder {
         final IndexVersion indexVersionCreated;
         private boolean excludeFromFieldCaps = false;
 
-        public Builder(String name, IndexVersion indexVersionCreated, boolean excludeFromFieldCaps) {
-            this(name, indexVersionCreated);
-            this.excludeFromFieldCaps = excludeFromFieldCaps;
-        }
-
         public Builder(String name, IndexVersion indexVersionCreated) {
             super(name);
             this.indexVersionCreated = indexVersionCreated;
@@ -306,6 +301,11 @@ 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(
@@ -316,9 +316,9 @@ public DenseVectorFieldMapper build(MapperBuilderContext context) {
                 indexed.getValue(),
                 similarity.getValue(),
                 indexOptions.getValue(),
-                meta.getValue()
+                meta.getValue(),
+                excludeFromFieldCaps
             );
-            denseVectorFieldType.setExcludeFromFieldCaps(this.excludeFromFieldCaps);
             // Validate again here because the dimensions or element type could have been set programmatically,
             // which affects index option validity
             validate();
@@ -2096,7 +2096,31 @@ public DenseVectorFieldType(
             IndexOptions indexOptions,
             Map<String, String> meta
         ) {
-            super(name, indexed, false, indexed == false, TextSearchInfo.NONE, 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);
             this.elementType = elementType;
             this.dims = dims;
             this.indexed = indexed;

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

@@ -79,16 +79,16 @@ public Builder(String name) {
             super(name);
         }
 
-        public Builder(String name, boolean excludeFromFieldCaps) {
-            super(name);
-            this.excludeFromFieldCaps = excludeFromFieldCaps;
-        }
-
         public Builder setStored(boolean value) {
             stored.setValue(value);
             return this;
         }
 
+        public Builder setExcludeFromFieldCaps(boolean value) {
+            excludeFromFieldCaps = value;
+            return this;
+        }
+
         @Override
         protected Parameter<?>[] getParameters() {
             return new Parameter<?>[] { stored, meta };
@@ -99,9 +99,9 @@ public SparseVectorFieldMapper build(MapperBuilderContext context) {
             SparseVectorFieldType sparseVectorFieldType = new SparseVectorFieldType(
                 context.buildFullName(leafName()),
                 stored.getValue(),
-                meta.getValue()
+                meta.getValue(),
+                excludeFromFieldCaps
             );
-            sparseVectorFieldType.setExcludeFromFieldCaps(excludeFromFieldCaps);
             return new SparseVectorFieldMapper(leafName(), sparseVectorFieldType, builderParams(this, context));
         }
     }
@@ -119,7 +119,11 @@ public SparseVectorFieldMapper build(MapperBuilderContext context) {
     public static final class SparseVectorFieldType extends MappedFieldType {
 
         public SparseVectorFieldType(String name, boolean isStored, Map<String, String> meta) {
-            super(name, true, isStored, false, TextSearchInfo.SIMPLE_MATCH_ONLY, 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);
         }
 
         @Override

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

@@ -107,21 +107,25 @@ 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 };
         }
 
         @Override
         public OffsetSourceFieldMapper build(MapperBuilderContext context) {
-            OffsetSourceFieldType fieldType = new OffsetSourceFieldType(context.buildFullName(leafName()), charset.get(), meta.getValue());
-            // explicitly setting the field type to be not available for field caps
-            fieldType.setExcludeFromFieldCaps(true);
+            OffsetSourceFieldType fieldType = new OffsetSourceFieldType(context.buildFullName(leafName()), charset.get(), meta.getValue(), this.excludeFromFieldCaps);
 
             return new OffsetSourceFieldMapper(leafName(), fieldType, builderParams(this, context));
         }
@@ -133,7 +137,11 @@ public static final class OffsetSourceFieldType extends MappedFieldType {
         private final CharsetFormat charset;
 
         public OffsetSourceFieldType(String name, CharsetFormat charset, Map<String, String> meta) {
-            super(name, true, false, false, TextSearchInfo.NONE, 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);
             this.charset = charset;
         }