... and fix tests...

Author: markjhoy

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

@@ -81,10 +81,7 @@ public IndexOptions parseIndexOptions(String fieldName, Map<String, Object> map,
         SPARSE_VECTOR("sparse_vector") {
             @Override
             public IndexOptions parseIndexOptions(String fieldName, Map<String, Object> map, IndexVersion indexVersion) {
-                SparseVectorFieldMapper.SparseVectorIndexOptions indexOptions = parseSparseVectorIndexOptionsFromMap(map);
-                return (SparseVectorFieldMapper.SparseVectorIndexOptions.isDefaultOptions(indexOptions, indexVersion))
-                    ? null
-                    : indexOptions;
+                return parseSparseVectorIndexOptionsFromMap(map);
             }
         };
 

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

@@ -794,9 +794,9 @@ private static void assertSemanticTextField(
                     IndexVersion indexVersion = mapperService.getIndexSettings().getIndexVersionCreated();
 
                     SparseVectorFieldMapper.SparseVectorIndexOptions applied = sparseVectorFieldMapper.fieldType().getIndexOptions();
-                    SparseVectorFieldMapper.SparseVectorIndexOptions expected = (expectedIndexOptions != null)
-                        ? (SparseVectorFieldMapper.SparseVectorIndexOptions) expectedIndexOptions.indexOptions()
-                        : SparseVectorFieldMapper.SparseVectorIndexOptions.getDefaultIndexOptions(indexVersion);
+                    SparseVectorFieldMapper.SparseVectorIndexOptions expected = expectedIndexOptions == null
+                        ? SparseVectorFieldMapper.SparseVectorIndexOptions.getDefaultIndexOptions(indexVersion)
+                        : (SparseVectorFieldMapper.SparseVectorIndexOptions)expectedIndexOptions.indexOptions();
                     assertEquals(expected, applied);
                 }
                 case TEXT_EMBEDDING -> {
@@ -1403,17 +1403,6 @@ public void testDefaultIndexOptions() throws IOException {
         );
         assertSemanticTextField(mapperService, "field", true, null, defaultDenseVectorSemanticIndexOptions());
 
-        IndexVersion sparseVectorIndexVersion = randomBoolean()
-            ? IndexVersionUtils.randomVersionBetween(
-                random(),
-                IndexVersions.UPGRADE_TO_LUCENE_10_0_0,
-                IndexVersionUtils.getPreviousVersion(IndexVersions.SPARSE_VECTOR_PRUNING_INDEX_OPTIONS_SUPPORT)
-            )
-            : IndexVersionUtils.randomVersionBetween(
-                random(),
-                IndexVersions.SPARSE_VECTOR_PRUNING_INDEX_OPTIONS_SUPPORT,
-                IndexVersion.current()
-            );
         mapperService = createMapperService(fieldMapping(b -> {
             b.field("type", "semantic_text");
             b.field("inference_id", "another_inference_id");
@@ -1425,7 +1414,14 @@ public void testDefaultIndexOptions() throws IOException {
             IndexVersionUtils.getPreviousVersion(IndexVersions.SPARSE_VECTOR_PRUNING_INDEX_OPTIONS_SUPPORT),
             IndexVersions.SPARSE_VECTOR_PRUNING_INDEX_OPTIONS_SUPPORT
         );
-        assertSemanticTextField(mapperService, "field", true, null, defaultSparseVectorIndexOptions(sparseVectorIndexVersion));
+
+        assertSemanticTextField(
+            mapperService,
+            "field",
+            true,
+            null,
+            defaultSparseVectorIndexOptions(mapperService.getIndexSettings().getIndexVersionCreated())
+        );
     }
 
     public void testSpecifiedDenseVectorIndexOptions() throws IOException {