Better fix for null inputs

Author: kderusso

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

@@ -293,12 +293,13 @@ protected void merge(FieldMapper mergeWith, Conflicts conflicts, MapperMergeCont
             SemanticTextFieldMapper semanticMergeWith = (SemanticTextFieldMapper) mergeWith;
             semanticMergeWith = copySettings(semanticMergeWith, mapperMergeContext);
 
-            super.merge(semanticMergeWith, conflicts, mapperMergeContext);
-            conflicts.check();
             var context = mapperMergeContext.createChildContext(semanticMergeWith.leafName(), ObjectMapper.Dynamic.FALSE);
             var inferenceField = inferenceFieldBuilder.apply(context.getMapperBuilderContext());
             var mergedInferenceField = inferenceField.merge(semanticMergeWith.fieldType().getInferenceField(), context);
             inferenceFieldBuilder = c -> mergedInferenceField;
+
+            super.merge(semanticMergeWith, conflicts, mapperMergeContext);
+            conflicts.check();
         }
 
         /**
@@ -1218,11 +1219,10 @@ static DenseVectorFieldMapper.DenseVectorIndexOptions defaultBbqHnswDenseVectorI
         return new DenseVectorFieldMapper.BBQHnswIndexOptions(m, efConstruction, rescoreVector);
     }
 
-    static SemanticTextIndexOptions defaultBbqHnswSemanticTextIndexOptions(IndexVersion indexVersion) {
+    static SemanticTextIndexOptions defaultBbqHnswSemanticTextIndexOptions() {
         return new SemanticTextIndexOptions(
             SemanticTextIndexOptions.SupportedIndexOptions.DENSE_VECTOR,
-            defaultBbqHnswDenseVectorIndexOptions(),
-            indexVersion
+            defaultBbqHnswDenseVectorIndexOptions()
         );
     }
 
@@ -1242,15 +1242,9 @@ private static boolean canMergeIndexOptions(SemanticTextIndexOptions previous, S
             return true;
         }
 
-        if (previous == null
-            && current.type() == SemanticTextIndexOptions.SupportedIndexOptions.DENSE_VECTOR
-            && indexVersionDefaultsToBbqHnsw(current.indexVersion())) {
-            return canMergeIndexOptions(defaultBbqHnswSemanticTextIndexOptions(current.indexVersion()), current, conflicts);
-        } else if (current == null
-            && previous.type() == SemanticTextIndexOptions.SupportedIndexOptions.DENSE_VECTOR
-            && indexVersionDefaultsToBbqHnsw(previous.indexVersion())) {
-                return canMergeIndexOptions(previous, defaultBbqHnswSemanticTextIndexOptions(previous.indexVersion()), conflicts);
-            }
+        if (previous == null || current == null) {
+            return true;
+        }
 
         if (previous.type() == SemanticTextIndexOptions.SupportedIndexOptions.DENSE_VECTOR) {
             DenseVectorFieldMapper.DenseVectorIndexOptions previousDenseOptions = (DenseVectorFieldMapper.DenseVectorIndexOptions) previous
@@ -1283,10 +1277,6 @@ private static SemanticTextIndexOptions parseIndexOptionsFromMap(String fieldNam
         );
         @SuppressWarnings("unchecked")
         Map<String, Object> indexOptionsMap = (Map<String, Object>) entry.getValue();
-        return new SemanticTextIndexOptions(
-            indexOptions,
-            indexOptions.parseIndexOptions(fieldName, indexOptionsMap, indexVersion),
-            indexVersion
-        );
+        return new SemanticTextIndexOptions(indexOptions, indexOptions.parseIndexOptions(fieldName, indexOptionsMap, indexVersion));
     }
 }

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

@@ -36,12 +36,10 @@ public class SemanticTextIndexOptions implements ToXContent {
 
     private final SupportedIndexOptions type;
     private final IndexOptions indexOptions;
-    private final IndexVersion indexVersion;
 
-    public SemanticTextIndexOptions(SupportedIndexOptions type, IndexOptions indexOptions, IndexVersion indexVersion) {
+    public SemanticTextIndexOptions(SupportedIndexOptions type, IndexOptions indexOptions) {
         this.type = type;
         this.indexOptions = indexOptions;
-        this.indexVersion = indexVersion;
     }
 
     public SupportedIndexOptions type() {
@@ -52,10 +50,6 @@ public IndexOptions indexOptions() {
         return indexOptions;
     }
 
-    public IndexVersion indexVersion() {
-        return indexVersion;
-    }
-
     public enum SupportedIndexOptions {
         DENSE_VECTOR("dense_vector") {
             @Override