Address code review comments

Author: julian-elastic

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

@@ -115,6 +115,7 @@ public Query asQuery(LucenePushdownPredicates pushdownPredicates, TranslatorHand
      * Pushes down string casing optimization for a single pattern using the provided predicate.
      * Returns a new RLike with case insensitivity or a Literal.FALSE if not matched.
      */
+    @Override
     public Expression optimizeStringCasingWithInsensitiveRegexMatch(Expression unwrappedField, Predicate<String> matchesCaseFn) {
         if (matchesCaseFn.test(pattern().pattern()) == false) {
             return Literal.of(this, Boolean.FALSE);

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

@@ -152,6 +152,7 @@ public org.apache.lucene.search.Query asLuceneQuery(
      * Pushes down string casing optimization by filtering patterns using the provided predicate.
      * Returns a new RegexMatch or a Literal.FALSE if none match.
      */
+    @Override
     public Expression optimizeStringCasingWithInsensitiveRegexMatch(Expression unwrappedField, Predicate<String> matchesCaseFn) {
         List<RLikePattern> filtered = pattern().patternList()
             .stream()

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

@@ -139,6 +139,7 @@ private Query translateField(String targetFieldName, boolean forceStringMatch) {
      * Pushes down string casing optimization for a single pattern using the provided predicate.
      * Returns a new WildcardLike with case insensitivity or a Literal.FALSE if not matched.
      */
+    @Override
     public Expression optimizeStringCasingWithInsensitiveRegexMatch(Expression unwrappedField, Predicate<String> matchesCaseFn) {
         if (matchesCaseFn.test(pattern().pattern()) == false) {
             return Literal.of(this, Boolean.FALSE);

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

@@ -185,6 +185,7 @@ private Query translateField(String targetFieldName) {
      * Pushes down string casing optimization by filtering patterns using the provided predicate.
      * Returns a new RegexMatch or a Literal.FALSE if none match.
      */
+    @Override
     public Expression optimizeStringCasingWithInsensitiveRegexMatch(Expression unwrappedField, Predicate<String> matchesCaseFn) {
         List<WildcardPattern> filtered = pattern().patternList()
             .stream()

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

@@ -781,16 +781,16 @@ public void testReplaceUpperStringCasingWithInsensitiveLikeList() {
 
     // same plan as above, but mixed case pattern and list of patterns
     public void testReplaceLowerStringCasingWithMixedCaseLikeList() {
-        var plan = localPlan("FROM test | WHERE TO_LOWER(TO_UPPER(first_name)) RLIKE (\"TEST*\", \"valü*\", \"vaLü*\")");
+        var plan = localPlan("FROM test | WHERE TO_LOWER(TO_UPPER(first_name)) LIKE (\"TEST*\", \"valü*\", \"vaLü*\")");
         var limit = as(plan, Limit.class);
         var filter = as(limit.child(), Filter.class);
-        var rLikeList = as(filter.condition(), RLikeList.class);
-        var field = as(rLikeList.field(), FieldAttribute.class);
+        var likeList = as(filter.condition(), WildcardLikeList.class);
+        var field = as(likeList.field(), FieldAttribute.class);
         assertThat(field.fieldName().string(), is("first_name"));
         // only the all lowercase pattern is kept, the mixed case and all uppercase patterns are ignored
-        assertEquals(1, rLikeList.pattern().patternList().size());
-        assertThat(rLikeList.pattern().patternList().get(0).pattern(), is("valü*"));
-        assertThat(rLikeList.caseInsensitive(), is(true));
+        assertEquals(1, likeList.pattern().patternList().size());
+        assertThat(likeList.pattern().patternList().get(0).pattern(), is("valü*"));
+        assertThat(likeList.caseInsensitive(), is(true));
         var source = as(filter.child(), EsRelation.class);
     }
 
@@ -830,6 +830,17 @@ public void testReplaceStringCasingAndLikeListWithLocalRelation() {
         assertThat(local.supplier(), equalTo(EmptyLocalSupplier.EMPTY));
     }
 
+    /**
+     * LocalRelation[[_meta_field{f}#9, emp_no{f}#3, first_name{f}#4, gender{f}#5, hire_date{f}#10, job{f}#11, job.raw{f}#12, langu
+     *   ages{f}#6, last_name{f}#7, long_noidx{f}#13, salary{f}#8],EMPTY]
+     */
+    public void testReplaceStringCasingAndRLikeListWithLocalRelation() {
+        var plan = localPlan("FROM test | WHERE TO_LOWER(TO_UPPER(first_name)) RLIKE (\"VALÜ*\", \"TEST*\")");
+
+        var local = as(plan, LocalRelation.class);
+        assertThat(local.supplier(), equalTo(EmptyLocalSupplier.EMPTY));
+    }
+
     /**
      * Limit[1000[INTEGER],false]
      * \_Aggregate[[],[SUM($$integer_long_field$converted_to$long{f$}#5,true[BOOLEAN]) AS sum(integer_long_field::long)#3]]