Remove 'external values', and replace with swapped out XContentParsers

libs/x-content/src/main/java/org/elasticsearch/common/xcontent/FilterXContentParser.java

@@ -0,0 +1,246 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+package org.elasticsearch.common.xcontent;
+
+import org.elasticsearch.common.CheckedFunction;
+import org.elasticsearch.common.RestApiVersion;
+
+import java.io.IOException;
+import java.nio.CharBuffer;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Supplier;
+
+/**
+ * Filters an existing XContentParser by using a delegate
+ */
+public abstract class FilterXContentParser implements XContentParser {
+
+    protected final XContentParser in;
+
+    protected FilterXContentParser(XContentParser in) {
+        this.in = in;
+    }
+
+    @Override
+    public XContentType contentType() {
+        return in.contentType();
+    }
+
+    @Override
+    public Token nextToken() throws IOException {
+        return in.nextToken();
+    }
+
+    @Override
+    public void skipChildren() throws IOException {
+        in.skipChildren();
+    }
+
+    @Override
+    public Token currentToken() {
+        return in.currentToken();
+    }
+
+    @Override
+    public String currentName() throws IOException {
+        return in.currentName();
+    }
+
+    @Override
+    public Map<String, Object> map() throws IOException {
+        return in.map();
+    }
+
+    @Override
+    public Map<String, Object> mapOrdered() throws IOException {
+        return in.mapOrdered();
+    }
+
+    @Override
+    public Map<String, String> mapStrings() throws IOException {
+        return in.mapStrings();
+    }
+
+    @Override
+    public <T> Map<String, T> map(
+        Supplier<Map<String, T>> mapFactory, CheckedFunction<XContentParser, T, IOException> mapValueParser) throws IOException {
+        return in.map(mapFactory, mapValueParser);
+    }
+
+    @Override
+    public List<Object> list() throws IOException {
+        return in.list();
+    }
+
+    @Override
+    public List<Object> listOrderedMap() throws IOException {
+        return in.listOrderedMap();
+    }
+
+    @Override
+    public String text() throws IOException {
+        return in.text();
+    }
+
+    @Override
+    public String textOrNull() throws IOException {
+        return in.textOrNull();
+    }
+
+    @Override
+    public CharBuffer charBufferOrNull() throws IOException {
+        return in.charBufferOrNull();
+    }
+
+    @Override
+    public CharBuffer charBuffer() throws IOException {
+        return in.charBuffer();
+    }
+
+    @Override
+    public Object objectText() throws IOException {
+        return in.objectText();
+    }
+
+    @Override
+    public Object objectBytes() throws IOException {
+        return in.objectBytes();
+    }
+
+    @Override
+    public boolean hasTextCharacters() {
+        return in.hasTextCharacters();
+    }
+
+    @Override
+    public char[] textCharacters() throws IOException {
+        return in.textCharacters();
+    }
+
+    @Override
+    public int textLength() throws IOException {
+        return in.textLength();
+    }
+
+    @Override
+    public int textOffset() throws IOException {
+        return in.textOffset();
+    }
+
+    @Override
+    public Number numberValue() throws IOException {
+        return in.numberValue();
+    }
+
+    @Override
+    public NumberType numberType() throws IOException {
+        return in.numberType();
+    }
+
+    @Override
+    public short shortValue(boolean coerce) throws IOException {
+        return in.shortValue(coerce);
+    }
+
+    @Override
+    public int intValue(boolean coerce) throws IOException {
+        return in.intValue(coerce);
+    }
+
+    @Override
+    public long longValue(boolean coerce) throws IOException {
+        return in.longValue(coerce);
+    }
+
+    @Override
+    public float floatValue(boolean coerce) throws IOException {
+        return in.floatValue(coerce);
+    }
+
+    @Override
+    public double doubleValue(boolean coerce) throws IOException {
+        return in.doubleValue(coerce);
+    }
+
+    @Override
+    public short shortValue() throws IOException {
+        return in.shortValue();
+    }
+
+    @Override
+    public int intValue() throws IOException {
+        return in.intValue();
+    }
+
+    @Override
+    public long longValue() throws IOException {
+        return in.longValue();
+    }
+
+    @Override
+    public float floatValue() throws IOException {
+        return in.floatValue();
+    }
+
+    @Override
+    public double doubleValue() throws IOException {
+        return in.doubleValue();
+    }
+
+    @Override
+    public boolean isBooleanValue() throws IOException {
+        return in.isBooleanValue();
+    }
+
+    @Override
+    public boolean booleanValue() throws IOException {
+        return in.booleanValue();
+    }
+
+    @Override
+    public byte[] binaryValue() throws IOException {
+        return in.binaryValue();
+    }
+
+    @Override
+    public XContentLocation getTokenLocation() {
+        return in.getTokenLocation();
+    }
+
+    @Override
+    public <T> T namedObject(Class<T> categoryClass, String name, Object context) throws IOException {
+        return in.namedObject(categoryClass, name, context);
+    }
+
+    @Override
+    public NamedXContentRegistry getXContentRegistry() {
+        return in.getXContentRegistry();
+    }
+
+    @Override
+    public boolean isClosed() {
+        return in.isClosed();
+    }
+
+    @Override
+    public void close() throws IOException {
+        in.close();
+    }
+
+    @Override
+    public RestApiVersion getRestApiVersion() {
+        return in.getRestApiVersion();
+    }
+
+    @Override
+    public DeprecationHandler getDeprecationHandler() {
+        return in.getDeprecationHandler();
+    }
+}

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

@@ -318,12 +318,7 @@ public FieldMapper.Builder getMergeBuilder() {
 
     @Override
     protected void parseCreateField(ParseContext context) throws IOException {
-        final String value;
-        if (context.externalValueSet()) {
-            value = context.externalValue().toString();
-        } else {
-            value = context.parser().textOrNull();
-        }
+        final String value = context.parser().textOrNull();
 
         if (value == null) {
             return;

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

@@ -136,10 +136,7 @@ public RankFeatureFieldType fieldType() {
     @Override
     protected void parseCreateField(ParseContext context) throws IOException {
         float value;
-        if (context.externalValueSet()) {
-            Object v = context.externalValue();
-            value = objectToFloat(v);
-        } else if (context.parser().currentToken() == Token.VALUE_NULL) {
+        if (context.parser().currentToken() == Token.VALUE_NULL) {
             // skip
             return;
         } else {

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

@@ -56,7 +56,7 @@ name, new RankFeaturesFieldType(buildFullName(contentPath), meta.getValue(), pos
         }
     }
 
-    public static final TypeParser PARSER = new TypeParser((n, c) -> new Builder(n));
+    public static final TypeParser PARSER = new TypeParser((n, c) -> new Builder(n), notInMultiFields(CONTENT_TYPE));
 
     public static final class RankFeaturesFieldType extends MappedFieldType {
 
@@ -117,9 +117,6 @@ public RankFeaturesFieldType fieldType() {
 
     @Override
     public void parse(ParseContext context) throws IOException {
-        if (context.externalValueSet()) {
-            throw new IllegalArgumentException("[rank_features] fields can't be used in multi-fields");
-        }
 
         if (context.parser().currentToken() != Token.START_OBJECT) {
             throw new IllegalArgumentException("[rank_features] fields must be json objects, expected a START_OBJECT but got: " +

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

@@ -316,9 +316,7 @@ protected void parseCreateField(ParseContext context) throws IOException {
         XContentParser parser = context.parser();
         Object value;
         Number numericValue = null;
-        if (context.externalValueSet()) {
-            value = context.externalValue();
-        } else if (parser.currentToken() == Token.VALUE_NULL) {
+        if (parser.currentToken() == Token.VALUE_NULL) {
             value = null;
         } else if (coerce.value()
                 && parser.currentToken() == Token.VALUE_STRING

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

@@ -571,7 +571,7 @@ public SearchAsYouTypeFieldMapper(String simpleName,
 
     @Override
     protected void parseCreateField(ParseContext context) throws IOException {
-        final String value = context.externalValueSet() ? context.externalValue().toString() : context.parser().textOrNull();
+        final String value = context.parser().textOrNull();
         if (value == null) {
             return;
         }

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

@@ -111,12 +111,7 @@ protected TokenCountFieldMapper(String simpleName, MappedFieldType defaultFieldT
 
     @Override
     protected void parseCreateField(ParseContext context) throws IOException {
-        final String value;
-        if (context.externalValueSet()) {
-            value = context.externalValue().toString();
-        } else {
-            value = context.parser().textOrNull();
-        }
+        final String value = context.parser().textOrNull();
 
         if (value == null && nullValue == null) {
             return;

modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/RankFeaturesFieldMapperTests.java

@@ -21,6 +21,8 @@
 import java.util.List;
 import java.util.Map;
 
+import static org.hamcrest.Matchers.containsString;
+
 public class RankFeaturesFieldMapperTests extends MapperTestCase {
 
     @Override
@@ -136,6 +138,18 @@ public void testRejectMultiValuedFields() throws MapperParsingException, IOExcep
                 "the same document", e.getCause().getMessage());
     }
 
+    public void testCannotBeUsedInMultifields() {
+        Exception e = expectThrows(MapperParsingException.class, () -> createMapperService(fieldMapping(b -> {
+            b.field("type", "keyword");
+            b.startObject("fields");
+            b.startObject("feature");
+            b.field("type", "rank_features");
+            b.endObject();
+            b.endObject();
+        })));
+        assertThat(e.getMessage(), containsString("Field [feature] of type [rank_features] can't be used in multifields"));
+    }
+
     @Override
     protected Object generateRandomInputValue(MappedFieldType ft) {
         assumeFalse("Test implemented in a follow up", true);

plugins/analysis-icu/src/main/java/org/elasticsearch/index/mapper/ICUCollationKeywordFieldMapper.java

@@ -437,15 +437,11 @@ public FieldMapper.Builder getMergeBuilder() {
     @Override
     protected void parseCreateField(ParseContext context) throws IOException {
         final String value;
-        if (context.externalValueSet()) {
-            value = context.externalValue().toString();
+        XContentParser parser = context.parser();
+        if (parser.currentToken() == XContentParser.Token.VALUE_NULL) {
+            value = nullValue;
         } else {
-            XContentParser parser = context.parser();
-            if (parser.currentToken() == XContentParser.Token.VALUE_NULL) {
-                value = nullValue;
-            } else {
-                value = parser.textOrNull();
-            }
+            value = parser.textOrNull();
         }
 
         if (value == null || value.length() > ignoreAbove) {

plugins/mapper-annotated-text/src/main/java/org/elasticsearch/index/mapper/annotatedtext/AnnotatedTextFieldMapper.java

@@ -517,12 +517,7 @@ protected AnnotatedTextFieldMapper(String simpleName, FieldType fieldType, Annot
 
     @Override
     protected void parseCreateField(ParseContext context) throws IOException {
-        final String value;
-        if (context.externalValueSet()) {
-            value = context.externalValue().toString();
-        } else {
-            value = context.parser().textOrNull();
-        }
+        final String value = context.parser().textOrNull();
 
         if (value == null) {
             return;