Spotless

Author: carlosdelest

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/fulltext/Match.java

@@ -128,7 +128,7 @@ public class Match extends FullTextFunction implements Validatable, OptionalArgu
         entry(Fuzziness.FIELD.getPreferredName(), KEYWORD),
         entry(BOOST_FIELD.getPreferredName(), FLOAT),
         entry(FUZZY_TRANSPOSITIONS_FIELD.getPreferredName(), BOOLEAN),
-        entry(FUZZY_REWRITE_FIELD.getPreferredName(),  KEYWORD),
+        entry(FUZZY_REWRITE_FIELD.getPreferredName(), KEYWORD),
         entry(LENIENT_FIELD.getPreferredName(), BOOLEAN),
         entry(MAX_EXPANSIONS_FIELD.getPreferredName(), INTEGER),
         entry(MINIMUM_SHOULD_MATCH_FIELD.getPreferredName(), KEYWORD),
@@ -169,7 +169,7 @@ public Match(
             optional = true
         ) Expression options
     ) {
-        this(source, field, matchQuery, options,null);
+        this(source, field, matchQuery, options, null);
     }
 
     public Match(Source source, Expression field, Expression matchQuery, Expression options, QueryBuilder queryBuilder) {
@@ -267,13 +267,7 @@ private Map<String, Object> parseOptions() throws InvalidArgumentException {
             DataType dataType = ALLOWED_OPTIONS.get(optionName);
             if (dataType == null) {
                 throw new InvalidArgumentException(
-                    format(
-                        null,
-                        "Invalid option [{}] in [{}], expected one of {}",
-                        optionName,
-                        sourceText(),
-                        ALLOWED_OPTIONS.keySet()
-                    )
+                    format(null, "Invalid option [{}] in [{}], expected one of {}", optionName, sourceText(), ALLOWED_OPTIONS.keySet())
                 );
             }
             try {

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/querydsl/query/MatchQuery.java

@@ -38,16 +38,16 @@ public class MatchQuery extends Query {
         // appliers.put("zero_terms_query", (qb, s) -> qb.zeroTermsQuery(s));
         BUILDER_APPLIERS = Map.ofEntries(
             entry(ANALYZER_FIELD.getPreferredName(), (qb, s) -> qb.analyzer(s.toString())),
-            entry(GENERATE_SYNONYMS_PHRASE_QUERY.getPreferredName(), (qb, b) -> qb.autoGenerateSynonymsPhraseQuery((Boolean)b)),
+            entry(GENERATE_SYNONYMS_PHRASE_QUERY.getPreferredName(), (qb, b) -> qb.autoGenerateSynonymsPhraseQuery((Boolean) b)),
             entry(Fuzziness.FIELD.getPreferredName(), (qb, s) -> qb.fuzziness(Fuzziness.fromString(s.toString()))),
-            entry(AbstractQueryBuilder.BOOST_FIELD.getPreferredName(), (qb, s) -> qb.boost((Float)s)),
-            entry(FUZZY_TRANSPOSITIONS_FIELD.getPreferredName(), (qb, s) -> qb.fuzzyTranspositions((Boolean)s)),
-            entry(FUZZY_REWRITE_FIELD.getPreferredName(),  (qb, s) -> qb.fuzzyRewrite(s.toString())),
-            entry(MatchQueryBuilder.LENIENT_FIELD.getPreferredName(), (qb, s) -> qb.lenient((Boolean)s)),
-            entry(MAX_EXPANSIONS_FIELD.getPreferredName(), (qb, s) -> qb.maxExpansions((Integer)s)),
+            entry(AbstractQueryBuilder.BOOST_FIELD.getPreferredName(), (qb, s) -> qb.boost((Float) s)),
+            entry(FUZZY_TRANSPOSITIONS_FIELD.getPreferredName(), (qb, s) -> qb.fuzzyTranspositions((Boolean) s)),
+            entry(FUZZY_REWRITE_FIELD.getPreferredName(), (qb, s) -> qb.fuzzyRewrite(s.toString())),
+            entry(MatchQueryBuilder.LENIENT_FIELD.getPreferredName(), (qb, s) -> qb.lenient((Boolean) s)),
+            entry(MAX_EXPANSIONS_FIELD.getPreferredName(), (qb, s) -> qb.maxExpansions((Integer) s)),
             entry(MINIMUM_SHOULD_MATCH_FIELD.getPreferredName(), (qb, s) -> qb.minimumShouldMatch(s.toString())),
             entry(OPERATOR_FIELD.getPreferredName(), (qb, s) -> qb.operator(Operator.fromString(s.toString()))),
-            entry(PREFIX_LENGTH_FIELD.getPreferredName(), (qb, s) -> qb.prefixLength((Integer)s))
+            entry(PREFIX_LENGTH_FIELD.getPreferredName(), (qb, s) -> qb.prefixLength((Integer) s))
         );
     }
 

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/analysis/VerifierTests.java

@@ -2025,8 +2025,12 @@ public void testMatchOptions() {
 
         // Check all data types for available options
         DataType[] optionTypes = new DataType[] {
-            DataType.INTEGER, DataType.LONG, DataType.FLOAT, DataType.DOUBLE, DataType.KEYWORD, DataType.BOOLEAN
-        };
+            DataType.INTEGER,
+            DataType.LONG,
+            DataType.FLOAT,
+            DataType.DOUBLE,
+            DataType.KEYWORD,
+            DataType.BOOLEAN };
         for (Map.Entry<String, DataType> allowedOptions : Match.ALLOWED_OPTIONS.entrySet()) {
             String optionName = allowedOptions.getKey();
             DataType optionType = allowedOptions.getValue();
@@ -2052,8 +2056,17 @@ public void testMatchOptions() {
                     query(query);
                 } catch (InvalidArgumentException e) {
                     assertEquals(
-                        "1:19: Invalid option [" + optionName + "] in [match(first_name, \"Jean\", {\"" + optionName + "\": "
-                            + queryOptionValue + "})], cannot cast [" + optionValue + "] to [" + optionType.typeName() + "]",
+                        "1:19: Invalid option ["
+                            + optionName
+                            + "] in [match(first_name, \"Jean\", {\""
+                            + optionName
+                            + "\": "
+                            + queryOptionValue
+                            + "})], cannot cast ["
+                            + optionValue
+                            + "] to ["
+                            + optionType.typeName()
+                            + "]",
                         error(query)
                     );
                 }
@@ -2062,8 +2075,9 @@ public void testMatchOptions() {
 
         assertThat(
             error("FROM test | WHERE match(first_name, \"Jean\", {\"unknown_option\": true})"),
-            containsString("1:19: Invalid option [unknown_option] in [match(first_name, \"Jean\", {\"unknown_option\": true})]," +
-                " expected one of ")
+            containsString(
+                "1:19: Invalid option [unknown_option] in [match(first_name, \"Jean\", {\"unknown_option\": true})]," + " expected one of "
+            )
         );
     }
 

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/LocalPhysicalPlanOptimizerTests.java

@@ -1593,8 +1593,7 @@ public void testMatchOptionsPushDown() {
         var actualLuceneQuery = as(fieldExtract.child(), EsQueryExec.class).query();
 
         Source filterSource = new Source(4, 8, "emp_no > 10000");
-        var expectedLuceneQuery = new MatchQueryBuilder("first_name", "Anna")
-            .fuzziness(Fuzziness.AUTO)
+        var expectedLuceneQuery = new MatchQueryBuilder("first_name", "Anna").fuzziness(Fuzziness.AUTO)
             .prefixLength(3)
             .maxExpansions(10)
             .fuzzyTranspositions(false)