rename

Author: idegtiarenko

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/session/EsqlSession.java

@@ -743,7 +743,7 @@ private static void analyzeAndMaybeRetry(
     }
 
     private static void resolveFieldNames(LogicalPlan parsed, EnrichResolution enrichResolution, ActionListener<PreAnalysisResult> l) {
-        ActionListener.completeWith(l, () -> FieldNamesResolver.resolveFieldNames(parsed, enrichResolution));
+        ActionListener.completeWith(l, () -> FieldNameUtils.resolveFieldNames(parsed, enrichResolution));
     }
 
     private void resolveInferences(

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/session/FieldNamesResolver.java renamed to x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/session/FieldNameUtils.java

@@ -53,7 +53,7 @@
 
 import static org.elasticsearch.xpack.esql.core.util.StringUtils.WILDCARD;
 
-public class FieldNamesResolver {
+public class FieldNameUtils {
 
     public static PreAnalysisResult resolveFieldNames(LogicalPlan parsed, EnrichResolution enrichResolution) {
 
@@ -168,7 +168,7 @@ public static PreAnalysisResult resolveFieldNames(LogicalPlan parsed, EnrichReso
             //
             // and ips_policy enriches the results with the same name ip field),
             // these aliases should be kept in the list of fields.
-            if (canRemoveAliases[0] && p.anyMatch(FieldNamesResolver::couldOverrideAliases)) {
+            if (canRemoveAliases[0] && p.anyMatch(FieldNameUtils::couldOverrideAliases)) {
                 canRemoveAliases[0] = false;
             }
             if (canRemoveAliases[0]) {

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/session/FieldNameResolverTests.java renamed to x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/session/FieldNameUtilsTests.java

@@ -26,7 +26,7 @@
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
 
-public class FieldNameResolverTests extends ESTestCase {
+public class FieldNameUtilsTests extends ESTestCase {
 
     private static final EsqlParser parser = new EsqlParser();
 
@@ -2150,10 +2150,7 @@ private void assertFieldNames(String query, Set<String> expected, Set<String> wi
     }
 
     private void assertFieldNames(String query, EnrichResolution enrichResolution, Set<String> expected, Set<String> wildCardIndices) {
-        var preAnalysisResult = FieldNamesResolver.resolveFieldNames(
-            parser.createStatement(query, EsqlTestUtils.TEST_CFG),
-            enrichResolution
-        );
+        var preAnalysisResult = FieldNameUtils.resolveFieldNames(parser.createStatement(query, EsqlTestUtils.TEST_CFG), enrichResolution);
         assertThat("Query-wide field names", preAnalysisResult.fieldNames(), equalTo(expected));
         assertThat("Lookup Indices that expect wildcard lookups", preAnalysisResult.wildcardJoinIndices(), equalTo(wildCardIndices));
     }