Remove the 'array value parser' marker interface.

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

@@ -305,6 +305,11 @@ protected void parseCreateField(ParseContext context) throws IOException {
     protected abstract void addDocValuesFields(String name, Processed geometry, List<IndexableField> fields, ParseContext context);
     protected abstract void addMultiFields(ParseContext context, Processed geometry) throws IOException;
 
+    @Override
+    public final boolean parsesArrayValue() {
+        return true;
+    }
+
     /** parsing logic for geometry indexing */
     @Override
     public void parse(ParseContext context) throws IOException {

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

@@ -83,7 +83,7 @@
  *  This field can also be extended to add search criteria to suggestions
  *  for query-time filtering and boosting (see {@link ContextMappings}
  */
-public class CompletionFieldMapper extends FieldMapper implements ArrayValueMapperParser {
+public class CompletionFieldMapper extends FieldMapper {
     public static final String CONTENT_TYPE = "completion";
 
     /**
@@ -426,6 +426,11 @@ public CompletionFieldType fieldType() {
         return (CompletionFieldType) super.fieldType();
     }
 
+    @Override
+    public boolean parsesArrayValue() {
+        return true;
+    }
+
     /**
      * Parses and indexes inputs
      *

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

@@ -522,7 +522,7 @@ private static void parseArray(ParseContext context, ObjectMapper parentMapper,
             // There is a concrete mapper for this field already. Need to check if the mapper
             // expects an array, if so we pass the context straight to the mapper and if not
             // we serialize the array components
-            if (mapper instanceof ArrayValueMapperParser) {
+            if (parsesArrayValue(mapper)) {
                 parseObjectOrField(context, mapper);
             } else {
                 parseNonDynamicArray(context, parentMapper, lastFieldName, arrayFieldName);
@@ -543,7 +543,7 @@ private static void parseArray(ParseContext context, ObjectMapper parentMapper,
                     Mapper.BuilderContext builderContext = new Mapper.BuilderContext(context.indexSettings().getSettings(), context.path());
                     mapper = builder.build(builderContext);
                     assert mapper != null;
-                    if (mapper instanceof ArrayValueMapperParser) {
+                    if (parsesArrayValue(mapper)) {
                         context.addDynamicMapper(mapper);
                         context.path().add(arrayFieldName);
                         parseObjectOrField(context, mapper);
@@ -562,6 +562,10 @@ private static void parseArray(ParseContext context, ObjectMapper parentMapper,
         }
     }
 
+    private static boolean parsesArrayValue(Mapper mapper) {
+        return mapper instanceof FieldMapper && ((FieldMapper) mapper).parsesArrayValue();
+    }
+
     private static void parseNonDynamicArray(ParseContext context, ObjectMapper mapper,
                                              final String lastFieldName, String arrayFieldName) throws IOException {
         XContentParser parser = context.parser();

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

@@ -273,6 +273,16 @@ public CopyTo copyTo() {
         return copyTo;
     }
 
+    /**
+     * Whether this mapper can handle an array value during document parsing. If true,
+     * when an array is encountered during parsing, the document parser will pass the
+     * whole array to the mapper. If false, the array is split into individual values
+     * and each value is passed to the mapper for parsing.
+     */
+    public boolean parsesArrayValue() {
+        return false;
+    }
+
     /**
      * Parse the field value using the provided {@link ParseContext}.
      */

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

@@ -44,8 +44,7 @@
  *
  * Uses lucene 6 LatLonPoint encoding
  */
-public class GeoPointFieldMapper extends AbstractPointGeometryFieldMapper<List<? extends GeoPoint>, List<? extends GeoPoint>>
-        implements ArrayValueMapperParser {
+public class GeoPointFieldMapper extends AbstractPointGeometryFieldMapper<List<? extends GeoPoint>, List<? extends GeoPoint>> {
     public static final String CONTENT_TYPE = "geo_point";
 
     public static class Builder extends AbstractPointGeometryFieldMapper.Builder<Builder, GeoPointFieldType> {

x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/PointFieldMapper.java

@@ -13,7 +13,6 @@
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.index.mapper.AbstractPointGeometryFieldMapper;
-import org.elasticsearch.index.mapper.ArrayValueMapperParser;
 import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.ParseContext;
 import org.elasticsearch.xpack.spatial.common.CartesianPoint;
@@ -30,8 +29,7 @@
  *
  * Uses lucene 8 XYPoint encoding
  */
-public class PointFieldMapper extends AbstractPointGeometryFieldMapper<List<? extends CartesianPoint>, List<? extends CartesianPoint>>
-        implements ArrayValueMapperParser {
+public class PointFieldMapper extends AbstractPointGeometryFieldMapper<List<? extends CartesianPoint>, List<? extends CartesianPoint>> {
     public static final String CONTENT_TYPE = "point";
 
     public static class Builder extends AbstractPointGeometryFieldMapper.Builder<Builder, PointFieldType> {

x-pack/plugin/vectors/src/main/java/org/elasticsearch/xpack/vectors/mapper/DenseVectorFieldMapper.java

@@ -18,7 +18,6 @@
 import org.elasticsearch.common.xcontent.XContentParser.Token;
 import org.elasticsearch.common.xcontent.support.XContentMapValues;
 import org.elasticsearch.index.fielddata.IndexFieldData;
-import org.elasticsearch.index.mapper.ArrayValueMapperParser;
 import org.elasticsearch.index.mapper.FieldMapper;
 import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.Mapper;
@@ -40,7 +39,7 @@
 /**
  * A {@link FieldMapper} for indexing a dense vector of floats.
  */
-public class DenseVectorFieldMapper extends FieldMapper implements ArrayValueMapperParser {
+public class DenseVectorFieldMapper extends FieldMapper {
 
     public static final String CONTENT_TYPE = "dense_vector";
     public static short MAX_DIMS_COUNT = 2048; //maximum allowed number of dimensions
@@ -173,6 +172,11 @@ public DenseVectorFieldType fieldType() {
         return (DenseVectorFieldType) super.fieldType();
     }
 
+    @Override
+    public boolean parsesArrayValue() {
+        return true;
+    }
+
     @Override
     public void parse(ParseContext context) throws IOException {
         if (context.externalValueSet()) {