Use text matcher for match_only_text

Author: parkertimmins

test/framework/src/main/java/org/elasticsearch/datageneration/matchers/source/FieldSpecificMatcher.java

@@ -604,13 +604,13 @@ public MatchResult match(
         }
     }
 
-    class MatchOnlyTextMatcher implements FieldSpecificMatcher {
+    class TextMatcher implements FieldSpecificMatcher {
         private final XContentBuilder actualMappings;
         private final Settings.Builder actualSettings;
         private final XContentBuilder expectedMappings;
         private final Settings.Builder expectedSettings;
 
-        MatchOnlyTextMatcher(
+        TextMatcher(
             XContentBuilder actualMappings,
             Settings.Builder actualSettings,
             XContentBuilder expectedMappings,
@@ -622,6 +622,10 @@ class MatchOnlyTextMatcher implements FieldSpecificMatcher {
             this.expectedSettings = expectedSettings;
         }
 
+        public String type() {
+            return "text";
+        }
+
         @Override
         @SuppressWarnings("unchecked")
         public MatchResult match(
@@ -633,11 +637,13 @@ public MatchResult match(
             var expectedNormalized = normalize(expected);
             var actualNormalized = normalize(actual);
 
-            // Match simply as match_only_text first.
+            // Match simply as text first.
             if (actualNormalized.equals(expectedNormalized)) {
                 return MatchResult.match();
             }
-            //
+
+            // In some cases synthetic source for text fields is synthesized using the keyword multi field.
+            // So in this case it's appropriate to match it using keyword matching logic (mainly to cover `null_value`).
             var multiFields = (Map<String, Object>) getMappingParameter("fields", actualMapping, expectedMapping);
             if (multiFields != null) {
                 var keywordMatcher = new KeywordMatcher(actualMappings, actualSettings, expectedMappings, expectedSettings);
@@ -655,7 +661,7 @@ public MatchResult match(
                     actualSettings,
                     expectedMappings,
                     expectedSettings,
-                    "Values of type [match_only_text] don't match, " + prettyPrintCollections(actual, expected)
+                    "Values of type [" + type() + "] don't match, " + prettyPrintCollections(actual, expected)
                 )
             );
         }
@@ -669,70 +675,19 @@ private Set<Object> normalize(List<Object> values) {
         }
     }
 
-    class TextMatcher implements FieldSpecificMatcher {
-        private final XContentBuilder actualMappings;
-        private final Settings.Builder actualSettings;
-        private final XContentBuilder expectedMappings;
-        private final Settings.Builder expectedSettings;
-
-        TextMatcher(
+    class MatchOnlyTextMatcher extends TextMatcher {
+        MatchOnlyTextMatcher(
             XContentBuilder actualMappings,
             Settings.Builder actualSettings,
             XContentBuilder expectedMappings,
             Settings.Builder expectedSettings
         ) {
-            this.actualMappings = actualMappings;
-            this.actualSettings = actualSettings;
-            this.expectedMappings = expectedMappings;
-            this.expectedSettings = expectedSettings;
+            super(actualMappings, actualSettings, expectedMappings, expectedSettings);
         }
 
         @Override
-        @SuppressWarnings("unchecked")
-        public MatchResult match(
-            List<Object> actual,
-            List<Object> expected,
-            Map<String, Object> actualMapping,
-            Map<String, Object> expectedMapping
-        ) {
-            var expectedNormalized = normalize(expected);
-            var actualNormalized = normalize(actual);
-
-            // Match simply as text first.
-            if (actualNormalized.equals(expectedNormalized)) {
-                return MatchResult.match();
-            }
-
-            // In some cases synthetic source for text fields is synthesized using the keyword multi field.
-            // So in this case it's appropriate to match it using keyword matching logic (mainly to cover `null_value`).
-            var multiFields = (Map<String, Object>) getMappingParameter("fields", actualMapping, expectedMapping);
-            if (multiFields != null) {
-                var keywordMatcher = new KeywordMatcher(actualMappings, actualSettings, expectedMappings, expectedSettings);
-
-                var keywordFieldMapping = (Map<String, Object>) multiFields.get("subfield_keyword");
-                var keywordMatchResult = keywordMatcher.match(actual, expected, keywordFieldMapping, keywordFieldMapping);
-                if (keywordMatchResult.isMatch()) {
-                    return MatchResult.match();
-                }
-            }
-
-            return MatchResult.noMatch(
-                formatErrorMessage(
-                    actualMappings,
-                    actualSettings,
-                    expectedMappings,
-                    expectedSettings,
-                    "Values of type [text] don't match, " + prettyPrintCollections(actual, expected)
-                )
-            );
-        }
-
-        private Set<Object> normalize(List<Object> values) {
-            if (values == null) {
-                return Set.of();
-            }
-
-            return values.stream().filter(Objects::nonNull).collect(Collectors.toSet());
+        public String type() {
+            return "match_only_text";
         }
     }
 

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

@@ -25,7 +25,7 @@ public interface LeafQueryGenerator {
      * @param type the type to build a query for
      * @return a generator that can build queries for this type
      */
-    static LeafQueryGenerator buildForType(String type, MappingPredicates mappingContextHelper) {
+    static LeafQueryGenerator buildForType(String type, MappingPredicates mappingPredicates) {
         LeafQueryGenerator noQueries = (Map<String, Object> fieldMapping, String path, Object value) -> List.of();
 
         FieldType fieldType = FieldType.tryParse(type);
@@ -37,7 +37,7 @@ static LeafQueryGenerator buildForType(String type, MappingPredicates mappingCon
             case KEYWORD -> new KeywordQueryGenerator();
             case WILDCARD -> new WildcardQueryGenerator();
             case TEXT -> new TextQueryGenerator();
-            case MATCH_ONLY_TEXT -> new MatchOnlyTextQueryGenerator(mappingContextHelper);
+            case MATCH_ONLY_TEXT -> new MatchOnlyTextQueryGenerator(mappingPredicates);
             default -> noQueries;
         };
     }