diff --git a/x-pack/plugin/esql/qa/server/multi-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/multi_node/EsqlSpecIT.java b/x-pack/plugin/esql/qa/server/multi-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/multi_node/EsqlSpecIT.java index 427f6460005fd..5ac5e06fc38f1 100644 --- a/x-pack/plugin/esql/qa/server/multi-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/multi_node/EsqlSpecIT.java +++ b/x-pack/plugin/esql/qa/server/multi-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/multi_node/EsqlSpecIT.java @@ -13,15 +13,11 @@ import org.junit.ClassRule; import java.io.IOException; -import java.util.Map; public class EsqlSpecIT extends EsqlSpecTestCase { @ClassRule public static ElasticsearchCluster cluster = Clusters.testCluster(spec -> { - spec.plugin("inference-service-test"); - for (Map.Entry entry : LOGGING_CLUSTER_SETTINGS.entrySet()) { - spec.setting(entry.getKey(), entry.getValue()); - } + spec.plugin("inference-service-test").settings(nodeSpec -> LOGGING_CLUSTER_SETTINGS); }); @Override diff --git a/x-pack/plugin/esql/qa/server/single-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/Clusters.java b/x-pack/plugin/esql/qa/server/single-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/Clusters.java index 9a476d23fccdc..cca5138c8d403 100644 --- a/x-pack/plugin/esql/qa/server/single-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/Clusters.java +++ b/x-pack/plugin/esql/qa/server/single-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/Clusters.java @@ -9,11 +9,7 @@ import org.elasticsearch.test.cluster.ElasticsearchCluster; import org.elasticsearch.test.cluster.local.LocalClusterConfigProvider; -import org.elasticsearch.test.cluster.local.LocalClusterSpecBuilder; import org.elasticsearch.test.cluster.local.distribution.DistributionType; -import org.elasticsearch.xpack.esql.qa.rest.EsqlSpecTestCase; - -import java.util.Map; public class Clusters { @@ -30,10 +26,4 @@ public static ElasticsearchCluster testCluster(LocalClusterConfigProvider config .apply(() -> configProvider) .build(); } - - public static void addAdditionalLoggingSettings(LocalClusterSpecBuilder spec) { - for (Map.Entry entry : EsqlSpecTestCase.LOGGING_CLUSTER_SETTINGS.entrySet()) { - spec.setting(entry.getKey(), entry.getValue()); - } - } } diff --git a/x-pack/plugin/esql/qa/server/single-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/EsqlSpecIT.java b/x-pack/plugin/esql/qa/server/single-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/EsqlSpecIT.java index 0bf8e4583a02e..c0f413317e9ae 100644 --- a/x-pack/plugin/esql/qa/server/single-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/EsqlSpecIT.java +++ b/x-pack/plugin/esql/qa/server/single-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/EsqlSpecIT.java @@ -28,8 +28,9 @@ public class EsqlSpecIT extends EsqlSpecTestCase { @ClassRule public static ElasticsearchCluster cluster = Clusters.testCluster(spec -> { - spec.plugin("inference-service-test").setting("logger." + ComputeService.class.getName(), "DEBUG"); // So we log a profile - Clusters.addAdditionalLoggingSettings(spec); + spec.plugin("inference-service-test") + .setting("logger." + ComputeService.class.getName(), "DEBUG") // So we log a profile + .settings(nodeSpec -> LOGGING_CLUSTER_SETTINGS); }); public EsqlSpecIT(String fileName, String groupName, String testName, Integer lineNumber, CsvTestCase testCase, String instructions) { diff --git a/x-pack/plugin/esql/qa/server/single-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/GenerativeForkIT.java b/x-pack/plugin/esql/qa/server/single-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/GenerativeForkIT.java index 83c6ab2aea877..b84636aeac4ef 100644 --- a/x-pack/plugin/esql/qa/server/single-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/GenerativeForkIT.java +++ b/x-pack/plugin/esql/qa/server/single-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/GenerativeForkIT.java @@ -19,8 +19,7 @@ public class GenerativeForkIT extends GenerativeForkRestTest { @ClassRule public static ElasticsearchCluster cluster = Clusters.testCluster(spec -> { - spec.plugin("inference-service-test"); - Clusters.addAdditionalLoggingSettings(spec); + spec.plugin("inference-service-test").settings(nodeSpec -> LOGGING_CLUSTER_SETTINGS); }); @Override