fix more tests

Author: jimczi

server/src/main/java/org/elasticsearch/inference/InferenceServiceRegistry.java

@@ -46,7 +46,6 @@ public Map<String, InferenceService> getServices() {
     }
 
     public Optional<InferenceService> getService(String serviceName) {
-
         if ("elser".equals(serviceName)) { // ElserService.NAME before removal
             // here we are aliasing the elser service to use the elasticsearch service instead
             return Optional.ofNullable(services.get("elasticsearch")); // ElasticsearchInternalService.NAME

x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/SemanticMatchTestCase.java

@@ -18,6 +18,7 @@
 import java.io.IOException;
 import java.util.Map;
 
+import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.core.StringContains.containsString;
 
 public abstract class SemanticMatchTestCase extends ESRestTestCase {
@@ -98,7 +99,12 @@ public void setUpTextEmbeddingInferenceEndpoint() throws IOException {
                    }
                  }
             """);
-        adminClient().performRequest(request);
+        try {
+            adminClient().performRequest(request);
+        } catch (ResponseException exc) {
+            // in case the removal failed
+            assertThat(exc.getResponse().getStatusLine().getStatusCode(), equalTo(400));
+        }
     }
 
     @After

x-pack/plugin/inference/qa/inference-service-tests/src/javaRestTest/java/org/elasticsearch/xpack/inference/InferenceCrudIT.java

@@ -147,7 +147,9 @@ public void testSkipValidationAndStart() throws IOException {
             {
                 "service": "openai",
                 "service_settings": {
-                    "api_key": "XXXX"
+                    "api_key": "XXXX",
+                    "dimensions": 128,
+                    "similarity": "cosine"
                 },
                 "task_settings": {
                    "model": "text-embedding-ada-002"

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/openai/embeddings/OpenAiEmbeddingsServiceSettings.java

@@ -96,7 +96,6 @@ private static CommonFields fromMap(
         ValidationException validationException,
         ConfigurationParseContext context
     ) {
-
         String url = extractOptionalString(map, URL, ModelConfigurations.SERVICE_SETTINGS, validationException);
         String organizationId = extractOptionalString(map, ORGANIZATION, ModelConfigurations.SERVICE_SETTINGS, validationException);
         SimilarityMeasure similarity = extractSimilarity(map, ModelConfigurations.SERVICE_SETTINGS, validationException);