[ML] Minor tidyups in ML serverless extension

Followup to elastic#99129 and elastic#100956
droberts195 · Oct 18, 2023 · 0006db8 · 0006db8
1 parent dffd842
commit 0006db8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/...k/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/DefaultMachineLearningExtension.java b/...k/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/DefaultMachineLearningExtension.java
@@ -56,6 +56,7 @@ public String[] getAnalyticsDestIndexAllowedSettings() {
         return ANALYTICS_DEST_INDEX_ALLOWED_SETTINGS;
     }
 
+    @Override
     public AbstractNodeAvailabilityZoneMapper getNodeAvailabilityZoneMapper(Settings settings, ClusterSettings clusterSettings) {
         return new NodeRealAvailabilityZoneMapper(settings, clusterSettings);
     }

diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MachineLearningExtension.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MachineLearningExtension.java
@@ -10,7 +10,6 @@
 import org.elasticsearch.common.settings.ClusterSettings;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.xpack.ml.autoscaling.AbstractNodeAvailabilityZoneMapper;
-import org.elasticsearch.xpack.ml.autoscaling.NodeRealAvailabilityZoneMapper;
 
 public interface MachineLearningExtension {
 
@@ -26,11 +25,7 @@ default void configure(Settings settings) {}
 
     boolean isNlpEnabled();
 
-    default String[] getAnalyticsDestIndexAllowedSettings() {
-        return DefaultMachineLearningExtension.ANALYTICS_DEST_INDEX_ALLOWED_SETTINGS;
-    }
+    String[] getAnalyticsDestIndexAllowedSettings();
 
-    default AbstractNodeAvailabilityZoneMapper getNodeAvailabilityZoneMapper(Settings settings, ClusterSettings clusterSettings) {
-        return new NodeRealAvailabilityZoneMapper(settings, clusterSettings);
-    }
+    AbstractNodeAvailabilityZoneMapper getNodeAvailabilityZoneMapper(Settings settings, ClusterSettings clusterSettings);
 }