switch elasticsearch elser tests to use elasticsearch elser

Author: Max Hniebergall

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

@@ -28,7 +28,6 @@
 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.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/services/elser/ElserInternalModel.java

@@ -10,21 +10,16 @@
 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.elasticsearch.ElasticsearchInternalModel;
 
 public class ElserInternalModel extends ElasticsearchInternalModel {
 
-    public ElserInternalModel(
-        String inferenceEntityId,
-        TaskType taskType,
-        String service,
-        ElserInternalServiceSettings serviceSettings,
-        ElserMlNodeTaskSettings taskSettings
-    ) {
-        super(inferenceEntityId, taskType, service, serviceSettings, taskSettings);
+    public ElserInternalModel(String inferenceEntityId, TaskType taskType, String service, ElserInternalServiceSettings serviceSettings) {
+        super(inferenceEntityId, taskType, service, serviceSettings);
     }
 
     @Override
@@ -33,8 +28,8 @@ public ElserInternalServiceSettings getServiceSettings() {
     }
 
     @Override
-    public ElserMlNodeTaskSettings getTaskSettings() {
-        return (ElserMlNodeTaskSettings) super.getTaskSettings();
+    public TaskSettings getTaskSettings() {
+        return super.getTaskSettings();
     }
 
     @Override

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

@@ -10,64 +10,53 @@
 import org.elasticsearch.TransportVersions;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.test.AbstractWireSerializingTestCase;
-import org.elasticsearch.xpack.inference.services.elser.ElserInternalServiceSettings;
-import org.elasticsearch.xpack.inference.services.elser.ElserModels;
 
 import java.io.IOException;
 import java.util.HashSet;
 
 import static org.elasticsearch.xpack.inference.services.elasticsearch.ElserModelsTests.randomElserModel;
 
-public class ElserInternalServiceSettingsTests extends AbstractWireSerializingTestCase<
-    org.elasticsearch.xpack.inference.services.elser.ElserInternalServiceSettings> {
+public class ElserInternalServiceSettingsTests extends AbstractWireSerializingTestCase<ElserInternalServiceSettings> {
 
-    public static org.elasticsearch.xpack.inference.services.elser.ElserInternalServiceSettings createRandom() {
-        return new org.elasticsearch.xpack.inference.services.elser.ElserInternalServiceSettings(
-            ElasticsearchInternalServiceSettingsTests.validInstance(randomElserModel())
-        );
+    public static ElserInternalServiceSettings createRandom() {
+        return new ElserInternalServiceSettings(ElasticsearchInternalServiceSettingsTests.validInstance(randomElserModel()));
     }
 
     public void testBwcWrite() throws IOException {
         {
-            var settings = new org.elasticsearch.xpack.inference.services.elser.ElserInternalServiceSettings(
-                new ElasticsearchInternalServiceSettings(1, 1, ".elser_model_1", null)
-            );
+            var settings = new ElserInternalServiceSettings(new ElasticsearchInternalServiceSettings(1, 1, ".elser_model_1", null));
             var copy = copyInstance(settings, TransportVersions.V_8_12_0);
             assertEquals(settings, copy);
         }
         {
-            var settings = new org.elasticsearch.xpack.inference.services.elser.ElserInternalServiceSettings(
-                new ElasticsearchInternalServiceSettings(1, 1, ".elser_model_1", null)
-            );
+            var settings = new ElserInternalServiceSettings(new ElasticsearchInternalServiceSettings(1, 1, ".elser_model_1", null));
             var copy = copyInstance(settings, TransportVersions.V_8_11_X);
             assertEquals(settings, copy);
         }
     }
 
     @Override
-    protected Writeable.Reader<org.elasticsearch.xpack.inference.services.elser.ElserInternalServiceSettings> instanceReader() {
-        return org.elasticsearch.xpack.inference.services.elser.ElserInternalServiceSettings::new;
+    protected Writeable.Reader<ElserInternalServiceSettings> instanceReader() {
+        return ElserInternalServiceSettings::new;
     }
 
     @Override
-    protected org.elasticsearch.xpack.inference.services.elser.ElserInternalServiceSettings createTestInstance() {
+    protected ElserInternalServiceSettings createTestInstance() {
         return createRandom();
     }
 
     @Override
-    protected org.elasticsearch.xpack.inference.services.elser.ElserInternalServiceSettings mutateInstance(
-        org.elasticsearch.xpack.inference.services.elser.ElserInternalServiceSettings instance
-    ) {
+    protected ElserInternalServiceSettings mutateInstance(ElserInternalServiceSettings instance) {
         return switch (randomIntBetween(0, 2)) {
-            case 0 -> new org.elasticsearch.xpack.inference.services.elser.ElserInternalServiceSettings(
+            case 0 -> new ElserInternalServiceSettings(
                 new ElasticsearchInternalServiceSettings(
                     instance.getNumAllocations() == null ? 1 : instance.getNumAllocations() + 1,
                     instance.getNumThreads(),
                     instance.modelId(),
                     null
                 )
             );
-            case 1 -> new org.elasticsearch.xpack.inference.services.elser.ElserInternalServiceSettings(
+            case 1 -> new ElserInternalServiceSettings(
                 new ElasticsearchInternalServiceSettings(
                     instance.getNumAllocations(),
                     instance.getNumThreads() + 1,