Refactoring testing functions

Author: jonathan-buttner

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

@@ -92,16 +92,16 @@ public List<InferenceServiceExtension.Factory> getInferenceServiceFactories() {
 
                 @Override
                 public Settings getIndexSettings() {
-                    return InferenceIndex.settingsForTesting(
-                        Settings.builder().put("index.routing.allocation.require.index_router", "config").build()
-                    );
+                    return InferenceIndex.builder()
+                        .put(Settings.builder().put("index.routing.allocation.require.index_router", "config").build())
+                        .build();
                 }
 
                 @Override
                 public Settings getSecretsIndexSettings() {
-                    return InferenceSecretsIndex.settingsForTesting(
-                        Settings.builder().put("index.routing.allocation.require.index_router", "secrets").build()
-                    );
+                    return InferenceSecretsIndex.builder()
+                        .put(Settings.builder().put("index.routing.allocation.require.index_router", "secrets").build())
+                        .build();
                 }
             };
             plugins.add(inferencePlugin);

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

@@ -33,18 +33,11 @@ public static Settings settings() {
         return builder().build();
     }
 
-    private static Settings.Builder builder() {
+    // Public to allow tests to create the index with custom settings
+    public static Settings.Builder builder() {
         return Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1).put(IndexMetadata.SETTING_AUTO_EXPAND_REPLICAS, "0-1");
     }
 
-    /**
-     * This allows tests to set additional settings for the inference index.
-     * @param extraSettings additional settings to apply to the inference index.
-     */
-    public static Settings settingsForTesting(Settings extraSettings) {
-        return builder().put(extraSettings).build();
-    }
-
     /**
      * Reject any unknown fields being added by setting dynamic mappings to
      * {@code strict} for the top level object. A document that contains unknown

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

@@ -32,18 +32,11 @@ public static Settings settings() {
         return builder().build();
     }
 
-    private static Settings.Builder builder() {
+    // Public to allow tests to create the index with custom settings
+    public static Settings.Builder builder() {
         return Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1).put(IndexMetadata.SETTING_AUTO_EXPAND_REPLICAS, "0-1");
     }
 
-    /**
-     * This allows tests to set additional settings for the inference index.
-     * @param extraSettings additional settings to apply to the inference index.
-     */
-    public static Settings settingsForTesting(Settings extraSettings) {
-        return builder().put(extraSettings).build();
-    }
-
     /**
      * Reject any unknown fields being added by setting dynamic mappings to
      * {@code strict} for the top level object. A document that contains unknown