Fix errors from merge

Author: kderusso

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

@@ -1520,7 +1520,7 @@ public static Optional<VectorIndexType> fromString(String type) {
             this.quantized = quantized;
         }
 
-        abstract IndexOptions parseIndexOptions(String fieldName, Map<String, ?> indexOptionsMap, IndexVersion indexVersion);
+        public abstract IndexOptions parseIndexOptions(String fieldName, Map<String, ?> indexOptionsMap, IndexVersion indexVersion);
 
         public abstract boolean supportsElementType(ElementType elementType);
 

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

@@ -13,7 +13,9 @@
 import org.elasticsearch.common.xcontent.XContentParserUtils;
 import org.elasticsearch.common.xcontent.support.XContentMapValues;
 import org.elasticsearch.core.Nullable;
+import org.elasticsearch.index.IndexVersion;
 import org.elasticsearch.index.IndexVersions;
+import org.elasticsearch.index.mapper.vectors.DenseVectorFieldMapper;
 import org.elasticsearch.inference.ChunkedInference;
 import org.elasticsearch.inference.MinimalServiceSettings;
 import org.elasticsearch.xcontent.ConstructingObjectParser;
@@ -126,7 +128,7 @@ static MinimalServiceSettings parseModelSettingsFromMap(Object node) {
         }
     }
 
-    static DenseVectorFieldMapper.IndexOptions parseIndexOptionsFromMap(String fieldName, Object node) {
+    static DenseVectorFieldMapper.IndexOptions parseIndexOptionsFromMap(String fieldName, Object node, IndexVersion indexVersion) {
         if (node == null) {
             return null;
         }
@@ -140,7 +142,7 @@ static DenseVectorFieldMapper.IndexOptions parseIndexOptionsFromMap(String field
                 XContentMapValues.nodeStringValue(type.toString(), null)
             ).orElseThrow(() -> new IllegalArgumentException("Unsupported index options " + TYPE_FIELD + " [" + type + "]"));
 
-            return vectorIndexType.parseIndexOptions(fieldName, map);
+            return vectorIndexType.parseIndexOptions(fieldName, map, indexVersion);
         } catch (Exception exc) {
             throw new ElasticsearchException(exc);
         }

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

@@ -183,7 +183,7 @@ public static class Builder extends FieldMapper.Builder {
             INDEX_OPTIONS_FIELD,
             true,
             () -> null,
-            (n, c, o) -> SemanticTextField.parseIndexOptionsFromMap(n, o),
+            (n, c, o) -> SemanticTextField.parseIndexOptionsFromMap(n, o, c.indexVersionCreated()),
             mapper -> ((SemanticTextFieldType) mapper.fieldType()).indexOptions,
             XContentBuilder::field,
             Objects::toString