Revert "remove elser ml node task settings which were unused"

This reverts commit bee840d.

# Conflicts:
#	x-pack/plugin/inference/src/internalClusterTest/java/org/elasticsearch/xpack/inference/integration/ModelRegistryIT.java
#	x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/elasticsearch/ElserInternalServiceTests.java

Author: Max Hniebergall

x-pack/plugin/inference/src/internalClusterTest/java/org/elasticsearch/xpack/inference/integration/ModelRegistryIT.java

@@ -28,6 +28,8 @@
 import org.elasticsearch.xpack.inference.InferencePlugin;
 import org.elasticsearch.xpack.inference.registry.ModelRegistry;
 import org.elasticsearch.xpack.inference.services.elasticsearch.ElserInternalServiceSettingsTests;
+import org.elasticsearch.xpack.inference.services.elasticsearch.ElserInternalServiceTests;
+import org.elasticsearch.xpack.inference.services.elasticsearch.ElserMlNodeTaskSettingsTests;
 import org.elasticsearch.xpack.inference.services.elser.ElserInternalModel;
 import org.elasticsearch.xpack.inference.services.elser.ElserInternalService;
 import org.junit.Before;

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

@@ -63,6 +63,7 @@
 import org.elasticsearch.xpack.inference.services.elasticsearch.ElasticsearchInternalServiceSettings;
 import org.elasticsearch.xpack.inference.services.elasticsearch.MultilingualE5SmallInternalServiceSettings;
 import org.elasticsearch.xpack.inference.services.elser.ElserInternalServiceSettings;
+import org.elasticsearch.xpack.inference.services.elser.ElserMlNodeTaskSettings;
 import org.elasticsearch.xpack.inference.services.googleaistudio.completion.GoogleAiStudioCompletionServiceSettings;
 import org.elasticsearch.xpack.inference.services.googleaistudio.embeddings.GoogleAiStudioEmbeddingsServiceSettings;
 import org.elasticsearch.xpack.inference.services.googlevertexai.GoogleVertexAiSecretSettings;

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elasticsearch/ElserInternalModel.java

@@ -10,15 +10,22 @@
 import org.elasticsearch.ResourceNotFoundException;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.inference.Model;
-import org.elasticsearch.inference.TaskSettings;
 import org.elasticsearch.inference.TaskType;
 import org.elasticsearch.xpack.core.ml.action.CreateTrainedModelAssignmentAction;
 import org.elasticsearch.xpack.core.ml.utils.ExceptionsHelper;
+import org.elasticsearch.xpack.inference.services.elser.ElserInternalServiceSettings;
+import org.elasticsearch.xpack.inference.services.elser.ElserMlNodeTaskSettings;
 
 public class ElserInternalModel extends ElasticsearchInternalModel {
 
-    public ElserInternalModel(String inferenceEntityId, TaskType taskType, String service, ElserInternalServiceSettings serviceSettings) {
-        super(inferenceEntityId, taskType, service, serviceSettings);
+    public ElserInternalModel(
+        String inferenceEntityId,
+        TaskType taskType,
+        String service,
+        ElserInternalServiceSettings serviceSettings,
+        ElserMlNodeTaskSettings taskSettings
+    ) {
+        super(inferenceEntityId, taskType, service, serviceSettings, taskSettings);
     }
 
     @Override
@@ -27,8 +34,8 @@ public ElserInternalServiceSettings getServiceSettings() {
     }
 
     @Override
-    public TaskSettings getTaskSettings() {
-        return super.getTaskSettings();
+    public ElserMlNodeTaskSettings getTaskSettings() {
+        return (ElserMlNodeTaskSettings) super.getTaskSettings();
     }
 
     @Override

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elser/ElserMlNodeTaskSettings.java

@@ -0,0 +1,63 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.xpack.inference.services.elser;
+
+import org.elasticsearch.TransportVersion;
+import org.elasticsearch.TransportVersions;
+import org.elasticsearch.common.io.stream.StreamInput;
+import org.elasticsearch.common.io.stream.StreamOutput;
+import org.elasticsearch.inference.TaskSettings;
+import org.elasticsearch.xcontent.XContentBuilder;
+
+import java.io.IOException;
+import java.util.Objects;
+
+public class ElserMlNodeTaskSettings implements TaskSettings {
+
+    public static final String NAME = "elser_mlnode_task_settings";
+
+    public static ElserMlNodeTaskSettings DEFAULT = new ElserMlNodeTaskSettings();
+
+    public ElserMlNodeTaskSettings() {}
+
+    public ElserMlNodeTaskSettings(StreamInput in) {}
+
+    @Override
+    public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
+        builder.startObject();
+        builder.endObject();
+        return builder;
+    }
+
+    @Override
+    public String getWriteableName() {
+        return NAME;
+    }
+
+    @Override
+    public TransportVersion getMinimalSupportedVersion() {
+        return TransportVersions.V_8_11_X;
+    }
+
+    @Override
+    public void writeTo(StreamOutput out) throws IOException {}
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) return true;
+        if (obj == null || getClass() != obj.getClass()) return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        // TODO Class has no members all instances are equivalent
+        // Return the hash of NAME to make the serialization tests pass
+        return Objects.hash(NAME);
+    }
+}

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

@@ -15,6 +15,7 @@
 import org.elasticsearch.inference.TaskType;
 import org.elasticsearch.test.AbstractWireSerializingTestCase;
 import org.elasticsearch.xpack.inference.services.elasticsearch.ElserInternalServiceSettingsTests;
+import org.elasticsearch.xpack.inference.services.elser.ElserMlNodeTaskSettings;
 
 public class ModelConfigurationsTests extends AbstractWireSerializingTestCase<ModelConfigurations> {