Refactor dropping asterisk from invalid chars

Author: pawankartik-elastic

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/IdentifierBuilder.java

@@ -305,17 +305,17 @@ private static void resolveAndValidateIndex(String index, EsqlBaseParser.IndexPa
                 return;
             }
 
-            InvalidIndexNameException errorToThrow = e;
             /*
              * We only modify this particular message because it mentions '*' as an invalid char.
              * However, we do allow asterisk in the index patterns: wildcarded patterns. Let's not
              * mislead the user by mentioning this char in the error message.
              */
             if (e.getMessage().contains("must not contain the following characters")) {
-                errorToThrow = new InvalidIndexNameException(index, e.getMessage().replace("'*',", ""));
+                var updatedInvalidChars = Strings.INVALID_FILENAME_CHARS.replace("'*',", "");
+                throwInvalidIndexNameException(index, "must not contain the following characters " + updatedInvalidChars, ctx);
             }
 
-            throw new ParsingException(errorToThrow, source(ctx), errorToThrow.getMessage());
+            throw new ParsingException(e, source(ctx), e.getMessage());
         }
     }
 

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/parser/StatementParserTests.java

@@ -3285,7 +3285,7 @@ public void testInvalidPatternsWithIntermittentQuotes() {
             // Construct the new invalid index pattern.
             var remoteIndexWithInvalidChar = quote(randomIdentifier() + ":" + "foo" + randomInvalidChar + "bar");
             var query = "FROM " + randomIndex + "," + remoteIndexWithInvalidChar;
-            expectError(query, "must not contain the following characters ['\\',' ','\"','<','?','>','|',',','/']");
+            expectError(query, "must not contain the following characters ['\"',' ','\\','/',',','|','>','?','<']");
         }
 
         // Colon outside a quoted string should result in an ANTLR error: a comma is expected.