Address code review feedback

Author: julian-elastic

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

@@ -31,9 +31,6 @@
 import java.io.IOException;
 import java.util.Objects;
 
-import static org.elasticsearch.TransportVersions.ESQL_FIXED_INDEX_LIKE_8_19;
-import static org.elasticsearch.TransportVersions.ESQL_FIXED_INDEX_LIKE_9_1;
-
 /**
  * Implements the wildcard search query. Supported wildcards are {@code *}, which
  * matches any character sequence (including the empty one), and {@code ?},
@@ -109,9 +106,7 @@ public WildcardQueryBuilder(StreamInput in) throws IOException {
         if (in.getTransportVersion().onOrAfter(TransportVersions.V_7_10_0)) {
             caseInsensitive = in.readBoolean();
         }
-        if (in.getTransportVersion().onOrAfter(TransportVersions.ESQL_FIXED_INDEX_LIKE)
-            || in.getTransportVersion().isPatchFrom(ESQL_FIXED_INDEX_LIKE_8_19)
-            || in.getTransportVersion().isPatchFrom(ESQL_FIXED_INDEX_LIKE_9_1)) {
+        if (expressionTransportSupported(in.getTransportVersion())) {
             forceStringMatch = in.readBoolean();
         } else {
             forceStringMatch = false;
@@ -126,13 +121,20 @@ protected void doWriteTo(StreamOutput out) throws IOException {
         if (out.getTransportVersion().onOrAfter(TransportVersions.V_7_10_0)) {
             out.writeBoolean(caseInsensitive);
         }
-        if (out.getTransportVersion().onOrAfter(TransportVersions.ESQL_FIXED_INDEX_LIKE)
-            || out.getTransportVersion().isPatchFrom(ESQL_FIXED_INDEX_LIKE_8_19)
-            || out.getTransportVersion().isPatchFrom(ESQL_FIXED_INDEX_LIKE_9_1)) {
+        if (expressionTransportSupported(out.getTransportVersion())) {
             out.writeBoolean(forceStringMatch);
         }
     }
 
+    /**
+     * Returns true if the Transport version is compatible with ESQL_FIXED_INDEX_LIKE
+     */
+    public static boolean expressionTransportSupported(TransportVersion version) {
+        return version.onOrAfter(TransportVersions.ESQL_FIXED_INDEX_LIKE)
+            || version.isPatchFrom(TransportVersions.ESQL_FIXED_INDEX_LIKE_8_19)
+            || version.isPatchFrom(TransportVersions.ESQL_FIXED_INDEX_LIKE_9_1);
+    }
+
     @Override
     public String fieldName() {
         return fieldName;

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

@@ -11,7 +11,6 @@
 import org.apache.lucene.util.automaton.Automaton;
 import org.apache.lucene.util.automaton.CharacterRunAutomaton;
 import org.elasticsearch.TransportVersion;
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -35,8 +34,7 @@
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
-import static org.elasticsearch.TransportVersions.ESQL_FIXED_INDEX_LIKE_8_19;
-import static org.elasticsearch.TransportVersions.ESQL_FIXED_INDEX_LIKE_9_1;
+import static org.elasticsearch.index.query.WildcardQueryBuilder.expressionTransportSupported;
 
 public class WildcardLikeList extends RegexMatch<WildcardPatternList> {
     public static final NamedWriteableRegistry.Entry ENTRY = new NamedWriteableRegistry.Entry(
@@ -148,10 +146,7 @@ public Query asQuery(LucenePushdownPredicates pushdownPredicates, TranslatorHand
     }
 
     private boolean supportsPushdown(TransportVersion version) {
-        return version == null
-            || version.onOrAfter(TransportVersions.ESQL_FIXED_INDEX_LIKE)
-            || version.isPatchFrom(ESQL_FIXED_INDEX_LIKE_8_19)
-            || version.isPatchFrom(ESQL_FIXED_INDEX_LIKE_9_1);
+        return version == null || expressionTransportSupported(version);
     }
 
     @Override

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/io/stream/PlanStreamWrapperQueryBuilder.java

@@ -20,6 +20,8 @@
 
 import java.io.IOException;
 
+import static org.elasticsearch.index.query.WildcardQueryBuilder.expressionTransportSupported;
+
 /**
  * A {@link QueryBuilder} that wraps another {@linkplain QueryBuilder}
  * so it read with a {@link PlanStreamInput}.
@@ -58,9 +60,7 @@ public TransportVersion getMinimalSupportedVersion() {
 
     @Override
     public boolean supportsVersion(TransportVersion version) {
-        return version.onOrAfter(TransportVersions.ESQL_FIXED_INDEX_LIKE)
-            || version.isPatchFrom(TransportVersions.ESQL_FIXED_INDEX_LIKE_8_19)
-            || version.isPatchFrom(TransportVersions.ESQL_FIXED_INDEX_LIKE_9_1);
+        return expressionTransportSupported(version);
     }
 
     @Override