Skip to content

Commit e7e4af8

Browse files
author
elasticsearchmachine
committed
[CI] Auto commit changes from spotless
1 parent 3746d99 commit e7e4af8

File tree

5 files changed

+12
-17
lines changed

5 files changed

+12
-17
lines changed

test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,6 @@
135135
import static org.elasticsearch.client.RestClient.IGNORE_RESPONSE_CODES_PARAM;
136136
import static org.elasticsearch.cluster.ClusterState.VERSION_INTRODUCING_TRANSPORT_VERSIONS;
137137
import static org.elasticsearch.core.Strings.format;
138-
import static org.elasticsearch.test.ListMatcher.matchesList;
139138
import static org.elasticsearch.test.MapMatcher.assertMap;
140139
import static org.elasticsearch.test.MapMatcher.matchesMap;
141140
import static org.elasticsearch.test.rest.TestFeatureService.ALL_FEATURES;

x-pack/plugin/esql/qa/security/src/javaRestTest/java/org/elasticsearch/xpack/esql/EsqlSecurityIT.java

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -217,9 +217,10 @@ public void testAliases() throws Exception {
217217
);
218218
assertOK(resp);
219219
Map<String, Object> responseMap = entityAsMap(resp);
220-
MapMatcher matcher = responseMatcher(responseMap)
221-
.entry("columns", List.of(Map.of("name", "sum", "type", "double"), Map.of("name", "index", "type", "keyword")))
222-
.entry("values", List.of(List.of(72.0d, "index-user2")));
220+
MapMatcher matcher = responseMatcher(responseMap).entry(
221+
"columns",
222+
List.of(Map.of("name", "sum", "type", "double"), Map.of("name", "index", "type", "keyword"))
223+
).entry("values", List.of(List.of(72.0d, "index-user2")));
223224
assertMap(responseMap, matcher);
224225
}
225226
}
@@ -229,16 +230,14 @@ public void testAliasFilter() throws Exception {
229230
Response resp = runESQLCommand("alias_user1", "from " + index + " METADATA _index" + "| KEEP _index, org, value | LIMIT 10");
230231
assertOK(resp);
231232
Map<String, Object> responseMap = entityAsMap(resp);
232-
MapMatcher matcher = responseMatcher(responseMap)
233-
.entry(
234-
"columns",
235-
List.of(
236-
Map.of("name", "_index", "type", "keyword"),
237-
Map.of("name", "org", "type", "keyword"),
238-
Map.of("name", "value", "type", "double")
239-
)
233+
MapMatcher matcher = responseMatcher(responseMap).entry(
234+
"columns",
235+
List.of(
236+
Map.of("name", "_index", "type", "keyword"),
237+
Map.of("name", "org", "type", "keyword"),
238+
Map.of("name", "value", "type", "double")
240239
)
241-
.entry("values", List.of(List.of("index-user1", "sales", 31.0d)));
240+
).entry("values", List.of(List.of("index-user1", "sales", 31.0d)));
242241
assertMap(responseMap, matcher);
243242
}
244243
}

x-pack/plugin/esql/qa/server/multi-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/MultiClustersIT.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
import java.util.stream.Stream;
3838

3939
import static org.elasticsearch.test.MapMatcher.assertMap;
40-
import static org.elasticsearch.test.MapMatcher.matchesMap;
4140
import static org.elasticsearch.xpack.esql.ccq.Clusters.REMOTE_CLUSTER_NAME;
4241
import static org.hamcrest.Matchers.*;
4342

x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/FieldExtractorTestCase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1580,7 +1580,7 @@ void test(Object value, Object expectedValue) throws IOException {
15801580
values = values.item(expectedValue);
15811581
}
15821582

1583-
assertResultMap(result, columns,List.of(values));
1583+
assertResultMap(result, columns, List.of(values));
15841584
}
15851585

15861586
void createIndex(String name, String fieldName) throws IOException {

x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/RequestIndexFilteringTestCase.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,12 @@
2626
import java.util.Map;
2727

2828
import static org.elasticsearch.test.ListMatcher.matchesList;
29-
import static org.elasticsearch.test.MapMatcher.assertMap;
3029
import static org.elasticsearch.test.MapMatcher.matchesMap;
3130
import static org.elasticsearch.xpack.esql.qa.rest.RestEsqlTestCase.entityToMap;
3231
import static org.elasticsearch.xpack.esql.qa.rest.RestEsqlTestCase.requestObjectBuilder;
3332
import static org.hamcrest.Matchers.allOf;
3433
import static org.hamcrest.Matchers.anyOf;
3534
import static org.hamcrest.Matchers.containsString;
36-
import static org.hamcrest.Matchers.greaterThanOrEqualTo;
3735
import static org.hamcrest.Matchers.hasSize;
3836
import static org.hamcrest.Matchers.instanceOf;
3937
import static org.hamcrest.Matchers.nullValue;

0 commit comments

Comments
 (0)