reverting most of the stuff

Author: mromaios

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

@@ -406,11 +406,6 @@ protected Parameter<?>[] getParameters() {
             return new Parameter<?>[] { elementType, dims, indexed, similarity, indexOptions, meta };
         }
 
-        public Builder indexed(boolean indexed) {
-            this.indexed.setValue(indexed);
-            return this;
-        }
-
         public Builder similarity(VectorSimilarity vectorSimilarity) {
             similarity.setValue(vectorSimilarity);
             return this;

server/src/test/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapperTests.java

@@ -2230,27 +2230,6 @@ public void testValidateOnBuild() {
         );
     }
 
-    public void testSetIndexed() {
-        final MapperBuilderContext context = MapperBuilderContext.root(false, false);
-
-        DenseVectorFieldMapper mapper = new DenseVectorFieldMapper.Builder(
-            "test",
-            IndexVersionUtils.getPreviousVersion(INDEXED_BY_DEFAULT_INDEX_VERSION),
-            false
-        ).elementType(ElementType.FLOAT).build(context);
-        DenseVectorFieldType denseVectorFieldType = mapper.fieldType();
-        assertFalse(denseVectorFieldType.isIndexed());
-
-        mapper = new DenseVectorFieldMapper.Builder("test", IndexVersionUtils.getPreviousVersion(INDEXED_BY_DEFAULT_INDEX_VERSION), false)
-            .elementType(ElementType.FLOAT)
-            .indexed(true)
-            .similarity(VectorSimilarity.COSINE)
-            .build(context);
-
-        denseVectorFieldType = mapper.fieldType();
-        assertTrue(denseVectorFieldType.isIndexed());
-    }
-
     private static float[] decodeDenseVector(IndexVersion indexVersion, BytesRef encodedVector) {
         int dimCount = VectorEncoderDecoder.denseVectorLength(indexVersion, encodedVector);
         float[] vector = new float[dimCount];

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

@@ -130,8 +130,7 @@
  */
 public class SemanticTextFieldMapper extends FieldMapper implements InferenceFieldMapper {
     private static final Logger logger = LogManager.getLogger(SemanticTextFieldMapper.class);
-    public static final String WARNING_MESSAGE_8X = "Creating a `semantic_text` field on this index version may not include"
-        + " optimized default settings. Consider creating a new index for better performance.";
+    public static final String UNSUPPORTED_INDEX_MESSAGE = "[semantic_text] is available on indices created with 8.11+.";
     public static final NodeFeature SEMANTIC_TEXT_IN_OBJECT_FIELD_FIX = new NodeFeature("semantic_text.in_object_field_fix");
     public static final NodeFeature SEMANTIC_TEXT_SINGLE_FIELD_UPDATE_FIX = new NodeFeature("semantic_text.single_field_update_fix");
     public static final NodeFeature SEMANTIC_TEXT_DELETE_FIX = new NodeFeature("semantic_text.delete_fix");
@@ -170,6 +169,9 @@ public static final TypeParser parser(Supplier<ModelRegistry> modelRegistry) {
 
     public static BiConsumer<String, MappingParserContext> validateParserContext(String type) {
         return (n, c) -> {
+            if (c.getIndexSettings().getIndexVersionCreated().before(NEW_SPARSE_VECTOR)) {
+                throw new UnsupportedOperationException(UNSUPPORTED_INDEX_MESSAGE);
+            };
             if (InferenceMetadataFieldsMapper.isEnabled(c.getIndexSettings().getSettings()) == false) {
                 notInMultiFields(type).accept(n, c);
             }
@@ -1301,11 +1303,6 @@ private static void configureDenseVectorMapperBuilder(
         MinimalServiceSettings modelSettings,
         SemanticTextIndexOptions indexOptions
     ) {
-        if (indexVersionCreated.before(INDEXED_BY_DEFAULT_INDEX_VERSION)) {
-            deprecationLogger.warn(DeprecationCategory.MAPPINGS, "semantic_text", WARNING_MESSAGE_8X);
-        }
-        denseVectorMapperBuilder.indexed(true);
-
         SimilarityMeasure similarity = modelSettings.similarity();
         if (similarity != null) {
             switch (similarity) {

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/mapper/SemanticTextFieldMapperTests.java

@@ -110,9 +110,8 @@
 import static org.elasticsearch.xpack.inference.mapper.SemanticTextField.getEmbeddingsFieldName;
 import static org.elasticsearch.xpack.inference.mapper.SemanticTextFieldMapper.DEFAULT_ELSER_2_INFERENCE_ID;
 import static org.elasticsearch.xpack.inference.mapper.SemanticTextFieldMapper.DEFAULT_RESCORE_OVERSAMPLE;
-import static org.elasticsearch.xpack.inference.mapper.SemanticTextFieldMapper.ERROR_MESSAGE_UNSUPPORTED_SPARSE_VECTOR;
 import static org.elasticsearch.xpack.inference.mapper.SemanticTextFieldMapper.INDEX_OPTIONS_FIELD;
-import static org.elasticsearch.xpack.inference.mapper.SemanticTextFieldMapper.WARNING_MESSAGE_8X;
+import static org.elasticsearch.xpack.inference.mapper.SemanticTextFieldMapper.UNSUPPORTED_INDEX_MESSAGE;
 import static org.elasticsearch.xpack.inference.mapper.SemanticTextFieldTests.generateRandomChunkingSettings;
 import static org.elasticsearch.xpack.inference.mapper.SemanticTextFieldTests.generateRandomChunkingSettingsOtherThan;
 import static org.elasticsearch.xpack.inference.mapper.SemanticTextFieldTests.randomSemanticText;
@@ -428,16 +427,40 @@ public void testOldIndexSemanticTextDenseVectorCreation() throws IOException {
             b.field("element_type", "float");
             b.endObject();
         });
+        assertOldIndexUnsupported(fieldMapping);
+    }
 
-        MapperService mapperService = createMapperService(
-            fieldMapping,
-            true,
-            IndexVersions.V_8_0_0,
-            IndexVersionUtils.getPreviousVersion(IndexVersions.FIRST_DETACHED_INDEX_VERSION)
+    public void testOldIndexSemanticTextMinimalMappingRaisesError() throws IOException {
+        final XContentBuilder fieldMapping = fieldMapping(this::minimalMapping);
+        assertOldIndexUnsupported(fieldMapping);
+    }
+
+    public void testOldIndexSemanticTextSparseVersionRaisesError() throws IOException {
+        final XContentBuilder fieldMapping = fieldMapping(b -> {
+            b.field("type", "semantic_text");
+            b.field("inference_id", "another_inference_id");
+            b.startObject("model_settings");
+            b.field("task_type", "sparse_embedding");
+            b.endObject();
+        });
+        assertOldIndexUnsupported(fieldMapping);
+    }
+
+    private void assertOldIndexUnsupported(
+        XContentBuilder fieldMapping
+    ) {
+
+        MapperParsingException exception = assertThrows(
+            MapperParsingException.class,
+            () -> createMapperService(
+                fieldMapping,
+                true,
+                IndexVersions.V_8_0_0,
+                IndexVersionUtils.getPreviousVersion(IndexVersions.NEW_SPARSE_VECTOR)
+            )
         );
-        assertWarnings(WARNING_MESSAGE_8X);
-        assertParseMinimalWarnings();
-        assertSemanticTextField(mapperService, fieldName, true, null, null);
+        assertTrue(exception.getMessage().contains(UNSUPPORTED_INDEX_MESSAGE));
+        assertTrue(exception.getRootCause() instanceof UnsupportedOperationException);
     }
 
     public void testMultiFieldsSupport() throws IOException {