remove patterned_text tests

Author: parkertimmins

test/framework/src/main/java/org/elasticsearch/datageneration/FieldType.java

@@ -24,7 +24,6 @@
 import org.elasticsearch.datageneration.fields.leaf.KeywordFieldDataGenerator;
 import org.elasticsearch.datageneration.fields.leaf.LongFieldDataGenerator;
 import org.elasticsearch.datageneration.fields.leaf.MatchOnlyTextFieldDataGenerator;
-import org.elasticsearch.datageneration.fields.leaf.PatternedTextFieldDataGenerator;
 import org.elasticsearch.datageneration.fields.leaf.ScaledFloatFieldDataGenerator;
 import org.elasticsearch.datageneration.fields.leaf.ShortFieldDataGenerator;
 import org.elasticsearch.datageneration.fields.leaf.TextFieldDataGenerator;
@@ -53,8 +52,8 @@ public enum FieldType {
     IP("ip"),
     CONSTANT_KEYWORD("constant_keyword"),
     WILDCARD("wildcard"),
-    MATCH_ONLY_TEXT("match_only_text"),
-    PATTERNED_TEXT("patterned_text");
+    MATCH_ONLY_TEXT("match_only_text");
+//    PATTERNED_TEXT("patterned_text");
 
     private final String name;
 
@@ -83,7 +82,7 @@ public FieldDataGenerator generator(String fieldName, DataSource dataSource) {
             case CONSTANT_KEYWORD -> new ConstantKeywordFieldDataGenerator();
             case WILDCARD -> new WildcardFieldDataGenerator(dataSource);
             case MATCH_ONLY_TEXT -> new MatchOnlyTextFieldDataGenerator(dataSource);
-            case PATTERNED_TEXT -> new PatternedTextFieldDataGenerator(dataSource);
+//            case PATTERNED_TEXT -> new PatternedTextFieldDataGenerator(dataSource);
         };
     }
 
@@ -108,7 +107,7 @@ public static FieldType tryParse(String name) {
             case "constant_keyword" -> FieldType.CONSTANT_KEYWORD;
             case "wildcard" -> FieldType.WILDCARD;
             case "match_only_text" -> FieldType.MATCH_ONLY_TEXT;
-            case "patterned_text" -> FieldType.PATTERNED_TEXT;
+//            case "patterned_text" -> FieldType.PATTERNED_TEXT;
             default -> null;
         };
     }

test/framework/src/main/java/org/elasticsearch/datageneration/datasource/DefaultMappingParametersHandler.java

@@ -51,7 +51,6 @@ public DataSourceResponse.LeafMappingParametersGenerator handle(DataSourceReques
             case CONSTANT_KEYWORD -> constantKeywordMapping();
             case WILDCARD -> wildcardMapping(false, request);
             case MATCH_ONLY_TEXT -> matchOnlyTextMapping(false, request);
-            case PATTERNED_TEXT -> patternedTextMapping(false, request);
         });
     }
 
@@ -257,13 +256,13 @@ private Supplier<Map<String, Object>> wildcardMapping(boolean hasParent, DataSou
                 mapping.put("null_value", ESTestCase.randomAlphaOfLengthBetween(0, 10));
             }
             if (hasParent == false && ESTestCase.randomDouble() <= 0.2) {
-                mapping.put("fields", stringSubField(FieldType.PATTERNED_TEXT, request));
+                mapping.put("fields", stringSubField(FieldType.WILDCARD, request));
             }
             return mapping;
         };
     }
 
-    private Supplier<Map<String, Object>> stringSubField(FieldType parent, DataSourceRequest.LeafMappingParametersGenerator request) {
+    private Map<String, Object> stringSubField(FieldType parent, DataSourceRequest.LeafMappingParametersGenerator request) {
         /**
          * text -> keyword, wildcard
          * match_only_text -> keyword, wildcard
@@ -272,25 +271,22 @@ private Supplier<Map<String, Object>> stringSubField(FieldType parent, DataSourc
          * wildcard -> keyword, text, match_only_text, patterned_text
          *
          */
-        return () -> {
-            var subFields = new HashMap<FieldType, Supplier<Map<String, Object>>>();
-            subFields.put(FieldType.KEYWORD, () -> {
-                var mapping = keywordMapping(true, request).get();
-                mapping.remove("copy_to");
-                return mapping;
-            });
-            subFields.put(FieldType.TEXT, () -> wildcardMapping(true, request).get());
-            subFields.put(FieldType.MATCH_ONLY_TEXT, () -> matchOnlyTextMapping(true, request).get());
-            subFields.put(FieldType.WILDCARD, () -> wildcardMapping(true, request).get());
-            subFields.put(FieldType.PATTERNED_TEXT, () -> matchOnlyTextMapping(true, request).get());
-
-            var options = subFields.entrySet().stream().filter(e -> e.getKey().equals(parent) == false).toList();
-            var child = ESTestCase.randomFrom(options);
-            FieldType childType = child.getKey();
-            var childValue = child.getValue().get();
-            childValue.put("type", childType.toString());
-            return Map.of("subfield_" + childType, childValue);
-        };
+        var subFields = new HashMap<FieldType, Supplier<Map<String, Object>>>();
+        subFields.put(FieldType.KEYWORD, () -> {
+            var mapping = keywordMapping(true, request).get();
+            mapping.remove("copy_to");
+            return mapping;
+        });
+        subFields.put(FieldType.TEXT, () -> textMapping(true, request).get());
+        subFields.put(FieldType.MATCH_ONLY_TEXT, () -> matchOnlyTextMapping(true, request).get());
+        subFields.put(FieldType.WILDCARD, () -> wildcardMapping(true, request).get());
+
+        var options = subFields.entrySet().stream().filter(e -> e.getKey().equals(parent) == false).toList();
+        var child = ESTestCase.randomFrom(options);
+        FieldType childType = child.getKey();
+        var childValue = child.getValue().get();
+        childValue.put("type", childType.toString());
+        return Map.of("subfield_" + childType, childValue);
     }
 
     private Supplier<Map<String, Object>> matchOnlyTextMapping(boolean hasParent, DataSourceRequest.LeafMappingParametersGenerator request) {
@@ -303,16 +299,6 @@ private Supplier<Map<String, Object>> matchOnlyTextMapping(boolean hasParent, Da
         };
     }
 
-    private Supplier<Map<String, Object>> patternedTextMapping(boolean hasParent, DataSourceRequest.LeafMappingParametersGenerator request) {
-        return () -> {
-            var mapping = new HashMap<String, Object>();
-            if (hasParent == false && ESTestCase.randomDouble() <= 0.2) {
-                mapping.put("fields", stringSubField(FieldType.PATTERNED_TEXT, request));
-            }
-            return mapping;
-        };
-    }
-
     public static HashMap<String, Object> commonMappingParameters() {
         var map = new HashMap<String, Object>();
         map.put("store", ESTestCase.randomBoolean());