Browse Source

[Inference API] Align method names in InferencePlugin#getSettings (#110908)

Tim Grein 1 year ago
parent
commit
2ef42f4c1d

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

@@ -276,11 +276,11 @@ public class InferencePlugin extends Plugin implements ActionPlugin, ExtensibleP
     @Override
     public List<Setting<?>> getSettings() {
         return Stream.of(
-            HttpSettings.getSettings(),
-            HttpClientManager.getSettings(),
-            ThrottlerManager.getSettings(),
+            HttpSettings.getSettingsDefinitions(),
+            HttpClientManager.getSettingsDefinitions(),
+            ThrottlerManager.getSettingsDefinitions(),
             RetrySettings.getSettingsDefinitions(),
-            Truncator.getSettings(),
+            Truncator.getSettingsDefinitions(),
             RequestExecutorServiceSettings.getSettingsDefinitions(),
             List.of(SKIP_VALIDATE_AND_START)
         ).flatMap(Collection::stream).collect(Collectors.toList());

+ 1 - 1
x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/common/Truncator.java

@@ -34,7 +34,7 @@ public class Truncator {
         Setting.Property.Dynamic
     );
 
-    public static List<Setting<?>> getSettings() {
+    public static List<Setting<?>> getSettingsDefinitions() {
         return List.of(REDUCTION_PERCENTAGE_SETTING);
     }
 

+ 1 - 1
x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/http/HttpClientManager.java

@@ -153,7 +153,7 @@ public class HttpClientManager implements Closeable {
         return new IdleConnectionEvictor(threadPool, connectionManager, evictionInterval, connectionMaxIdle);
     }
 
-    public static List<Setting<?>> getSettings() {
+    public static List<Setting<?>> getSettingsDefinitions() {
         return List.of(
             MAX_TOTAL_CONNECTIONS,
             MAX_ROUTE_CONNECTIONS,

+ 1 - 1
x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/http/HttpSettings.java

@@ -45,7 +45,7 @@ public class HttpSettings {
         this.maxResponseSize = maxResponseSize;
     }
 
-    public static List<Setting<?>> getSettings() {
+    public static List<Setting<?>> getSettingsDefinitions() {
         return List.of(MAX_HTTP_RESPONSE_SIZE);
     }
 }

+ 1 - 1
x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/logging/ThrottlerManager.java

@@ -102,7 +102,7 @@ public class ThrottlerManager implements Closeable {
         throttler.close();
     }
 
-    public static List<Setting<?>> getSettings() {
+    public static List<Setting<?>> getSettingsDefinitions() {
         return List.of(STATS_RESET_INTERVAL_SETTING, LOGGER_WAIT_DURATION_SETTING);
     }
 

+ 4 - 4
x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/Utils.java

@@ -65,11 +65,11 @@ public final class Utils {
         var clusterService = mock(ClusterService.class);
 
         var registeredSettings = Stream.of(
-            HttpSettings.getSettings(),
-            HttpClientManager.getSettings(),
-            ThrottlerManager.getSettings(),
+            HttpSettings.getSettingsDefinitions(),
+            HttpClientManager.getSettingsDefinitions(),
+            ThrottlerManager.getSettingsDefinitions(),
             RetrySettings.getSettingsDefinitions(),
-            Truncator.getSettings(),
+            Truncator.getSettingsDefinitions(),
             RequestExecutorServiceSettings.getSettingsDefinitions()
         ).flatMap(Collection::stream).collect(Collectors.toSet());