text should have phrase query for dynamic mappings

Author: parkertimmins

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

@@ -46,16 +46,14 @@ static LeafQueryGenerator buildForType(String type) {
 
     class KeywordQueryGenerator implements LeafQueryGenerator {
         public List<QueryBuilder> generate(Map<String, Object> fieldMapping, String path, Object value) {
-            if (fieldMapping == null) {
-                return List.of(QueryBuilders.termQuery(path, value));
+            if (fieldMapping != null) {
+                boolean isIndexed = (Boolean) fieldMapping.getOrDefault("index", true);
+                boolean hasDocValues = (Boolean) fieldMapping.getOrDefault("doc_values", true);
+                if (isIndexed == false && hasDocValues == false) {
+                    return List.of();
+                }
             }
-
-            boolean isIndexed = (Boolean) fieldMapping.getOrDefault("index", true);
-            boolean hasDocValues = (Boolean) fieldMapping.getOrDefault("doc_values", true);
-            if (isIndexed || hasDocValues) {
-                return List.of(QueryBuilders.termQuery(path, value));
-            }
-            return List.of();
+            return List.of(QueryBuilders.termQuery(path, value));
         }
     }
 
@@ -71,13 +69,11 @@ public List<QueryBuilder> generate(Map<String, Object> fieldMapping, String path
 
     class TextQueryGenerator implements LeafQueryGenerator {
         public List<QueryBuilder> generate(Map<String, Object> fieldMapping, String path, Object value) {
-            if (fieldMapping == null) {
-                return List.of(QueryBuilders.termQuery(path, value));
-            }
-
-            boolean isIndexed = (Boolean) fieldMapping.getOrDefault("index", true);
-            if (isIndexed == false) {
-                return List.of();
+            if (fieldMapping != null) {
+                boolean isIndexed = (Boolean) fieldMapping.getOrDefault("index", true);
+                if (isIndexed == false) {
+                    return List.of();
+                }
             }
 
             var results = new ArrayList<QueryBuilder>();