Skip to content

Commit 1dd6669

Browse files
committed
Spotless
1 parent a72a293 commit 1dd6669

File tree

2 files changed

+33
-12
lines changed

2 files changed

+33
-12
lines changed

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/RequestXContent.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -339,11 +339,7 @@ private static void checkParamValueValidity(
339339
errors.add(
340340
new XContentParseException(
341341
loc,
342-
entry.getKey()
343-
+ " parameter has values from different types, found "
344-
+ type
345-
+ " and "
346-
+ currentType
342+
entry.getKey() + " parameter has values from different types, found " + type + " and " + currentType
347343
)
348344
);
349345
break;

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/action/EsqlQueryRequestTests.java

Lines changed: 32 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,10 @@ public void testInvalidParamsForIdentifiersPatterns() throws IOException {
384384

385385
Exception e1 = expectThrows(XContentParseException.class, () -> parseEsqlQueryRequestSync(json1));
386386
String message = e1.getCause().getMessage();
387-
assertThat(message, containsString("[2:15] [v] is not a valid param attribute, a valid attribute is any of VALUE, IDENTIFIER, PATTERN; "));
387+
assertThat(
388+
message,
389+
containsString("[2:15] [v] is not a valid param attribute, a valid attribute is any of VALUE, IDENTIFIER, PATTERN; ")
390+
);
388391
assertThat(message, containsString("[2:38] [n2] has multiple param attributes [identifier, pattern],"));
389392
assertThat(message, containsString("only one of VALUE, IDENTIFIER, PATTERN can be defined in a param;"));
390393
assertThat(message, containsString("[2:38] [v2] is not a valid value for PATTERN parameter,"));
@@ -401,17 +404,39 @@ public void testInvalidParamsForIdentifiersPatterns() throws IOException {
401404
assertThat(message, containsString("[4:36] [{a6.1=v6.1, a6.2=v6.2}] is not a valid value for IDENTIFIER parameter,"));
402405
assertThat(message, containsString("a valid value for IDENTIFIER parameter is a string;"));
403406
assertThat(message, containsString("[4:36] n6={identifier={a6.1=v6.1, a6.2=v6.2}} is not supported as a parameter;"));
404-
assertThat(message, containsString("[4:98] [n7] has no valid param attribute, only one of VALUE, IDENTIFIER, PATTERN can be defined in a param;"));
405-
assertThat(message, containsString("[5:34] n9={identifier=[x, y]} parameter is multivalued, only VALUE parameters can be multivalued;"));
406-
assertThat(message, containsString("[5:72] n10={pattern=[x*, y*]} parameter is multivalued, only VALUE parameters can be multivalued;"));
407+
assertThat(
408+
message,
409+
containsString("[4:98] [n7] has no valid param attribute, only one of VALUE, IDENTIFIER, PATTERN can be defined in a param;")
410+
);
411+
assertThat(
412+
message,
413+
containsString("[5:34] n9={identifier=[x, y]} parameter is multivalued, only VALUE parameters can be multivalued;")
414+
);
415+
assertThat(
416+
message,
417+
containsString("[5:72] n10={pattern=[x*, y*]} parameter is multivalued, only VALUE parameters can be multivalued;")
418+
);
407419
assertThat(message, containsString("a valid value for PATTERN parameter is a string and contains *;"));
408-
assertThat(message, containsString("[6:1] [1] is not a valid value for IDENTIFIER parameter, a valid value for IDENTIFIER parameter is a string;"));
420+
assertThat(
421+
message,
422+
containsString("[6:1] [1] is not a valid value for IDENTIFIER parameter, a valid value for IDENTIFIER parameter is a string;")
423+
);
409424
assertThat(message, containsString("[6:31] [true] is not a valid value for PATTERN parameter,"));
410425
assertThat(message, containsString("a valid value for PATTERN parameter is a string and contains *;"));
411-
assertThat(message, containsString("[6:61] [null] is not a valid value for IDENTIFIER parameter, a valid value for IDENTIFIER parameter is a string;"));
426+
assertThat(
427+
message,
428+
containsString(
429+
"[6:61] [null] is not a valid value for IDENTIFIER parameter, a valid value for IDENTIFIER parameter is a string;"
430+
)
431+
);
412432
assertThat(message, containsString("[6:94] [v14] is not a valid value for PATTERN parameter,"));
413433
assertThat(message, containsString("a valid value for PATTERN parameter is a string and contains *;"));
414-
assertThat(message, containsString("[7:1] Cannot parse more than one key:value pair as parameter, found [{n16:{identifier=v16}}, {n15:{pattern=v15*}}"));
434+
assertThat(
435+
message,
436+
containsString(
437+
"[7:1] Cannot parse more than one key:value pair as parameter, found [{n16:{identifier=v16}}, {n15:{pattern=v15*}}"
438+
)
439+
);
415440
}
416441

417442
// Test for https://github.com/elastic/elasticsearch/issues/110028

0 commit comments

Comments
 (0)