Adding more restrictive checks on yaml tests and few refactoring

Author: Samiul-TheSoccerFan

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

@@ -455,12 +455,10 @@ public KeywordFieldMapper build(MapperBuilderContext context) {
                 indexCreatedVersion,
                 IndexVersions.SYNTHETIC_SOURCE_STORE_ARRAYS_NATIVELY_KEYWORD
             );
-
-            KeywordFieldType keywordFieldType = buildFieldType(context, fieldtype);
             return new KeywordFieldMapper(
                 leafName(),
                 fieldtype,
-                keywordFieldType,
+                buildFieldType(context, fieldtype),
                 builderParams(this, context),
                 context.isSourceSynthetic(),
                 useDocValuesSkipper,

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

@@ -185,7 +185,7 @@ public final boolean isStored() {
     }
 
     /**
-     * @return true if fieldType is subfields of semantic_text type
+     * @return true if the field should be excluded from field caps
      */
     public boolean excludeFromFieldCaps() {
         return excludeFromFieldCaps;

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

@@ -84,7 +84,7 @@ public Builder setStored(boolean value) {
             return this;
         }
 
-        public Builder setExcludeFromFieldCaps(boolean value) {
+        public Builder excludeFromFieldCaps(boolean value) {
             excludeFromFieldCaps = value;
             return this;
         }

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

@@ -15,7 +15,7 @@
 
 import java.util.Set;
 
-import static org.elasticsearch.xpack.inference.mapper.SemanticTextFieldMapper.SEMANTIC_TEXT_SUB_FIELDS_EXCLUDE_FROM_FIELD_CAPS;
+import static org.elasticsearch.xpack.inference.mapper.SemanticTextFieldMapper.SEMANTIC_TEXT_EXCLUDE_SUB_FIELDS_FROM_FIELD_CAPS;
 import static org.elasticsearch.xpack.inference.mapper.SemanticTextFieldMapper.SEMANTIC_TEXT_SUPPORT_CHUNKING_CONFIG;
 import static org.elasticsearch.xpack.inference.queries.SemanticKnnVectorQueryRewriteInterceptor.SEMANTIC_KNN_FILTER_FIX;
 import static org.elasticsearch.xpack.inference.queries.SemanticKnnVectorQueryRewriteInterceptor.SEMANTIC_KNN_VECTOR_QUERY_REWRITE_INTERCEPTION_SUPPORTED;
@@ -59,7 +59,7 @@ public Set<NodeFeature> getTestFeatures() {
             SemanticTextFieldMapper.SEMANTIC_TEXT_HANDLE_EMPTY_INPUT,
             TEST_RULE_RETRIEVER_WITH_INDICES_THAT_DONT_RETURN_RANK_DOCS,
             SEMANTIC_TEXT_SUPPORT_CHUNKING_CONFIG,
-            SEMANTIC_TEXT_SUB_FIELDS_EXCLUDE_FROM_FIELD_CAPS
+            SEMANTIC_TEXT_EXCLUDE_SUB_FIELDS_FROM_FIELD_CAPS
         );
     }
 }

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

@@ -134,7 +134,7 @@ public class SemanticTextFieldMapper extends FieldMapper implements InferenceFie
     public static final NodeFeature SEMANTIC_TEXT_SKIP_INFERENCE_FIELDS = new NodeFeature("semantic_text.skip_inference_fields");
     public static final NodeFeature SEMANTIC_TEXT_BIT_VECTOR_SUPPORT = new NodeFeature("semantic_text.bit_vector_support");
     public static final NodeFeature SEMANTIC_TEXT_SUPPORT_CHUNKING_CONFIG = new NodeFeature("semantic_text.support_chunking_config");
-    public static final NodeFeature SEMANTIC_TEXT_SUB_FIELDS_EXCLUDE_FROM_FIELD_CAPS = new NodeFeature(
+    public static final NodeFeature SEMANTIC_TEXT_EXCLUDE_SUB_FIELDS_FROM_FIELD_CAPS = new NodeFeature(
         "semantic_text.exclude_sub_fields_from_field_caps"
     );
 
@@ -1063,7 +1063,7 @@ private static Mapper.Builder createEmbeddingsField(
     ) {
         return switch (modelSettings.taskType()) {
             case SPARSE_EMBEDDING -> new SparseVectorFieldMapper.Builder(CHUNKED_EMBEDDINGS_FIELD).setStored(useLegacyFormat == false)
-                .setExcludeFromFieldCaps(true);
+                .excludeFromFieldCaps(true);
             case TEXT_EMBEDDING -> {
                 DenseVectorFieldMapper.Builder denseVectorMapperBuilder = new DenseVectorFieldMapper.Builder(
                     CHUNKED_EMBEDDINGS_FIELD,

x-pack/plugin/inference/src/yamlRestTest/resources/rest-api-spec/test/inference/10_semantic_text_field_mapping.yml

@@ -364,7 +364,7 @@ setup:
 "Field caps exclude chunks and embedding fields":
   - requires:
       cluster_features: "semantic_text.exclude_sub_fields_from_field_caps"
-      reason: field caps api exclude semantic_text subfields from 9.1.0
+      reason: field caps api exclude semantic_text subfields from 9.1.0 & 8.19.0
 
   - do:
       field_caps:
@@ -375,7 +375,11 @@ setup:
   - match: { indices: [ "test-index" ] }
   - exists: fields.sparse_field
   - exists: fields.dense_field
-  - not_exists: fields.sparse_field.chunks.embeddings
-  - not_exists: fields.sparse_field.chunks.offset
-  - not_exists: fields.dense_field.chunks.embeddings
-  - not_exists: fields.dense_field.chunks.offset
+  - not_exists: fields.sparse_field.inference.chunks.embeddings
+  - not_exists: fields.sparse_field.inference.chunks.offset
+  - not_exists: fields.sparse_field.inference.chunks
+  - not_exists: fields.sparse_field.inference
+  - not_exists: fields.dense_field.inference.chunks.embeddings
+  - not_exists: fields.dense_field.inference.chunks.offset
+  - not_exists: fields.dense_field.inference.chunks
+  - not_exists: fields.dense_field.inference

x-pack/plugin/inference/src/yamlRestTest/resources/rest-api-spec/test/inference/10_semantic_text_field_mapping_bwc.yml

@@ -311,7 +311,7 @@ setup:
 "Field caps exclude chunks embedding and text fields":
   - requires:
       cluster_features: "semantic_text.exclude_sub_fields_from_field_caps"
-      reason: field caps api exclude semantic_text subfields from 9.1.0
+      reason: field caps api exclude semantic_text subfields from 9.1.0 & 8.19.0
 
   - do:
       field_caps:
@@ -324,5 +324,9 @@ setup:
   - exists: fields.dense_field
   - not_exists: fields.sparse_field.inference.chunks.embeddings
   - not_exists: fields.sparse_field.inference.chunks.text
+  - not_exists: fields.sparse_field.inference.chunks
+  - not_exists: fields.sparse_field.inference
   - not_exists: fields.dense_field.inference.chunks.embeddings
   - not_exists: fields.dense_field.inference.chunks.text
+  - not_exists: fields.dense_field.inference.chunks
+  - not_exists: fields.dense_field.inference