Skip to content

Commit c240279

Browse files
committed
ESQL: Apply precommit plugins to qa
We're not properly applying the precommit plugins the more modern qa projects. We'll likely apply it globally soon, but for now this applies it to all of ESQL's qa projects.
1 parent 0c1b3ac commit c240279

File tree

7 files changed

+39
-11
lines changed

7 files changed

+39
-11
lines changed

x-pack/plugin/esql/qa/server/mixed-cluster/build.gradle

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ apply plugin: 'elasticsearch.internal-java-rest-test'
1414
apply plugin: 'elasticsearch.internal-yaml-rest-test'
1515
apply plugin: 'elasticsearch.internal-test-artifact'
1616
apply plugin: 'elasticsearch.bwc-test'
17+
apply plugin: org.elasticsearch.gradle.internal.precommit.CheckstylePrecommitPlugin
18+
apply plugin: org.elasticsearch.gradle.internal.precommit.ForbiddenApisPrecommitPlugin
19+
apply plugin: org.elasticsearch.gradle.internal.precommit.ForbiddenPatternsPrecommitPlugin
20+
apply plugin: org.elasticsearch.gradle.internal.precommit.FilePermissionsPrecommitPlugin
21+
apply plugin: org.elasticsearch.gradle.internal.precommit.LoggerUsagePrecommitPlugin
22+
apply plugin: org.elasticsearch.gradle.internal.precommit.TestingConventionsPrecommitPlugin
1723

1824
restResources {
1925
restApi {

x-pack/plugin/esql/qa/server/multi-clusters/build.gradle

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask
1010

1111
apply plugin: 'elasticsearch.internal-java-rest-test'
1212
apply plugin: 'elasticsearch.bwc-test'
13+
apply plugin: org.elasticsearch.gradle.internal.precommit.CheckstylePrecommitPlugin
14+
apply plugin: org.elasticsearch.gradle.internal.precommit.ForbiddenApisPrecommitPlugin
15+
apply plugin: org.elasticsearch.gradle.internal.precommit.ForbiddenPatternsPrecommitPlugin
16+
apply plugin: org.elasticsearch.gradle.internal.precommit.FilePermissionsPrecommitPlugin
17+
apply plugin: org.elasticsearch.gradle.internal.precommit.LoggerUsagePrecommitPlugin
18+
apply plugin: org.elasticsearch.gradle.internal.precommit.TestingConventionsPrecommitPlugin
1319

1420
dependencies {
1521
javaRestTestImplementation project(xpackModule('esql:qa:testFixtures'))

x-pack/plugin/esql/qa/server/multi-node/build.gradle

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ import org.elasticsearch.gradle.util.GradleUtils
33
apply plugin: 'elasticsearch.internal-java-rest-test'
44
apply plugin: 'elasticsearch.internal-yaml-rest-test'
55
apply plugin: 'elasticsearch.internal-test-artifact'
6+
apply plugin: org.elasticsearch.gradle.internal.precommit.CheckstylePrecommitPlugin
7+
apply plugin: org.elasticsearch.gradle.internal.precommit.ForbiddenApisPrecommitPlugin
8+
apply plugin: org.elasticsearch.gradle.internal.precommit.ForbiddenPatternsPrecommitPlugin
9+
apply plugin: org.elasticsearch.gradle.internal.precommit.FilePermissionsPrecommitPlugin
10+
apply plugin: org.elasticsearch.gradle.internal.precommit.LoggerUsagePrecommitPlugin
11+
apply plugin: org.elasticsearch.gradle.internal.precommit.TestingConventionsPrecommitPlugin
612

713
dependencies {
814
javaRestTestImplementation project(xpackModule('esql:qa:testFixtures'))

x-pack/plugin/esql/qa/server/single-node/build.gradle

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@ apply plugin: 'elasticsearch.internal-java-rest-test'
22
apply plugin: 'elasticsearch.internal-yaml-rest-test'
33
// Necessary to use tests in Serverless
44
apply plugin: 'elasticsearch.internal-test-artifact'
5+
apply plugin: org.elasticsearch.gradle.internal.precommit.CheckstylePrecommitPlugin
6+
apply plugin: org.elasticsearch.gradle.internal.precommit.ForbiddenApisPrecommitPlugin
7+
apply plugin: org.elasticsearch.gradle.internal.precommit.ForbiddenPatternsPrecommitPlugin
8+
apply plugin: org.elasticsearch.gradle.internal.precommit.FilePermissionsPrecommitPlugin
9+
apply plugin: org.elasticsearch.gradle.internal.precommit.LoggerUsagePrecommitPlugin
10+
apply plugin: org.elasticsearch.gradle.internal.precommit.TestingConventionsPrecommitPlugin
511

612
dependencies {
713
javaRestTestImplementation project(xpackModule('esql:qa:testFixtures'))

x-pack/plugin/esql/qa/server/single-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/PushQueriesIT.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import java.io.IOException;
2525
import java.util.ArrayList;
2626
import java.util.List;
27+
import java.util.Locale;
2728
import java.util.Map;
2829
import java.util.regex.Pattern;
2930

@@ -164,7 +165,7 @@ private void indexValue(String value) throws IOException {
164165

165166
Request bulk = new Request("POST", "/_bulk");
166167
bulk.addParameter("refresh", "");
167-
bulk.setJsonEntity(String.format("""
168+
bulk.setJsonEntity(String.format(Locale.ROOT, """
168169
{"create":{"_index":"test"}}
169170
{"test":"%s"}
170171
""", value));

x-pack/plugin/esql/qa/server/single-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/RestEsqlIT.java

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -707,13 +707,13 @@ public void testSuggestedCast() throws IOException {
707707
"default_metric": "max"
708708
""";
709709
}
710-
createIndex("index-" + type.esType(), null, """
710+
createIndex("index-" + type.esType(), null, String.format(Locale.ROOT, """
711711
"properties": {
712712
"my_field": {
713713
"type": "%s" %s
714714
}
715715
}
716-
""".formatted(type.esType(), additionalProperties));
716+
""", type.esType(), additionalProperties));
717717
Request doc = new Request("PUT", "index-" + type.esType() + "/_doc/1");
718718
doc.setJsonEntity("{\"my_field\": " + typesAndValues.get(type) + "}");
719719
client().performRequest(doc);
@@ -724,11 +724,11 @@ public void testSuggestedCast() throws IOException {
724724

725725
for (int i = 0; i < listOfTypes.size(); i++) {
726726
for (int j = i + 1; j < listOfTypes.size(); j++) {
727-
String query = """
727+
String query = String.format(Locale.ROOT, """
728728
{
729729
"query": "FROM index-%s,index-%s | LIMIT 100 | KEEP my_field"
730730
}
731-
""".formatted(listOfTypes.get(i).esType(), listOfTypes.get(j).esType());
731+
""", listOfTypes.get(i).esType(), listOfTypes.get(j).esType());
732732
Request request = new Request("POST", "/_query");
733733
request.setJsonEntity(query);
734734
Response resp = client().performRequest(request);
@@ -749,11 +749,13 @@ public void testSuggestedCast() throws IOException {
749749
)
750750
);
751751

752-
String castedQuery = """
753-
{
754-
"query": "FROM index-%s,index-%s | LIMIT 100 | EVAL my_field = my_field::%s"
755-
}
756-
""".formatted(
752+
String castedQuery = String.format(
753+
Locale.ROOT,
754+
"""
755+
{
756+
"query": "FROM index-%s,index-%s | LIMIT 100 | EVAL my_field = my_field::%s"
757+
}
758+
""",
757759
listOfTypes.get(i).esType(),
758760
listOfTypes.get(j).esType(),
759761
suggestedCast == DataType.KEYWORD ? "STRING" : suggestedCast.nameUpper()

x-pack/plugin/esql/qa/server/single-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/StoredFieldsSequentialIT.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@
3838
import static org.elasticsearch.xpack.esql.qa.rest.RestEsqlTestCase.runEsql;
3939
import static org.elasticsearch.xpack.esql.qa.single_node.RestEsqlIT.commonProfile;
4040
import static org.elasticsearch.xpack.esql.qa.single_node.RestEsqlIT.fixTypesOnProfile;
41-
import static org.hamcrest.Matchers.*;
41+
import static org.hamcrest.Matchers.greaterThanOrEqualTo;
42+
import static org.hamcrest.Matchers.instanceOf;
4243

4344
/**
4445
* Tests for {@code index.esql.stored_fields_sequential_proportion} which controls

0 commit comments

Comments
 (0)