A few more changes from prototype

Author: parkertimmins

modules/mapper-extras/src/main/java/module-info.java

@@ -14,4 +14,6 @@
     requires org.apache.lucene.core;
     requires org.apache.lucene.memory;
     requires org.apache.lucene.queries;
+
+    exports org.elasticsearch.index.mapper.extras;
 }

modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/MatchOnlyTextFieldMapper.java

@@ -169,7 +169,7 @@ public MatchOnlyTextFieldType(
             super(name, true, false, false, tsi, meta);
             this.indexAnalyzer = Objects.requireNonNull(indexAnalyzer);
             this.textFieldType = new TextFieldType(name, isSyntheticSource);
-            this.originalName = isSyntheticSource ? name() + "._original" : null;
+            this.originalName = isSyntheticSource ? name + "._original" : null;
         }
 
         public MatchOnlyTextFieldType(String name) {

server/src/main/java/org/elasticsearch/index/mapper/BlockDocValuesReader.java

@@ -634,10 +634,10 @@ public String toString() {
         }
     }
 
-    private static class SingletonOrdinals extends BlockDocValuesReader {
+    public static class SingletonOrdinals extends BlockDocValuesReader {
         private final SortedDocValues ordinals;
 
-        SingletonOrdinals(SortedDocValues ordinals) {
+        public SingletonOrdinals(SortedDocValues ordinals) {
             this.ordinals = ordinals;
         }
 
@@ -692,10 +692,10 @@ public String toString() {
         }
     }
 
-    private static class Ordinals extends BlockDocValuesReader {
+    public static class Ordinals extends BlockDocValuesReader {
         private final SortedSetDocValues ordinals;
 
-        Ordinals(SortedSetDocValues ordinals) {
+        public Ordinals(SortedSetDocValues ordinals) {
             this.ordinals = ordinals;
         }
 

server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightPhase.java

@@ -124,7 +124,8 @@ private FieldContext contextBuilders(
                 if (fieldNameContainsWildcards) {
                     if (fieldType.typeName().equals(TextFieldMapper.CONTENT_TYPE) == false
                         && fieldType.typeName().equals(KeywordFieldMapper.CONTENT_TYPE) == false
-                        && fieldType.typeName().equals("match_only_text") == false) {
+                        && fieldType.typeName().equals("match_only_text") == false
+                        && fieldType.typeName().equals("patterned_text") == false) {
                         continue;
                     }
                     if (highlighter.canHighlight(fieldType) == false) {