Refactoring

Author: jonathan-buttner

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

@@ -42,7 +42,13 @@ public void init(Client client) {
     }
 
     public void onNodeStarted() {
-        services.values().forEach(InferenceService::onNodeStarted);
+        for (var service : services.values()) {
+            try {
+                service.onNodeStarted();
+            } catch (Exception e) {
+                // ignore
+            }
+        }
     }
 
     public Map<String, InferenceService> getServices() {

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

@@ -118,7 +118,7 @@
 import org.elasticsearch.xpack.inference.services.elastic.ElasticInferenceService;
 import org.elasticsearch.xpack.inference.services.elastic.ElasticInferenceServiceComponents;
 import org.elasticsearch.xpack.inference.services.elastic.ElasticInferenceServiceSettings;
-import org.elasticsearch.xpack.inference.services.elastic.authorization.ElasticInferenceServiceAuthorizationHandler;
+import org.elasticsearch.xpack.inference.services.elastic.authorization.ElasticInferenceServiceAuthorizationRequestHandler;
 import org.elasticsearch.xpack.inference.services.elasticsearch.ElasticsearchInternalService;
 import org.elasticsearch.xpack.inference.services.googleaistudio.GoogleAiStudioService;
 import org.elasticsearch.xpack.inference.services.googlevertexai.GoogleVertexAiService;
@@ -277,10 +277,10 @@ public Collection<?> createComponents(PluginServices services) {
         ElasticInferenceServiceSettings inferenceServiceSettings = new ElasticInferenceServiceSettings(settings);
         String elasticInferenceUrl = inferenceServiceSettings.getElasticInferenceServiceUrl();
 
-        var elasticInferenceServiceComponentsInstance = ElasticInferenceServiceComponents.withDefaultRevokeDelay(elasticInferenceUrl);
+        var elasticInferenceServiceComponentsInstance = ElasticInferenceServiceComponents.withDefaults(elasticInferenceUrl);
         elasticInferenceServiceComponents.set(elasticInferenceServiceComponentsInstance);
 
-        var authorizationHandler = new ElasticInferenceServiceAuthorizationHandler(
+        var authorizationHandler = new ElasticInferenceServiceAuthorizationRequestHandler(
             elasticInferenceServiceComponentsInstance.elasticInferenceServiceUrl(),
             services.threadPool()
         );

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

@@ -0,0 +1,15 @@
+/*
+ * 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.elastic;
+
+import org.elasticsearch.inference.MinimalServiceSettings;
+import org.elasticsearch.inference.Model;
+
+public record DefaultModelConfig(Model model, MinimalServiceSettings settings) {
+
+}