Simplify phrase query generation

Author: parkertimmins

test/framework/src/main/java/org/elasticsearch/datageneration/queries/LeafQueryGenerator.java

@@ -82,46 +82,27 @@ public List<QueryBuilder> generate(Map<String, Object> fieldMapping, String path
                 }
             }
 
-            var results = new ArrayList<QueryBuilder>();
-            results.add(QueryBuilders.matchQuery(path, value));
-            var phraseQuery = buildPhraseQuery(path, (String) value);
-            if (phraseQuery != null) {
-                results.add(phraseQuery);
-            }
-            return results;
+            return List.of(
+                QueryBuilders.matchQuery(path, value),
+                QueryBuilders.matchPhraseQuery(path, value)
+            );
         }
     }
 
     record MatchOnlyTextQueryGenerator(MappingContextHelper mappingContextHelper) implements LeafQueryGenerator {
 
         public List<QueryBuilder> generate(Map<String, Object> fieldMapping, String path, Object value) {
-            var results = new ArrayList<QueryBuilder>();
-            results.add(QueryBuilders.matchQuery(path, value));
-
             // TODO remove when fixed
             // match_only_text in nested context fails for synthetic source https://github.com/elastic/elasticsearch/issues/132352
             if (mappingContextHelper.inNestedContext(path)) {
-               return results;
+                return List.of(QueryBuilders.matchQuery(path, value));
             }
 
-            var phraseQuery = buildPhraseQuery(path, (String) value);
-            if (phraseQuery != null) {
-                results.add(phraseQuery);
-            }
-            return results;
-        }
-    }
-
-    private static QueryBuilder buildPhraseQuery(String path, String value) {
-        var tokens = Arrays.asList(value.split("[^a-zA-Z0-9]"));
-        if (tokens.isEmpty()) {
-            return null;
+            return List.of(
+                QueryBuilders.matchQuery(path, value),
+                QueryBuilders.matchPhraseQuery(path, value)
+            );
         }
-
-        int low = ESTestCase.randomIntBetween(0, tokens.size() - 1);
-        int hi = ESTestCase.randomIntBetween(low + 1, tokens.size());
-        var phrase = String.join(" ", tokens.subList(low, hi));
-        return QueryBuilders.matchPhraseQuery(path, phrase);
     }
 
     static boolean containsHighSurrogates(String s) {