Address code review feedback

Author: julian-elastic

server/src/main/java/org/elasticsearch/index/query/AutomatonQueryBuilder.java

@@ -24,15 +24,14 @@
 
 /**
  * Implements an Automaton query, which matches documents based on a Lucene Automaton.
- * It does not support serialization or XContent representation,
+ * It does not support serialization or XContent representation.
  */
 public class AutomatonQueryBuilder extends AbstractQueryBuilder<AutomatonQueryBuilder> implements MultiTermQueryBuilder {
     private final String fieldName;
     private final Automaton automaton;
     private final String description;
 
     public AutomatonQueryBuilder(String fieldName, Automaton automaton, String description) {
-        this.description = description;
         if (Strings.isEmpty(fieldName)) {
             throw new IllegalArgumentException("field name is null or empty");
         }
@@ -41,6 +40,7 @@ public AutomatonQueryBuilder(String fieldName, Automaton automaton, String descr
         }
         this.fieldName = fieldName;
         this.automaton = automaton;
+        this.description = description;
     }
 
     @Override
@@ -70,12 +70,14 @@ protected Query doToQuery(SearchExecutionContext context) throws IOException {
 
     @Override
     protected int doHashCode() {
-        return Objects.hash(fieldName, automaton);
+        return Objects.hash(fieldName, automaton, description);
     }
 
     @Override
     protected boolean doEquals(AutomatonQueryBuilder other) {
-        return Objects.equals(fieldName, other.fieldName) && Objects.equals(automaton, other.automaton);
+        return Objects.equals(fieldName, other.fieldName)
+            && Objects.equals(automaton, other.automaton)
+            && Objects.equals(description, other.description);
     }
 
     @Override
@@ -93,10 +95,10 @@ static class AutomatonQueryWithDescription extends AutomatonQuery {
 
         @Override
         public String toString(String field) {
-            if (description.isEmpty()) {
-                return super.toString(field);
+            if (this.field.equals(field)) {
+                return description;
             }
-            return description;
+            return this.field + ":" + description;
         }
     }
 }

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

@@ -266,7 +266,7 @@ public void testLikeList() throws IOException {
         String luceneQuery = switch (type) {
             case CONSTANT_KEYWORD, MATCH_ONLY_TEXT_WITH_KEYWORD, AUTO, TEXT_WITH_KEYWORD -> "*:*";
             case SEMANTIC_TEXT_WITH_KEYWORD -> "FieldExistsQuery [field=_primary_term]";
-            case KEYWORD -> "Automaton for test LIKE (\"%value*\", \"abc*\"), caseInsensitive=false";
+            case KEYWORD -> "test:LIKE(\"%value*\", \"abc*\"), caseInsensitive=false";
         };
         ComputeSignature dataNodeSignature = switch (type) {
             case CONSTANT_KEYWORD, KEYWORD -> ComputeSignature.FILTER_IN_QUERY;

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/string/regex/WildcardLikeList.java

@@ -123,6 +123,6 @@ private Query translateField(String targetFieldName) {
     private String getAutomatonDescription(String targetFieldName) {
         // we use all the information used the create the automaton to describe the query here
         String patternDesc = pattern().patternList().stream().map(WildcardPattern::pattern).collect(Collectors.joining("\", \""));
-        return "Automaton for " + targetFieldName + " LIKE (\"" + patternDesc + "\"), caseInsensitive=" + caseInsensitive();
+        return "LIKE(\"" + patternDesc + "\"), caseInsensitive=" + caseInsensitive();
     }
 }