remove allow_multiple_values parameter

Author: weizijun

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

@@ -116,7 +116,7 @@ public static class Builder extends FieldMapper.Builder {
         private final ScriptCompiler scriptCompiler;
         private final NumberType type;
 
-        private final Parameter<Boolean> allowMultipleValues;
+        private boolean allowMultipleValues = true;
         private final Version indexCreatedVersion;
 
         public Builder(String name, NumberType type, ScriptCompiler compiler, Settings settings, Version indexCreatedVersion) {
@@ -189,8 +189,6 @@ public Builder(
 
             this.script.precludesParameters(ignoreMalformed, coerce, nullValue);
             addScriptValidation(script, indexed, hasDocValues);
-
-            this.allowMultipleValues = Parameter.boolParam("allow_multiple_values", false, m -> toType(m).allowMultipleValues, true);
         }
 
         Builder nullValue(Number number) {
@@ -221,7 +219,7 @@ public Builder metric(MetricType metric) {
         }
 
         public Builder allowMultipleValues(boolean allowMultipleValues) {
-            this.allowMultipleValues.setValue(allowMultipleValues);
+            this.allowMultipleValues = allowMultipleValues;
             return this;
         }
 
@@ -238,8 +236,7 @@ protected Parameter<?>[] getParameters() {
                 onScriptError,
                 meta,
                 dimension,
-                metric,
-                allowMultipleValues };
+                metric };
         }
 
         @Override
@@ -1555,7 +1552,7 @@ private NumberFieldMapper(String simpleName, MappedFieldType mappedFieldType, Mu
         this.scriptCompiler = builder.scriptCompiler;
         this.script = builder.script.getValue();
         this.metricType = builder.metric.getValue();
-        this.allowMultipleValues = builder.allowMultipleValues.get();
+        this.allowMultipleValues = builder.allowMultipleValues;
         this.indexCreatedVersion = builder.indexCreatedVersion;
     }
 
@@ -1626,8 +1623,11 @@ private void indexValue(DocumentParserContext context, Number numericValue) {
             // the last field is the current field, Add to the key map, so that we can validate if it has been added
             List<IndexableField> fields = context.doc().getFields();
             IndexableField last = fields.get(fields.size() - 1);
-            assert last.name().equals(fieldType().name())
-                : "last field name [" + last.name() + "] mis match field name [" + fieldType().name() + "]";
+            assert last.name().equals(fieldType().name()) : "last field name ["
+                + last.name()
+                + "] mis match field name ["
+                + fieldType().name()
+                + "]";
             context.doc().onlyAddKey(fieldType().name(), fields.get(fields.size() - 1));
         }
 

server/src/test/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java

@@ -10,13 +10,16 @@
 
 import org.apache.lucene.index.DocValuesType;
 import org.apache.lucene.index.IndexableField;
+import org.elasticsearch.Version;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.core.Tuple;
+import org.elasticsearch.index.mapper.NumberFieldMapper.NumberType;
 import org.elasticsearch.index.mapper.NumberFieldTypeTests.OutOfRangeSpec;
 import org.elasticsearch.index.termvectors.TermVectorsService;
 import org.elasticsearch.script.DoubleFieldScript;
 import org.elasticsearch.script.LongFieldScript;
 import org.elasticsearch.script.Script;
+import org.elasticsearch.script.ScriptCompiler;
 import org.elasticsearch.script.ScriptContext;
 import org.elasticsearch.script.ScriptFactory;
 import org.elasticsearch.xcontent.XContentBuilder;
@@ -348,19 +351,6 @@ public void testScriptableTypes() throws IOException {
         }
     }
 
-    public void testAllowMultipleValuesField() throws IOException {
-        DocumentMapper mapper = createDocumentMapper(fieldMapping(b -> {
-            minimalMapping(b);
-            b.field("allow_multiple_values", false);
-        }));
-
-        Exception e = expectThrows(
-            MapperParsingException.class,
-            () -> mapper.parse(source(b -> b.array("field", randomNumber(), randomNumber(), randomNumber())))
-        );
-        assertThat(e.getCause().getMessage(), containsString("Only one field can be stored per key"));
-    }
-
     protected abstract Number randomNumber();
 
     protected final class NumberSyntheticSourceSupport implements SyntheticSourceSupport {