Use feature flag more

Author: thecoop

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

@@ -242,8 +242,7 @@ public static class Builder extends FieldMapper.Builder {
 
         private final Parameter<ElementType> elementType = new Parameter<>("element_type", false, () -> ElementType.FLOAT, (n, c, o) -> {
             ElementType elementType = namesToElementType.get((String) o);
-            if (elementType == null
-                || (elementType == ElementType.BFLOAT16 && ES93GenericFlatVectorsFormat.GENERIC_VECTOR_FORMAT.isEnabled() == false)) {
+            if (elementType == null) {
                 throw new MapperParsingException("invalid element_type [" + o + "]; available types are " + namesToElementType.keySet());
             }
             return elementType;
@@ -485,16 +484,25 @@ public String toString() {
     public static final Element BFLOAT16_ELEMENT = new BFloat16Element();
     public static final Element BIT_ELEMENT = new BitElement();
 
-    public static final Map<String, ElementType> namesToElementType = Map.of(
-        ElementType.BYTE.toString(),
-        ElementType.BYTE,
-        ElementType.FLOAT.toString(),
-        ElementType.FLOAT,
-        ElementType.BFLOAT16.toString(),
-        ElementType.BFLOAT16,
-        ElementType.BIT.toString(),
-        ElementType.BIT
-    );
+    public static final Map<String, ElementType> namesToElementType = ES93GenericFlatVectorsFormat.GENERIC_VECTOR_FORMAT.isEnabled()
+        ? Map.of(
+            ElementType.BYTE.toString(),
+            ElementType.BYTE,
+            ElementType.FLOAT.toString(),
+            ElementType.FLOAT,
+            ElementType.BFLOAT16.toString(),
+            ElementType.BFLOAT16,
+            ElementType.BIT.toString(),
+            ElementType.BIT
+        )
+        : Map.of(
+            ElementType.BYTE.toString(),
+            ElementType.BYTE,
+            ElementType.FLOAT.toString(),
+            ElementType.FLOAT,
+            ElementType.BIT.toString(),
+            ElementType.BIT
+        );
 
     public abstract static class Element {
 

x-pack/qa/core-rest-tests-with-security/src/yamlRestTest/java/org/elasticsearch/xpack/security/CoreWithSecurityClientYamlTestSuiteIT.java

@@ -52,6 +52,7 @@ public class CoreWithSecurityClientYamlTestSuiteIT extends ESClientYamlSuiteTest
         .feature(FeatureFlag.DOC_VALUES_SKIPPER)
         .feature(FeatureFlag.SYNTHETIC_VECTORS)
         .feature(FeatureFlag.RANDOM_SAMPLING)
+        .feature(FeatureFlag.GENERIC_VECTOR_FORMAT)
         .build();
 
     public CoreWithSecurityClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) {