diff --git a/x-pack/plugin/esql/qa/server/mixed-cluster/build.gradle b/x-pack/plugin/esql/qa/server/mixed-cluster/build.gradle index 971eed1c6795d..c0d1605af0753 100644 --- a/x-pack/plugin/esql/qa/server/mixed-cluster/build.gradle +++ b/x-pack/plugin/esql/qa/server/mixed-cluster/build.gradle @@ -14,6 +14,12 @@ apply plugin: 'elasticsearch.internal-java-rest-test' apply plugin: 'elasticsearch.internal-yaml-rest-test' apply plugin: 'elasticsearch.internal-test-artifact' apply plugin: 'elasticsearch.bwc-test' +apply plugin: org.elasticsearch.gradle.internal.precommit.CheckstylePrecommitPlugin +apply plugin: org.elasticsearch.gradle.internal.precommit.ForbiddenApisPrecommitPlugin +apply plugin: org.elasticsearch.gradle.internal.precommit.ForbiddenPatternsPrecommitPlugin +apply plugin: org.elasticsearch.gradle.internal.precommit.FilePermissionsPrecommitPlugin +apply plugin: org.elasticsearch.gradle.internal.precommit.LoggerUsagePrecommitPlugin +apply plugin: org.elasticsearch.gradle.internal.precommit.TestingConventionsPrecommitPlugin restResources { restApi { diff --git a/x-pack/plugin/esql/qa/server/multi-clusters/build.gradle b/x-pack/plugin/esql/qa/server/multi-clusters/build.gradle index d80cb764ca433..a44c33f72ada4 100644 --- a/x-pack/plugin/esql/qa/server/multi-clusters/build.gradle +++ b/x-pack/plugin/esql/qa/server/multi-clusters/build.gradle @@ -10,6 +10,12 @@ import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask apply plugin: 'elasticsearch.internal-java-rest-test' apply plugin: 'elasticsearch.bwc-test' +apply plugin: org.elasticsearch.gradle.internal.precommit.CheckstylePrecommitPlugin +apply plugin: org.elasticsearch.gradle.internal.precommit.ForbiddenApisPrecommitPlugin +apply plugin: org.elasticsearch.gradle.internal.precommit.ForbiddenPatternsPrecommitPlugin +apply plugin: org.elasticsearch.gradle.internal.precommit.FilePermissionsPrecommitPlugin +apply plugin: org.elasticsearch.gradle.internal.precommit.LoggerUsagePrecommitPlugin +apply plugin: org.elasticsearch.gradle.internal.precommit.TestingConventionsPrecommitPlugin dependencies { javaRestTestImplementation project(xpackModule('esql:qa:testFixtures')) diff --git a/x-pack/plugin/esql/qa/server/multi-node/build.gradle b/x-pack/plugin/esql/qa/server/multi-node/build.gradle index 846b55a12de04..beb1efb6b890f 100644 --- a/x-pack/plugin/esql/qa/server/multi-node/build.gradle +++ b/x-pack/plugin/esql/qa/server/multi-node/build.gradle @@ -3,6 +3,12 @@ import org.elasticsearch.gradle.util.GradleUtils apply plugin: 'elasticsearch.internal-java-rest-test' apply plugin: 'elasticsearch.internal-yaml-rest-test' apply plugin: 'elasticsearch.internal-test-artifact' +apply plugin: org.elasticsearch.gradle.internal.precommit.CheckstylePrecommitPlugin +apply plugin: org.elasticsearch.gradle.internal.precommit.ForbiddenApisPrecommitPlugin +apply plugin: org.elasticsearch.gradle.internal.precommit.ForbiddenPatternsPrecommitPlugin +apply plugin: org.elasticsearch.gradle.internal.precommit.FilePermissionsPrecommitPlugin +apply plugin: org.elasticsearch.gradle.internal.precommit.LoggerUsagePrecommitPlugin +apply plugin: org.elasticsearch.gradle.internal.precommit.TestingConventionsPrecommitPlugin dependencies { javaRestTestImplementation project(xpackModule('esql:qa:testFixtures')) diff --git a/x-pack/plugin/esql/qa/server/single-node/build.gradle b/x-pack/plugin/esql/qa/server/single-node/build.gradle index 48880634fe348..03f2383ecfcd9 100644 --- a/x-pack/plugin/esql/qa/server/single-node/build.gradle +++ b/x-pack/plugin/esql/qa/server/single-node/build.gradle @@ -2,6 +2,12 @@ apply plugin: 'elasticsearch.internal-java-rest-test' apply plugin: 'elasticsearch.internal-yaml-rest-test' // Necessary to use tests in Serverless apply plugin: 'elasticsearch.internal-test-artifact' +apply plugin: org.elasticsearch.gradle.internal.precommit.CheckstylePrecommitPlugin +apply plugin: org.elasticsearch.gradle.internal.precommit.ForbiddenApisPrecommitPlugin +apply plugin: org.elasticsearch.gradle.internal.precommit.ForbiddenPatternsPrecommitPlugin +apply plugin: org.elasticsearch.gradle.internal.precommit.FilePermissionsPrecommitPlugin +apply plugin: org.elasticsearch.gradle.internal.precommit.LoggerUsagePrecommitPlugin +apply plugin: org.elasticsearch.gradle.internal.precommit.TestingConventionsPrecommitPlugin dependencies { javaRestTestImplementation project(xpackModule('esql:qa:testFixtures')) diff --git a/x-pack/plugin/esql/qa/server/single-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/PushQueriesIT.java b/x-pack/plugin/esql/qa/server/single-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/PushQueriesIT.java index 00a77a14b39ad..272f884addc4c 100644 --- a/x-pack/plugin/esql/qa/server/single-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/PushQueriesIT.java +++ b/x-pack/plugin/esql/qa/server/single-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/PushQueriesIT.java @@ -24,6 +24,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.regex.Pattern; @@ -164,7 +165,7 @@ private void indexValue(String value) throws IOException { Request bulk = new Request("POST", "/_bulk"); bulk.addParameter("refresh", ""); - bulk.setJsonEntity(String.format(""" + bulk.setJsonEntity(String.format(Locale.ROOT, """ {"create":{"_index":"test"}} {"test":"%s"} """, value)); diff --git a/x-pack/plugin/esql/qa/server/single-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/RestEsqlIT.java b/x-pack/plugin/esql/qa/server/single-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/RestEsqlIT.java index 1ea347578659c..d902f32c16c45 100644 --- a/x-pack/plugin/esql/qa/server/single-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/RestEsqlIT.java +++ b/x-pack/plugin/esql/qa/server/single-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/RestEsqlIT.java @@ -707,13 +707,13 @@ public void testSuggestedCast() throws IOException { "default_metric": "max" """; } - createIndex("index-" + type.esType(), null, """ + createIndex("index-" + type.esType(), null, String.format(Locale.ROOT, """ "properties": { "my_field": { "type": "%s" %s } } - """.formatted(type.esType(), additionalProperties)); + """, type.esType(), additionalProperties)); Request doc = new Request("PUT", "index-" + type.esType() + "/_doc/1"); doc.setJsonEntity("{\"my_field\": " + typesAndValues.get(type) + "}"); client().performRequest(doc); @@ -724,11 +724,11 @@ public void testSuggestedCast() throws IOException { for (int i = 0; i < listOfTypes.size(); i++) { for (int j = i + 1; j < listOfTypes.size(); j++) { - String query = """ + String query = String.format(Locale.ROOT, """ { "query": "FROM index-%s,index-%s | LIMIT 100 | KEEP my_field" } - """.formatted(listOfTypes.get(i).esType(), listOfTypes.get(j).esType()); + """, listOfTypes.get(i).esType(), listOfTypes.get(j).esType()); Request request = new Request("POST", "/_query"); request.setJsonEntity(query); Response resp = client().performRequest(request); @@ -749,11 +749,13 @@ public void testSuggestedCast() throws IOException { ) ); - String castedQuery = """ - { - "query": "FROM index-%s,index-%s | LIMIT 100 | EVAL my_field = my_field::%s" - } - """.formatted( + String castedQuery = String.format( + Locale.ROOT, + """ + { + "query": "FROM index-%s,index-%s | LIMIT 100 | EVAL my_field = my_field::%s" + } + """, listOfTypes.get(i).esType(), listOfTypes.get(j).esType(), suggestedCast == DataType.KEYWORD ? "STRING" : suggestedCast.nameUpper() diff --git a/x-pack/plugin/esql/qa/server/single-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/StoredFieldsSequentialIT.java b/x-pack/plugin/esql/qa/server/single-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/StoredFieldsSequentialIT.java index 46b692b04ffe5..088fb3bbfce56 100644 --- a/x-pack/plugin/esql/qa/server/single-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/StoredFieldsSequentialIT.java +++ b/x-pack/plugin/esql/qa/server/single-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/StoredFieldsSequentialIT.java @@ -38,7 +38,8 @@ import static org.elasticsearch.xpack.esql.qa.rest.RestEsqlTestCase.runEsql; import static org.elasticsearch.xpack.esql.qa.single_node.RestEsqlIT.commonProfile; import static org.elasticsearch.xpack.esql.qa.single_node.RestEsqlIT.fixTypesOnProfile; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.greaterThanOrEqualTo; +import static org.hamcrest.Matchers.instanceOf; /** * Tests for {@code index.esql.stored_fields_sequential_proportion} which controls