diff --git a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/RankFeatureFieldMapper.java b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/RankFeatureFieldMapper.java index 40d42be82a6c7..451b72dc0ffa1 100644 --- a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/RankFeatureFieldMapper.java +++ b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/RankFeatureFieldMapper.java @@ -57,7 +57,7 @@ public static class Defaults { } } - public static class Builder extends FieldMapper.Builder { + public static class Builder extends FieldMapper.Builder { public Builder(String name) { super(name, Defaults.FIELD_TYPE, Defaults.FIELD_TYPE); @@ -85,7 +85,7 @@ public RankFeatureFieldMapper build(BuilderContext context) { public static class TypeParser implements Mapper.TypeParser { @Override - public Mapper.Builder parse(String name, Map node, ParserContext parserContext) throws MapperParsingException { + public Mapper.Builder parse(String name, Map node, ParserContext parserContext) throws MapperParsingException { RankFeatureFieldMapper.Builder builder = new RankFeatureFieldMapper.Builder(name); for (Iterator> iterator = node.entrySet().iterator(); iterator.hasNext();) { Map.Entry entry = iterator.next(); diff --git a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/RankFeatureMetaFieldMapper.java b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/RankFeatureMetaFieldMapper.java index 7cf9fbce4fdfe..9a30956c5802f 100644 --- a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/RankFeatureMetaFieldMapper.java +++ b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/RankFeatureMetaFieldMapper.java @@ -55,7 +55,7 @@ public static class Defaults { } } - public static class Builder extends MetadataFieldMapper.Builder { + public static class Builder extends MetadataFieldMapper.Builder { public Builder(MappedFieldType existing) { super(NAME, existing == null ? Defaults.FIELD_TYPE : existing, Defaults.FIELD_TYPE); @@ -70,7 +70,7 @@ public RankFeatureMetaFieldMapper build(BuilderContext context) { public static class TypeParser implements MetadataFieldMapper.TypeParser { @Override - public MetadataFieldMapper.Builder parse(String name, + public MetadataFieldMapper.Builder parse(String name, Map node, ParserContext parserContext) throws MapperParsingException { return new Builder(parserContext.mapperService().fieldType(NAME)); } diff --git a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/RankFeaturesFieldMapper.java b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/RankFeaturesFieldMapper.java index 3d69b7af8d6e0..b743cf42bcb2a 100644 --- a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/RankFeaturesFieldMapper.java +++ b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/RankFeaturesFieldMapper.java @@ -51,7 +51,7 @@ public static class Defaults { } } - public static class Builder extends FieldMapper.Builder { + public static class Builder extends FieldMapper.Builder { public Builder(String name) { super(name, Defaults.FIELD_TYPE, Defaults.FIELD_TYPE); @@ -74,7 +74,7 @@ public RankFeaturesFieldMapper build(BuilderContext context) { public static class TypeParser implements Mapper.TypeParser { @Override - public Mapper.Builder parse(String name, Map node, ParserContext parserContext) throws MapperParsingException { + public Mapper.Builder parse(String name, Map node, ParserContext parserContext) throws MapperParsingException { RankFeaturesFieldMapper.Builder builder = new RankFeaturesFieldMapper.Builder(name); return builder; } diff --git a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/ScaledFloatFieldMapper.java b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/ScaledFloatFieldMapper.java index 273f35c8abf40..bf567a86ca226 100644 --- a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/ScaledFloatFieldMapper.java +++ b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/ScaledFloatFieldMapper.java @@ -82,7 +82,7 @@ public class ScaledFloatFieldMapper extends FieldMapper { // use the same default as numbers private static final Setting COERCE_SETTING = NumberFieldMapper.COERCE_SETTING; - public static class Builder extends FieldMapper.Builder { + public static class Builder extends FieldMapper.Builder { private boolean scalingFactorSet = false; private Boolean ignoreMalformed; @@ -149,7 +149,7 @@ public ScaledFloatFieldMapper build(BuilderContext context) { public static class TypeParser implements Mapper.TypeParser { @Override - public Mapper.Builder parse(String name, Map node, + public Mapper.Builder parse(String name, Map node, ParserContext parserContext) throws MapperParsingException { Builder builder = new Builder(name); TypeParsers.parseField(builder, name, node, parserContext); diff --git a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/SearchAsYouTypeFieldMapper.java b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/SearchAsYouTypeFieldMapper.java index ef09d72034f56..273fd93daef7b 100644 --- a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/SearchAsYouTypeFieldMapper.java +++ b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/SearchAsYouTypeFieldMapper.java @@ -104,7 +104,7 @@ public static class Defaults { public static class TypeParser implements Mapper.TypeParser { @Override - public Mapper.Builder parse(String name, + public Mapper.Builder parse(String name, Map node, ParserContext parserContext) throws MapperParsingException { @@ -129,7 +129,7 @@ public static class TypeParser implements Mapper.TypeParser { } } - public static class Builder extends FieldMapper.Builder { + public static class Builder extends FieldMapper.Builder { private int maxShingleSize = Defaults.MAX_SHINGLE_SIZE; public Builder(String name) { diff --git a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/TokenCountFieldMapper.java b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/TokenCountFieldMapper.java index 1da8e5d764c19..86ec61f833f82 100644 --- a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/TokenCountFieldMapper.java +++ b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/TokenCountFieldMapper.java @@ -47,7 +47,7 @@ public static class Defaults { public static final boolean DEFAULT_POSITION_INCREMENTS = true; } - public static class Builder extends FieldMapper.Builder { + public static class Builder extends FieldMapper.Builder { private NamedAnalyzer analyzer; private boolean enablePositionIncrements = Defaults.DEFAULT_POSITION_INCREMENTS; @@ -84,7 +84,7 @@ public TokenCountFieldMapper build(BuilderContext context) { public static class TypeParser implements Mapper.TypeParser { @Override - public Mapper.Builder parse(String name, Map node, ParserContext parserContext) throws MapperParsingException { + public Mapper.Builder parse(String name, Map node, ParserContext parserContext) throws MapperParsingException { TokenCountFieldMapper.Builder builder = new TokenCountFieldMapper.Builder(name); for (Iterator> iterator = node.entrySet().iterator(); iterator.hasNext();) { Map.Entry entry = iterator.next(); diff --git a/modules/parent-join/src/main/java/org/elasticsearch/join/mapper/MetaJoinFieldMapper.java b/modules/parent-join/src/main/java/org/elasticsearch/join/mapper/MetaJoinFieldMapper.java index f6f789197ac8c..a773f78925596 100644 --- a/modules/parent-join/src/main/java/org/elasticsearch/join/mapper/MetaJoinFieldMapper.java +++ b/modules/parent-join/src/main/java/org/elasticsearch/join/mapper/MetaJoinFieldMapper.java @@ -57,7 +57,7 @@ static class Defaults { } } - static class Builder extends FieldMapper.Builder { + static class Builder extends FieldMapper.Builder { Builder() { super(NAME, Defaults.FIELD_TYPE, Defaults.FIELD_TYPE); builder = this; diff --git a/modules/parent-join/src/main/java/org/elasticsearch/join/mapper/ParentIdFieldMapper.java b/modules/parent-join/src/main/java/org/elasticsearch/join/mapper/ParentIdFieldMapper.java index 67e112a220383..7189f3f3bb655 100644 --- a/modules/parent-join/src/main/java/org/elasticsearch/join/mapper/ParentIdFieldMapper.java +++ b/modules/parent-join/src/main/java/org/elasticsearch/join/mapper/ParentIdFieldMapper.java @@ -66,7 +66,7 @@ static class Defaults { } } - static class Builder extends FieldMapper.Builder { + static class Builder extends FieldMapper.Builder { private final String parent; private final Set children; diff --git a/modules/parent-join/src/main/java/org/elasticsearch/join/mapper/ParentJoinFieldMapper.java b/modules/parent-join/src/main/java/org/elasticsearch/join/mapper/ParentJoinFieldMapper.java index a2f4c4f04a877..5fa6799aa3f44 100644 --- a/modules/parent-join/src/main/java/org/elasticsearch/join/mapper/ParentJoinFieldMapper.java +++ b/modules/parent-join/src/main/java/org/elasticsearch/join/mapper/ParentJoinFieldMapper.java @@ -121,7 +121,7 @@ private static void checkParentFields(String name, List map } } - public static class Builder extends FieldMapper.Builder { + public static class Builder extends FieldMapper.Builder { final List parentIdFieldBuilders = new ArrayList<>(); boolean eagerGlobalOrdinals = true; @@ -168,7 +168,7 @@ public ParentJoinFieldMapper build(BuilderContext context) { public static class TypeParser implements Mapper.TypeParser { @Override - public Mapper.Builder parse(String name, Map node, ParserContext parserContext) throws MapperParsingException { + public Mapper.Builder parse(String name, Map node, ParserContext parserContext) throws MapperParsingException { final IndexSettings indexSettings = parserContext.mapperService().getIndexSettings(); checkIndexCompatibility(indexSettings, name); diff --git a/modules/percolator/src/main/java/org/elasticsearch/percolator/PercolatorFieldMapper.java b/modules/percolator/src/main/java/org/elasticsearch/percolator/PercolatorFieldMapper.java index 36a351a27c117..f1022857f6517 100644 --- a/modules/percolator/src/main/java/org/elasticsearch/percolator/PercolatorFieldMapper.java +++ b/modules/percolator/src/main/java/org/elasticsearch/percolator/PercolatorFieldMapper.java @@ -108,7 +108,7 @@ public class PercolatorFieldMapper extends FieldMapper { static final String RANGE_FIELD_NAME = "range_field"; static final String MINIMUM_SHOULD_MATCH_FIELD_NAME = "minimum_should_match_field"; - static class Builder extends FieldMapper.Builder { + static class Builder extends FieldMapper.Builder { private final Supplier queryShardContext; diff --git a/plugins/analysis-icu/src/main/java/org/elasticsearch/index/mapper/ICUCollationKeywordFieldMapper.java b/plugins/analysis-icu/src/main/java/org/elasticsearch/index/mapper/ICUCollationKeywordFieldMapper.java index 5903323fa3cc2..2534f7e1e4341 100644 --- a/plugins/analysis-icu/src/main/java/org/elasticsearch/index/mapper/ICUCollationKeywordFieldMapper.java +++ b/plugins/analysis-icu/src/main/java/org/elasticsearch/index/mapper/ICUCollationKeywordFieldMapper.java @@ -221,7 +221,7 @@ public DocValueFormat docValueFormat(final String format, final ZoneId timeZone) } } - public static class Builder extends FieldMapper.Builder { + public static class Builder extends FieldMapper.Builder { private String rules = null; private String language = null; private String country = null; @@ -481,7 +481,7 @@ public ICUCollationKeywordFieldMapper build(BuilderContext context) { public static class TypeParser implements Mapper.TypeParser { @Override - public Mapper.Builder parse(String name, Map node, ParserContext parserContext) + public Mapper.Builder parse(String name, Map node, ParserContext parserContext) throws MapperParsingException { Builder builder = new Builder(name); TypeParsers.parseField(builder, name, node, parserContext); diff --git a/plugins/mapper-annotated-text/src/main/java/org/elasticsearch/index/mapper/annotatedtext/AnnotatedTextFieldMapper.java b/plugins/mapper-annotated-text/src/main/java/org/elasticsearch/index/mapper/annotatedtext/AnnotatedTextFieldMapper.java index 299dc670c8b75..20d3b6e464a2b 100644 --- a/plugins/mapper-annotated-text/src/main/java/org/elasticsearch/index/mapper/annotatedtext/AnnotatedTextFieldMapper.java +++ b/plugins/mapper-annotated-text/src/main/java/org/elasticsearch/index/mapper/annotatedtext/AnnotatedTextFieldMapper.java @@ -85,7 +85,7 @@ public static class Defaults { } } - public static class Builder extends FieldMapper.Builder { + public static class Builder extends FieldMapper.Builder { private int positionIncrementGap = POSITION_INCREMENT_GAP_USE_ANALYZER; @@ -147,7 +147,7 @@ name, fieldType(), defaultFieldType, positionIncrementGap, public static class TypeParser implements Mapper.TypeParser { @Override - public Mapper.Builder parse( + public Mapper.Builder parse( String fieldName, Map node, ParserContext parserContext) throws MapperParsingException { AnnotatedTextFieldMapper.Builder builder = new AnnotatedTextFieldMapper.Builder(fieldName); diff --git a/plugins/mapper-murmur3/src/main/java/org/elasticsearch/index/mapper/murmur3/Murmur3FieldMapper.java b/plugins/mapper-murmur3/src/main/java/org/elasticsearch/index/mapper/murmur3/Murmur3FieldMapper.java index 3516519fb5591..e0c0917d353e1 100644 --- a/plugins/mapper-murmur3/src/main/java/org/elasticsearch/index/mapper/murmur3/Murmur3FieldMapper.java +++ b/plugins/mapper-murmur3/src/main/java/org/elasticsearch/index/mapper/murmur3/Murmur3FieldMapper.java @@ -55,7 +55,7 @@ public static class Defaults { } } - public static class Builder extends FieldMapper.Builder { + public static class Builder extends FieldMapper.Builder { public Builder(String name) { super(name, Defaults.FIELD_TYPE, Defaults.FIELD_TYPE); @@ -81,7 +81,7 @@ protected void setupFieldType(BuilderContext context) { public static class TypeParser implements Mapper.TypeParser { @Override - public Mapper.Builder parse(String name, Map node, ParserContext parserContext) + public Mapper.Builder parse(String name, Map node, ParserContext parserContext) throws MapperParsingException { Builder builder = new Builder(name); diff --git a/plugins/mapper-size/src/main/java/org/elasticsearch/index/mapper/size/SizeFieldMapper.java b/plugins/mapper-size/src/main/java/org/elasticsearch/index/mapper/size/SizeFieldMapper.java index 0b0e61c8539c9..b3ba775b18957 100644 --- a/plugins/mapper-size/src/main/java/org/elasticsearch/index/mapper/size/SizeFieldMapper.java +++ b/plugins/mapper-size/src/main/java/org/elasticsearch/index/mapper/size/SizeFieldMapper.java @@ -62,7 +62,7 @@ private static MappedFieldType defaultFieldType(Version indexCreated) { return defaultFieldType; } - public static class Builder extends MetadataFieldMapper.Builder { + public static class Builder extends MetadataFieldMapper.Builder { protected EnabledAttributeMapper enabledState = EnabledAttributeMapper.UNSET_DISABLED; @@ -86,7 +86,7 @@ public SizeFieldMapper build(BuilderContext context) { public static class TypeParser implements MetadataFieldMapper.TypeParser { @Override - public MetadataFieldMapper.Builder parse(String name, Map node, + public MetadataFieldMapper.Builder parse(String name, Map node, ParserContext parserContext) throws MapperParsingException { Builder builder = new Builder(parserContext.mapperService().fieldType(NAME), parserContext.indexVersionCreated()); diff --git a/server/src/main/java/org/elasticsearch/index/mapper/AbstractGeometryFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/AbstractGeometryFieldMapper.java index 8804a458b347c..fcba73124433b 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/AbstractGeometryFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/AbstractGeometryFieldMapper.java @@ -76,8 +76,8 @@ public interface Parser { Parsed parse(XContentParser parser, AbstractGeometryFieldMapper mapper) throws IOException, ParseException; } - public abstract static class Builder - extends FieldMapper.Builder { + public abstract static class Builder + extends FieldMapper.Builder { protected Boolean ignoreMalformed; protected Boolean ignoreZValue; diff --git a/server/src/main/java/org/elasticsearch/index/mapper/AbstractPointGeometryFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/AbstractPointGeometryFieldMapper.java index ee4af56c737ac..445c899209f3d 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/AbstractPointGeometryFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/AbstractPointGeometryFieldMapper.java @@ -44,20 +44,20 @@ public static class Names extends AbstractGeometryFieldMapper.Names { public static final ParseField NULL_VALUE = new ParseField("null_value"); } - public abstract static class Builder extends AbstractGeometryFieldMapper.Builder { + public abstract static class Builder extends AbstractGeometryFieldMapper.Builder { public Builder(String name, MappedFieldType fieldType, MappedFieldType defaultFieldType) { super(name, fieldType, defaultFieldType); } - public abstract Y build(BuilderContext context, String simpleName, MappedFieldType fieldType, + public abstract AbstractPointGeometryFieldMapper build(BuilderContext context, String simpleName, MappedFieldType fieldType, MappedFieldType defaultFieldType, Settings indexSettings, MultiFields multiFields, Explicit ignoreMalformed, Explicit ignoreZValue, CopyTo copyTo); @Override - public Y build(BuilderContext context) { + public AbstractPointGeometryFieldMapper build(BuilderContext context) { return build(context, name, fieldType, defaultFieldType, context.indexSettings(), multiFieldsBuilder.build(this, context), ignoreMalformed(context), ignoreZValue(context), copyTo); diff --git a/server/src/main/java/org/elasticsearch/index/mapper/AbstractShapeGeometryFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/AbstractShapeGeometryFieldMapper.java index 8d5565ccc868a..955a29003e6c8 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/AbstractShapeGeometryFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/AbstractShapeGeometryFieldMapper.java @@ -49,8 +49,8 @@ public static class Defaults extends AbstractGeometryFieldMapper.Defaults { public static final Explicit COERCE = new Explicit<>(false, false); } - public abstract static class Builder extends AbstractGeometryFieldMapper.Builder { + public abstract static class Builder extends AbstractGeometryFieldMapper.Builder { protected Boolean coerce; protected Orientation orientation; diff --git a/server/src/main/java/org/elasticsearch/index/mapper/BinaryFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/BinaryFieldMapper.java index e0c0c2b4f3142..712a798727145 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/BinaryFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/BinaryFieldMapper.java @@ -62,7 +62,7 @@ public static class Defaults { } } - public static class Builder extends FieldMapper.Builder { + public static class Builder extends FieldMapper.Builder { public Builder(String name) { super(name, Defaults.FIELD_TYPE, Defaults.FIELD_TYPE); diff --git a/server/src/main/java/org/elasticsearch/index/mapper/BooleanFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/BooleanFieldMapper.java index 8a3728a5c38ce..b9f5f4e984b42 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/BooleanFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/BooleanFieldMapper.java @@ -74,7 +74,7 @@ public static class Values { public static final BytesRef FALSE = new BytesRef("F"); } - public static class Builder extends FieldMapper.Builder { + public static class Builder extends FieldMapper.Builder { public Builder(String name) { super(name, Defaults.FIELD_TYPE, Defaults.FIELD_TYPE); diff --git a/server/src/main/java/org/elasticsearch/index/mapper/CompletionFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/CompletionFieldMapper.java index a265f1d5f1e49..493ac8986c3ac 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/CompletionFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/CompletionFieldMapper.java @@ -123,7 +123,7 @@ public static class Fields { public static class TypeParser implements Mapper.TypeParser { @Override - public Mapper.Builder parse(String name, Map node, ParserContext parserContext) + public Mapper.Builder parse(String name, Map node, ParserContext parserContext) throws MapperParsingException { CompletionFieldMapper.Builder builder = new CompletionFieldMapper.Builder(name); NamedAnalyzer indexAnalyzer = null; @@ -353,7 +353,7 @@ public void checkCompatibility(MappedFieldType fieldType, List conflicts /** * Builder for {@link CompletionFieldMapper} */ - public static class Builder extends FieldMapper.Builder { + public static class Builder extends FieldMapper.Builder { private int maxInputLength = Defaults.DEFAULT_MAX_INPUT_LENGTH; private ContextMappings contextMappings = null; diff --git a/server/src/main/java/org/elasticsearch/index/mapper/DateFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/DateFieldMapper.java index d56f185994715..ebe59344d196b 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/DateFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/DateFieldMapper.java @@ -172,7 +172,7 @@ public static Resolution ofOrdinal(int ord) { } } - public static class Builder extends FieldMapper.Builder { + public static class Builder extends FieldMapper.Builder { private Boolean ignoreMalformed; private Explicit format = new Explicit<>(DEFAULT_DATE_TIME_FORMATTER.pattern(), false); @@ -263,7 +263,7 @@ public TypeParser(Resolution resolution) { } @Override - public Mapper.Builder parse(String name, Map node, ParserContext parserContext) throws MapperParsingException { + public Mapper.Builder parse(String name, Map node, ParserContext parserContext) throws MapperParsingException { Builder builder = new Builder(name); builder.withResolution(resolution); TypeParsers.parseField(builder, name, node, parserContext); diff --git a/server/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java index db9b4306f2f5c..baa5fe5b85931 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java @@ -71,7 +71,6 @@ public Builder(RootObjectMapper.Builder builder, MapperService mapperService) { this.builderContext = new Mapper.BuilderContext(indexSettings, new ContentPath(1)); this.rootObjectMapper = builder.build(builderContext); - final String type = rootObjectMapper.name(); final DocumentMapper existingMapper = mapperService.documentMapper(); final Version indexCreatedVersion = mapperService.getIndexSettings().getIndexVersionCreated(); final Map metadataMapperParsers = @@ -97,7 +96,7 @@ public Builder meta(Map meta) { return this; } - public Builder put(MetadataFieldMapper.Builder mapper) { + public Builder put(MetadataFieldMapper.Builder mapper) { MetadataFieldMapper metadataMapper = mapper.build(builderContext); metadataMappers.put(metadataMapper.getClass(), metadataMapper); return this; diff --git a/server/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java b/server/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java index 033a37b66eeed..fc4b477472f4e 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java @@ -619,7 +619,7 @@ private static void parseNullValue(ParseContext context, ObjectMapper parentMapp } } - private static Mapper.Builder createBuilderFromFieldType(final ParseContext context, + private static Mapper.Builder createBuilderFromFieldType(final ParseContext context, MappedFieldType fieldType, String currentFieldName) { Mapper.Builder builder = null; if (fieldType instanceof TextFieldType) { @@ -666,15 +666,15 @@ private static Mapper.Builder createBuilderFromFieldType(final ParseContext return builder; } - private static Mapper.Builder newLongBuilder(String name) { + private static Mapper.Builder newLongBuilder(String name) { return new NumberFieldMapper.Builder(name, NumberFieldMapper.NumberType.LONG); } - private static Mapper.Builder newFloatBuilder(String name) { + private static Mapper.Builder newFloatBuilder(String name) { return new NumberFieldMapper.Builder(name, NumberFieldMapper.NumberType.FLOAT); } - private static Mapper.Builder newDateBuilder(String name, DateFormatter dateTimeFormatter) { + private static Mapper.Builder newDateBuilder(String name, DateFormatter dateTimeFormatter) { DateFieldMapper.Builder builder = new DateFieldMapper.Builder(name); if (dateTimeFormatter != null) { builder.format(dateTimeFormatter.pattern()).locale(dateTimeFormatter.locale()); @@ -682,7 +682,7 @@ private static Mapper.Builder createBuilderFromFieldType(final ParseContext return builder; } - private static Mapper.Builder createBuilderFromDynamicValue(final ParseContext context, + private static Mapper.Builder createBuilderFromDynamicValue(final ParseContext context, XContentParser.Token token, String currentFieldName) throws IOException { if (token == XContentParser.Token.VALUE_STRING) { diff --git a/server/src/main/java/org/elasticsearch/index/mapper/FieldAliasMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/FieldAliasMapper.java index 8d87b4f73ec43..5a1e28f9e2179 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/FieldAliasMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/FieldAliasMapper.java @@ -106,7 +106,7 @@ public Mapper.Builder parse(String name, Map node, ParserContext } } - public static class Builder extends Mapper.Builder { + public static class Builder extends Mapper.Builder { private String name; private String path; diff --git a/server/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java index f84789eb5f060..17ed8a71a7698 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java @@ -56,7 +56,7 @@ public abstract class FieldMapper extends Mapper implements Cloneable { Setting.boolSetting("index.mapping.ignore_malformed", false, Property.IndexScope); public static final Setting COERCE_SETTING = Setting.boolSetting("index.mapping.coerce", false, Property.IndexScope); - public abstract static class Builder extends Mapper.Builder { + public abstract static class Builder extends Mapper.Builder { protected final MappedFieldType fieldType; protected final MappedFieldType defaultFieldType; @@ -192,7 +192,7 @@ public Builder nullValue(Object nullValue) { return this; } - public T addMultiField(Mapper.Builder mapperBuilder) { + public T addMultiField(Mapper.Builder mapperBuilder) { multiFieldsBuilder.add(mapperBuilder); return builder; } diff --git a/server/src/main/java/org/elasticsearch/index/mapper/FieldNamesFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/FieldNamesFieldMapper.java index 70f0c5838a827..6503afb9c985b 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/FieldNamesFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/FieldNamesFieldMapper.java @@ -71,7 +71,7 @@ public static class Defaults { } } - private static class Builder extends MetadataFieldMapper.Builder { + private static class Builder extends MetadataFieldMapper.Builder { private boolean enabled = Defaults.ENABLED; private Builder(MappedFieldType existing) { @@ -100,7 +100,7 @@ public static class TypeParser implements MetadataFieldMapper.TypeParser { + "will be removed in a future major version. Please remove it from your mappings and templates."; @Override - public MetadataFieldMapper.Builder parse(String name, Map node, + public MetadataFieldMapper.Builder parse(String name, Map node, ParserContext parserContext) throws MapperParsingException { Builder builder = new Builder(parserContext.mapperService().fieldType(NAME)); diff --git a/server/src/main/java/org/elasticsearch/index/mapper/GeoPointFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/GeoPointFieldMapper.java index 722fbdf9c8ce4..60a48947da01e 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/GeoPointFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/GeoPointFieldMapper.java @@ -49,7 +49,7 @@ public class GeoPointFieldMapper extends AbstractPointGeometryFieldMapper { + public static class Builder extends AbstractPointGeometryFieldMapper.Builder { public Builder(String name) { super(name, new GeoPointFieldType(), new GeoPointFieldType()); builder = this; diff --git a/server/src/main/java/org/elasticsearch/index/mapper/GeoShapeFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/GeoShapeFieldMapper.java index 13d01d949152a..f526cd3acbde9 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/GeoShapeFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/GeoShapeFieldMapper.java @@ -53,7 +53,7 @@ public class GeoShapeFieldMapper extends AbstractShapeGeometryFieldMapper { + GeoShapeFieldType> { public Builder(String name) { super (name, new GeoShapeFieldType(), new GeoShapeFieldType()); } diff --git a/server/src/main/java/org/elasticsearch/index/mapper/IdFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/IdFieldMapper.java index 7087796965ec8..f399fddc84419 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/IdFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/IdFieldMapper.java @@ -97,7 +97,7 @@ public static class Defaults { public static class TypeParser implements MetadataFieldMapper.TypeParser { @Override - public MetadataFieldMapper.Builder parse(String name, Map node, + public MetadataFieldMapper.Builder parse(String name, Map node, ParserContext parserContext) throws MapperParsingException { throw new MapperParsingException(NAME + " is not configurable"); } diff --git a/server/src/main/java/org/elasticsearch/index/mapper/IgnoredFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/IgnoredFieldMapper.java index 02734d758a3d6..eb0abc15f2c18 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/IgnoredFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/IgnoredFieldMapper.java @@ -57,7 +57,7 @@ public static class Defaults { } } - public static class Builder extends MetadataFieldMapper.Builder { + public static class Builder extends MetadataFieldMapper.Builder { public Builder(MappedFieldType existing) { super(Defaults.NAME, existing == null ? Defaults.FIELD_TYPE : existing, Defaults.FIELD_TYPE); @@ -71,7 +71,7 @@ public IgnoredFieldMapper build(BuilderContext context) { public static class TypeParser implements MetadataFieldMapper.TypeParser { @Override - public MetadataFieldMapper.Builder parse(String name, Map node, + public MetadataFieldMapper.Builder parse(String name, Map node, ParserContext parserContext) throws MapperParsingException { return new Builder(parserContext.mapperService().fieldType(NAME)); } diff --git a/server/src/main/java/org/elasticsearch/index/mapper/IndexFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/IndexFieldMapper.java index e220c84ac4b9d..810e7b96abf64 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/IndexFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/IndexFieldMapper.java @@ -58,7 +58,7 @@ public static class Defaults { } } - public static class Builder extends MetadataFieldMapper.Builder { + public static class Builder extends MetadataFieldMapper.Builder { public Builder(MappedFieldType existing) { super(Defaults.NAME, existing == null ? Defaults.FIELD_TYPE : existing, Defaults.FIELD_TYPE); @@ -73,7 +73,7 @@ public IndexFieldMapper build(BuilderContext context) { public static class TypeParser implements MetadataFieldMapper.TypeParser { @Override - public MetadataFieldMapper.Builder parse(String name, Map node, + public MetadataFieldMapper.Builder parse(String name, Map node, ParserContext parserContext) throws MapperParsingException { throw new MapperParsingException(NAME + " is not configurable"); } diff --git a/server/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java index 7de56cb77b8bd..e67e1e27c99b8 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java @@ -63,7 +63,7 @@ public static class Defaults { public static final Explicit IGNORE_MALFORMED = new Explicit<>(false, false); } - public static class Builder extends FieldMapper.Builder { + public static class Builder extends FieldMapper.Builder { private Boolean ignoreMalformed; @@ -101,7 +101,7 @@ public TypeParser() { } @Override - public Mapper.Builder parse(String name, Map node, ParserContext parserContext) throws MapperParsingException { + public Mapper.Builder parse(String name, Map node, ParserContext parserContext) throws MapperParsingException { Builder builder = new Builder(name); TypeParsers.parseField(builder, name, node, parserContext); for (Iterator> iterator = node.entrySet().iterator(); iterator.hasNext();) { diff --git a/server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java index f212c783cfe10..f211923679eae 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java @@ -74,7 +74,7 @@ public static class Defaults { public static final int IGNORE_ABOVE = Integer.MAX_VALUE; } - public static class Builder extends FieldMapper.Builder { + public static class Builder extends FieldMapper.Builder { protected String nullValue = Defaults.NULL_VALUE; protected int ignoreAbove = Defaults.IGNORE_ABOVE; @@ -151,7 +151,7 @@ public KeywordFieldMapper build(BuilderContext context) { public static class TypeParser implements Mapper.TypeParser { @Override - public Mapper.Builder parse(String name, Map node, ParserContext parserContext) throws MapperParsingException { + public Mapper.Builder parse(String name, Map node, ParserContext parserContext) throws MapperParsingException { KeywordFieldMapper.Builder builder = new KeywordFieldMapper.Builder(name); parseField(builder, name, node, parserContext); for (Iterator> iterator = node.entrySet().iterator(); iterator.hasNext();) { diff --git a/server/src/main/java/org/elasticsearch/index/mapper/LegacyGeoShapeFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/LegacyGeoShapeFieldMapper.java index a0f4fc7a6aba9..659a7e2acc656 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/LegacyGeoShapeFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/LegacyGeoShapeFieldMapper.java @@ -180,7 +180,7 @@ private static void checkPrefixTreeSupport(String fieldName) { private static final DeprecationLogger DEPRECATION_LOGGER = new DeprecationLogger(logger); public static class Builder extends AbstractShapeGeometryFieldMapper.Builder { + LegacyGeoShapeFieldMapper.GeoShapeFieldType> { DeprecatedParameters deprecatedParameters; diff --git a/server/src/main/java/org/elasticsearch/index/mapper/Mapper.java b/server/src/main/java/org/elasticsearch/index/mapper/Mapper.java index e9ccd69b20cc5..054a7725b8db1 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/Mapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/Mapper.java @@ -56,7 +56,7 @@ public Version indexCreatedVersion() { } } - public abstract static class Builder { + public abstract static class Builder { public String name; @@ -71,7 +71,7 @@ public String name() { } /** Returns a newly built mapper. */ - public abstract Y build(BuilderContext context); + public abstract Mapper build(BuilderContext context); } public interface TypeParser { @@ -144,7 +144,7 @@ static class MultiFieldParserContext extends ParserContext { } - Mapper.Builder parse(String name, Map node, ParserContext parserContext) throws MapperParsingException; + Mapper.Builder parse(String name, Map node, ParserContext parserContext) throws MapperParsingException; } private final String simpleName; diff --git a/server/src/main/java/org/elasticsearch/index/mapper/MapperService.java b/server/src/main/java/org/elasticsearch/index/mapper/MapperService.java index 837340c04d52b..fe4f4311ca707 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/MapperService.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/MapperService.java @@ -624,7 +624,7 @@ public MappedFieldType unmappedFieldType(String type) { if (typeParser == null) { throw new IllegalArgumentException("No mapper found for type [" + type + "]"); } - final Mapper.Builder builder = typeParser.parse("__anonymous_" + type, emptyMap(), parserContext); + final Mapper.Builder builder = typeParser.parse("__anonymous_" + type, emptyMap(), parserContext); final BuilderContext builderContext = new BuilderContext(indexSettings.getSettings(), new ContentPath(1)); fieldType = ((FieldMapper)builder.build(builderContext)).fieldType(); diff --git a/server/src/main/java/org/elasticsearch/index/mapper/MetadataFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/MetadataFieldMapper.java index 614a17883e23e..8b910e82d30db 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/MetadataFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/MetadataFieldMapper.java @@ -33,7 +33,7 @@ public abstract class MetadataFieldMapper extends FieldMapper { public interface TypeParser extends Mapper.TypeParser { @Override - MetadataFieldMapper.Builder parse(String name, Map node, + MetadataFieldMapper.Builder parse(String name, Map node, ParserContext parserContext) throws MapperParsingException; /** @@ -45,10 +45,12 @@ MetadataFieldMapper.Builder parse(String name, Map node, } @SuppressWarnings("rawtypes") - public abstract static class Builder extends FieldMapper.Builder { + public abstract static class Builder extends FieldMapper.Builder { public Builder(String name, MappedFieldType fieldType, MappedFieldType defaultFieldType) { super(name, fieldType, defaultFieldType); } + + public abstract MetadataFieldMapper build(BuilderContext context); } protected MetadataFieldMapper(String simpleName, MappedFieldType fieldType, MappedFieldType defaultFieldType, Settings indexSettings) { diff --git a/server/src/main/java/org/elasticsearch/index/mapper/NestedPathFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/NestedPathFieldMapper.java index 752c32410aa0e..9d1725f6d0bff 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/NestedPathFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/NestedPathFieldMapper.java @@ -72,7 +72,7 @@ public static class Defaults { public static class TypeParser implements MetadataFieldMapper.TypeParser { @Override - public MetadataFieldMapper.Builder parse(String name, Map node, + public MetadataFieldMapper.Builder parse(String name, Map node, ParserContext parserContext) throws MapperParsingException { throw new MapperParsingException(name(parserContext.mapperService().getIndexSettings().getSettings()) + " is not configurable"); } diff --git a/server/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java index f1fc4a137f99b..8665cce17d87b 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java @@ -78,7 +78,7 @@ public static class Defaults { public static final Explicit COERCE = new Explicit<>(true, false); } - public static class Builder extends FieldMapper.Builder { + public static class Builder extends FieldMapper.Builder { private Boolean ignoreMalformed; private Boolean coerce; @@ -146,7 +146,7 @@ public TypeParser(NumberType type) { } @Override - public Mapper.Builder parse(String name, Map node, + public Mapper.Builder parse(String name, Map node, ParserContext parserContext) throws MapperParsingException { Builder builder = new Builder(name, type); TypeParsers.parseField(builder, name, node, parserContext); diff --git a/server/src/main/java/org/elasticsearch/index/mapper/ObjectMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/ObjectMapper.java index ce1c6a5da8ced..c9d1b8fae75b2 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/ObjectMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/ObjectMapper.java @@ -94,7 +94,7 @@ public boolean isIncludeInRoot() { } @SuppressWarnings("rawtypes") - public static class Builder extends Mapper.Builder { + public static class Builder extends Mapper.Builder { protected boolean enabled = Defaults.ENABLED; @@ -131,8 +131,7 @@ public T add(Mapper.Builder builder) { } @Override - @SuppressWarnings("unchecked") - public Y build(BuilderContext context) { + public ObjectMapper build(BuilderContext context) { context.path().add(name); Map mappers = new HashMap<>(); @@ -149,7 +148,7 @@ public Y build(BuilderContext context) { ObjectMapper objectMapper = createMapper(name, context.path().pathAsText(name), enabled, nested, dynamic, mappers, context.indexSettings()); - return (Y) objectMapper; + return objectMapper; } protected ObjectMapper createMapper(String name, String fullPath, boolean enabled, Nested nested, Dynamic dynamic, @@ -278,9 +277,9 @@ protected static void parseProperties(ObjectMapper.Builder objBuilder, Map fieldBuilder = typeParser.parse(realFieldName, propNode, parserContext); + Mapper.Builder fieldBuilder = typeParser.parse(realFieldName, propNode, parserContext); for (int i = fieldNameParts.length - 2; i >= 0; --i) { - ObjectMapper.Builder intermediate = new ObjectMapper.Builder<>(fieldNameParts[i]); + ObjectMapper.Builder intermediate = new ObjectMapper.Builder<>(fieldNameParts[i]); intermediate.add(fieldBuilder); fieldBuilder = intermediate; } diff --git a/server/src/main/java/org/elasticsearch/index/mapper/RangeFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/RangeFieldMapper.java index ad2e2c1d55718..0908bf1bd9590 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/RangeFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/RangeFieldMapper.java @@ -77,7 +77,7 @@ public static class Defaults { static final Setting COERCE_SETTING = Setting.boolSetting("index.mapping.coerce", true, Setting.Property.IndexScope); - public static class Builder extends FieldMapper.Builder { + public static class Builder extends FieldMapper.Builder { private Boolean coerce; private Locale locale = Locale.ROOT; private String pattern; @@ -154,7 +154,7 @@ public TypeParser(RangeType type) { } @Override - public Mapper.Builder parse(String name, Map node, + public Mapper.Builder parse(String name, Map node, ParserContext parserContext) throws MapperParsingException { Builder builder = new Builder(name, type); TypeParsers.parseField(builder, name, node, parserContext); diff --git a/server/src/main/java/org/elasticsearch/index/mapper/RootObjectMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/RootObjectMapper.java index 5d7957e139599..0cb6c8dd286ff 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/RootObjectMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/RootObjectMapper.java @@ -59,7 +59,7 @@ public static class Defaults { public static final boolean NUMERIC_DETECTION = false; } - public static class Builder extends ObjectMapper.Builder { + public static class Builder extends ObjectMapper.Builder { protected Explicit dynamicTemplates = new Explicit<>(new DynamicTemplate[0], false); protected Explicit dynamicDateTimeFormatters = new Explicit<>(Defaults.DYNAMIC_DATE_TIME_FORMATTERS, false); @@ -84,7 +84,7 @@ public Builder dynamicTemplates(Collection templates) { @Override public RootObjectMapper build(BuilderContext context) { fixRedundantIncludes(this, true); - return super.build(context); + return (RootObjectMapper) super.build(context); } /** @@ -373,7 +373,7 @@ private static void validateDynamicTemplate(Mapper.TypeParser.ParserContext pars Map fieldTypeConfig = dynamicTemplate.mappingForName("__dummy__", defaultDynamicType); fieldTypeConfig.remove("type"); try { - Mapper.Builder dummyBuilder = typeParser.parse("__dummy__", fieldTypeConfig, parserContext); + Mapper.Builder dummyBuilder = typeParser.parse("__dummy__", fieldTypeConfig, parserContext); if (fieldTypeConfig.isEmpty()) { Settings indexSettings = parserContext.mapperService().getIndexSettings().getSettings(); BuilderContext builderContext = new BuilderContext(indexSettings, new ContentPath(1)); diff --git a/server/src/main/java/org/elasticsearch/index/mapper/RoutingFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/RoutingFieldMapper.java index b7cf5fd77a807..703394c0de8c1 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/RoutingFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/RoutingFieldMapper.java @@ -58,7 +58,7 @@ public static class Defaults { public static final boolean REQUIRED = false; } - public static class Builder extends MetadataFieldMapper.Builder { + public static class Builder extends MetadataFieldMapper.Builder { private boolean required = Defaults.REQUIRED; @@ -79,7 +79,7 @@ public RoutingFieldMapper build(BuilderContext context) { public static class TypeParser implements MetadataFieldMapper.TypeParser { @Override - public MetadataFieldMapper.Builder parse(String name, Map node, + public MetadataFieldMapper.Builder parse(String name, Map node, ParserContext parserContext) throws MapperParsingException { Builder builder = new Builder(parserContext.mapperService().fieldType(NAME)); for (Iterator> iterator = node.entrySet().iterator(); iterator.hasNext();) { diff --git a/server/src/main/java/org/elasticsearch/index/mapper/SeqNoFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/SeqNoFieldMapper.java index c8e06c14de944..4027f5157b521 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/SeqNoFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/SeqNoFieldMapper.java @@ -105,7 +105,7 @@ public static class SeqNoDefaults { } } - public static class Builder extends MetadataFieldMapper.Builder { + public static class Builder extends MetadataFieldMapper.Builder { public Builder() { super(SeqNoDefaults.NAME, SeqNoDefaults.FIELD_TYPE, SeqNoDefaults.FIELD_TYPE); @@ -119,7 +119,7 @@ public SeqNoFieldMapper build(BuilderContext context) { public static class TypeParser implements MetadataFieldMapper.TypeParser { @Override - public MetadataFieldMapper.Builder parse(String name, Map node, ParserContext parserContext) + public MetadataFieldMapper.Builder parse(String name, Map node, ParserContext parserContext) throws MapperParsingException { throw new MapperParsingException(NAME + " is not configurable"); } diff --git a/server/src/main/java/org/elasticsearch/index/mapper/SourceFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/SourceFieldMapper.java index 19cca6a7bd03d..8f39bcf3bec2d 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/SourceFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/SourceFieldMapper.java @@ -74,7 +74,7 @@ public static class Defaults { } - public static class Builder extends MetadataFieldMapper.Builder { + public static class Builder extends MetadataFieldMapper.Builder { private boolean enabled = Defaults.ENABLED; @@ -108,7 +108,7 @@ public SourceFieldMapper build(BuilderContext context) { public static class TypeParser implements MetadataFieldMapper.TypeParser { @Override - public MetadataFieldMapper.Builder parse(String name, Map node, + public MetadataFieldMapper.Builder parse(String name, Map node, ParserContext parserContext) throws MapperParsingException { Builder builder = new Builder(); diff --git a/server/src/main/java/org/elasticsearch/index/mapper/TextFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/TextFieldMapper.java index 6c28958d07dc3..207426f31ab88 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/TextFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/TextFieldMapper.java @@ -110,7 +110,7 @@ public static class Defaults { public static final int POSITION_INCREMENT_GAP = 100; } - public static class Builder extends FieldMapper.Builder { + public static class Builder extends FieldMapper.Builder { private int positionIncrementGap = POSITION_INCREMENT_GAP_USE_ANALYZER; private int minPrefixChars = -1; diff --git a/server/src/main/java/org/elasticsearch/index/mapper/TypeFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/TypeFieldMapper.java index bdaf90c60cf1d..7022cff04ee17 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/TypeFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/TypeFieldMapper.java @@ -74,7 +74,7 @@ public static class Defaults { public static class TypeParser implements MetadataFieldMapper.TypeParser { @Override - public MetadataFieldMapper.Builder parse(String name, Map node, + public MetadataFieldMapper.Builder parse(String name, Map node, ParserContext parserContext) throws MapperParsingException { throw new MapperParsingException(NAME + " is not configurable"); } diff --git a/server/src/main/java/org/elasticsearch/index/mapper/TypeParsers.java b/server/src/main/java/org/elasticsearch/index/mapper/TypeParsers.java index 4c2fdbdd73725..f451909fbe481 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/TypeParsers.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/TypeParsers.java @@ -146,7 +146,7 @@ private static void parseAnalyzersAndTermVectors(FieldMapper.Builder builder, St } } - public static void parseNorms(FieldMapper.Builder builder, String fieldName, Object propNode) { + public static void parseNorms(FieldMapper.Builder builder, String fieldName, Object propNode) { builder.omitNorms(XContentMapValues.nodeBooleanValue(propNode, fieldName + ".norms") == false); } @@ -154,7 +154,7 @@ public static void parseNorms(FieldMapper.Builder builder, String fieldName * Parse text field attributes. In addition to {@link #parseField common attributes} * this will parse analysis and term-vectors related settings. */ - public static void parseTextField(FieldMapper.Builder builder, String name, Map fieldNode, + public static void parseTextField(FieldMapper.Builder builder, String name, Map fieldNode, Mapper.TypeParser.ParserContext parserContext) { parseField(builder, name, fieldNode, parserContext); parseAnalyzersAndTermVectors(builder, name, fieldNode, parserContext); @@ -172,7 +172,7 @@ public static void parseTextField(FieldMapper.Builder builder, String name, /** * Parse the {@code meta} key of the mapping. */ - public static void parseMeta(FieldMapper.Builder builder, String name, Map fieldNode) { + public static void parseMeta(FieldMapper.Builder builder, String name, Map fieldNode) { Object metaObject = fieldNode.remove("meta"); if (metaObject == null) { // no meta @@ -218,7 +218,7 @@ public static void parseMeta(FieldMapper.Builder builder, String name, Map< /** * Parse common field attributes such as {@code doc_values} or {@code store}. */ - public static void parseField(FieldMapper.Builder builder, String name, Map fieldNode, + public static void parseField(FieldMapper.Builder builder, String name, Map fieldNode, Mapper.TypeParser.ParserContext parserContext) { parseMeta(builder, name, fieldNode); for (Iterator> iterator = fieldNode.entrySet().iterator(); iterator.hasNext();) { diff --git a/server/src/main/java/org/elasticsearch/index/mapper/VersionFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/VersionFieldMapper.java index 39d7e67ed2c57..d8e8966992598 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/VersionFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/VersionFieldMapper.java @@ -56,7 +56,7 @@ public static class Defaults { public static class TypeParser implements MetadataFieldMapper.TypeParser { @Override - public MetadataFieldMapper.Builder parse(String name, Map node, + public MetadataFieldMapper.Builder parse(String name, Map node, ParserContext parserContext) throws MapperParsingException { throw new MapperParsingException(NAME + " is not configurable"); } diff --git a/server/src/test/java/org/elasticsearch/index/mapper/ExternalMapper.java b/server/src/test/java/org/elasticsearch/index/mapper/ExternalMapper.java index d181b53537400..30645ffd84a97 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/ExternalMapper.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/ExternalMapper.java @@ -56,7 +56,7 @@ public static class Names { public static final String FIELD_SHAPE = "shape"; } - public static class Builder extends FieldMapper.Builder { + public static class Builder extends FieldMapper.Builder { private BinaryFieldMapper.Builder binBuilder = new BinaryFieldMapper.Builder(Names.FIELD_BIN); private BooleanFieldMapper.Builder boolBuilder = new BooleanFieldMapper.Builder(Names.FIELD_BOOL); @@ -84,7 +84,7 @@ public ExternalMapper build(BuilderContext context) { context.path().add(name); BinaryFieldMapper binMapper = binBuilder.build(context); BooleanFieldMapper boolMapper = boolBuilder.build(context); - GeoPointFieldMapper pointMapper = latLonPointBuilder.build(context); + GeoPointFieldMapper pointMapper = (GeoPointFieldMapper) latLonPointBuilder.build(context); AbstractShapeGeometryFieldMapper shapeMapper = shapeBuilder.build(context); FieldMapper stringMapper = (FieldMapper)stringBuilder.build(context); context.path().remove(); diff --git a/server/src/test/java/org/elasticsearch/index/mapper/ExternalMetadataMapper.java b/server/src/test/java/org/elasticsearch/index/mapper/ExternalMetadataMapper.java index 9f18ba9815472..844d824083924 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/ExternalMetadataMapper.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/ExternalMetadataMapper.java @@ -74,7 +74,7 @@ public void postParse(ParseContext context) throws IOException { context.doc().add(new StringField(FIELD_NAME, FIELD_VALUE, Store.YES)); } - public static class Builder extends MetadataFieldMapper.Builder { + public static class Builder extends MetadataFieldMapper.Builder { protected Builder() { super(FIELD_NAME, FIELD_TYPE, FIELD_TYPE); @@ -90,7 +90,7 @@ public ExternalMetadataMapper build(BuilderContext context) { public static class TypeParser implements MetadataFieldMapper.TypeParser { @Override - public MetadataFieldMapper.Builder parse(String name, Map node, + public MetadataFieldMapper.Builder parse(String name, Map node, ParserContext parserContext) throws MapperParsingException { return new Builder(); } diff --git a/server/src/test/java/org/elasticsearch/index/mapper/FakeStringFieldMapper.java b/server/src/test/java/org/elasticsearch/index/mapper/FakeStringFieldMapper.java index bc97b1a68dddf..72588e0323943 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/FakeStringFieldMapper.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/FakeStringFieldMapper.java @@ -50,7 +50,7 @@ public static class Defaults { } } - public static class Builder extends FieldMapper.Builder { + public static class Builder extends FieldMapper.Builder { public Builder(String name) { super(name, Defaults.FIELD_TYPE, Defaults.FIELD_TYPE); diff --git a/server/src/test/java/org/elasticsearch/index/mapper/TypeParsersTests.java b/server/src/test/java/org/elasticsearch/index/mapper/TypeParsersTests.java index 5558b068e1042..b4074833ce9dc 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/TypeParsersTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/TypeParsersTests.java @@ -19,20 +19,6 @@ package org.elasticsearch.index.mapper; -import static org.elasticsearch.index.analysis.AnalysisRegistry.DEFAULT_ANALYZER_NAME; -import static org.elasticsearch.index.analysis.AnalysisRegistry.DEFAULT_SEARCH_ANALYZER_NAME; -import static org.elasticsearch.index.analysis.AnalysisRegistry.DEFAULT_SEARCH_QUOTED_ANALYZER_NAME; -import static org.hamcrest.core.IsEqual.equalTo; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -import java.io.IOException; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; -import java.util.stream.Collectors; -import java.util.stream.IntStream; - import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.standard.StandardAnalyzer; @@ -56,6 +42,20 @@ import org.elasticsearch.test.VersionUtils; import org.hamcrest.Matchers; +import java.io.IOException; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.stream.Collectors; +import java.util.stream.IntStream; + +import static org.elasticsearch.index.analysis.AnalysisRegistry.DEFAULT_ANALYZER_NAME; +import static org.elasticsearch.index.analysis.AnalysisRegistry.DEFAULT_SEARCH_ANALYZER_NAME; +import static org.elasticsearch.index.analysis.AnalysisRegistry.DEFAULT_SEARCH_QUOTED_ANALYZER_NAME; +import static org.hamcrest.core.IsEqual.equalTo; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + public class TypeParsersTests extends ESTestCase { private static final IndexMetadata EMPTY_INDEX_METADATA = IndexMetadata.builder("") @@ -232,7 +232,7 @@ public TokenStream create(TokenStream tokenStream) { } public void testParseMeta() { - FieldMapper.Builder builder = new KeywordFieldMapper.Builder("foo"); + FieldMapper.Builder builder = new KeywordFieldMapper.Builder("foo"); Mapper.TypeParser.ParserContext parserContext = new Mapper.TypeParser.ParserContext(null, null, null, null, null); { diff --git a/server/src/test/java/org/elasticsearch/indices/IndicesModuleTests.java b/server/src/test/java/org/elasticsearch/indices/IndicesModuleTests.java index d0febab81085a..311b5fb6c2f32 100644 --- a/server/src/test/java/org/elasticsearch/indices/IndicesModuleTests.java +++ b/server/src/test/java/org/elasticsearch/indices/IndicesModuleTests.java @@ -56,7 +56,7 @@ public class IndicesModuleTests extends ESTestCase { private static class FakeMapperParser implements Mapper.TypeParser { @Override - public Mapper.Builder parse(String name, Map node, ParserContext parserContext) + public Mapper.Builder parse(String name, Map node, ParserContext parserContext) throws MapperParsingException { return null; } @@ -64,7 +64,7 @@ private static class FakeMapperParser implements Mapper.TypeParser { private static class FakeMetadataMapperParser implements MetadataFieldMapper.TypeParser { @Override - public MetadataFieldMapper.Builder parse(String name, Map node, ParserContext parserContext) + public MetadataFieldMapper.Builder parse(String name, Map node, ParserContext parserContext) throws MapperParsingException { return null; } diff --git a/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/mapper/HistogramFieldMapper.java b/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/mapper/HistogramFieldMapper.java index cc64098cff6b5..3cd48ed73fd5e 100644 --- a/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/mapper/HistogramFieldMapper.java +++ b/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/mapper/HistogramFieldMapper.java @@ -86,7 +86,7 @@ public static class Defaults { public static final ParseField COUNTS_FIELD = new ParseField("counts"); public static final ParseField VALUES_FIELD = new ParseField("values"); - public static class Builder extends FieldMapper.Builder { + public static class Builder extends FieldMapper.Builder { protected Boolean ignoreMalformed; public Builder(String name) { @@ -126,8 +126,7 @@ public HistogramFieldMapper build(BuilderContext context) { public static class TypeParser implements Mapper.TypeParser { @Override - public Mapper.Builder parse(String name, - Map node, ParserContext parserContext) + public Mapper.Builder parse(String name, Map node, ParserContext parserContext) throws MapperParsingException { Builder builder = new HistogramFieldMapper.Builder(name); TypeParsers.parseMeta(builder, name, node); diff --git a/x-pack/plugin/mapper-constant-keyword/src/main/java/org/elasticsearch/xpack/constantkeyword/mapper/ConstantKeywordFieldMapper.java b/x-pack/plugin/mapper-constant-keyword/src/main/java/org/elasticsearch/xpack/constantkeyword/mapper/ConstantKeywordFieldMapper.java index 0551d7ba84890..8f025fc1c8011 100644 --- a/x-pack/plugin/mapper-constant-keyword/src/main/java/org/elasticsearch/xpack/constantkeyword/mapper/ConstantKeywordFieldMapper.java +++ b/x-pack/plugin/mapper-constant-keyword/src/main/java/org/elasticsearch/xpack/constantkeyword/mapper/ConstantKeywordFieldMapper.java @@ -60,7 +60,7 @@ public static class Defaults { } } - public static class Builder extends FieldMapper.Builder { + public static class Builder extends FieldMapper.Builder { public Builder(String name) { super(name, Defaults.FIELD_TYPE, Defaults.FIELD_TYPE); @@ -88,7 +88,7 @@ public ConstantKeywordFieldMapper build(BuilderContext context) { public static class TypeParser implements Mapper.TypeParser { @Override - public Mapper.Builder parse(String name, Map node, ParserContext parserContext) throws MapperParsingException { + public Mapper.Builder parse(String name, Map node, ParserContext parserContext) throws MapperParsingException { Object value = null; if (node.containsKey("value")) { value = node.remove("value"); diff --git a/x-pack/plugin/mapper-flattened/src/main/java/org/elasticsearch/xpack/flattened/mapper/FlatObjectFieldMapper.java b/x-pack/plugin/mapper-flattened/src/main/java/org/elasticsearch/xpack/flattened/mapper/FlatObjectFieldMapper.java index 6823b970b6b04..2f31d2a140466 100644 --- a/x-pack/plugin/mapper-flattened/src/main/java/org/elasticsearch/xpack/flattened/mapper/FlatObjectFieldMapper.java +++ b/x-pack/plugin/mapper-flattened/src/main/java/org/elasticsearch/xpack/flattened/mapper/FlatObjectFieldMapper.java @@ -109,7 +109,7 @@ private static class Defaults { public static final int IGNORE_ABOVE = Integer.MAX_VALUE; } - public static class Builder extends FieldMapper.Builder { + public static class Builder extends FieldMapper.Builder { private int depthLimit = Defaults.DEPTH_LIMIT; private int ignoreAbove = Defaults.IGNORE_ABOVE; @@ -160,7 +160,7 @@ public Builder splitQueriesOnWhitespace(boolean splitQueriesOnWhitespace) { } @Override - public Builder addMultiField(Mapper.Builder mapperBuilder) { + public Builder addMultiField(Mapper.Builder mapperBuilder) { throw new UnsupportedOperationException("[fields] is not supported for [" + CONTENT_TYPE + "] fields."); } @@ -188,7 +188,7 @@ public FlatObjectFieldMapper build(BuilderContext context) { public static class TypeParser implements Mapper.TypeParser { @Override - public Mapper.Builder parse(String name, Map node, ParserContext parserContext) throws MapperParsingException { + public Mapper.Builder parse(String name, Map node, ParserContext parserContext) throws MapperParsingException { Builder builder = new Builder(name); parseField(builder, name, node, parserContext); for (Iterator> iterator = node.entrySet().iterator(); iterator.hasNext();) { diff --git a/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/GeoShapeWithDocValuesFieldMapper.java b/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/GeoShapeWithDocValuesFieldMapper.java index 8b1daa6d6ae47..830bff751d311 100644 --- a/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/GeoShapeWithDocValuesFieldMapper.java +++ b/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/GeoShapeWithDocValuesFieldMapper.java @@ -65,7 +65,7 @@ public class GeoShapeWithDocValuesFieldMapper extends GeoShapeFieldMapper { @SuppressWarnings("rawtypes") public static class Builder extends AbstractShapeGeometryFieldMapper.Builder { + GeoShapeWithDocValuesFieldType> { public Builder(String name) { super (name, new GeoShapeWithDocValuesFieldType(), new GeoShapeWithDocValuesFieldType()); } diff --git a/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/PointFieldMapper.java b/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/PointFieldMapper.java index aefae8607092e..a986127dfc551 100644 --- a/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/PointFieldMapper.java +++ b/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/PointFieldMapper.java @@ -34,7 +34,7 @@ public class PointFieldMapper extends AbstractPointGeometryFieldMapper { + public static class Builder extends AbstractPointGeometryFieldMapper.Builder { public Builder(String name) { super(name, new PointFieldType(), new PointFieldType()); builder = this; diff --git a/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/ShapeFieldMapper.java b/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/ShapeFieldMapper.java index 2ea86054dda6f..a865768d00008 100644 --- a/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/ShapeFieldMapper.java +++ b/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/ShapeFieldMapper.java @@ -45,7 +45,7 @@ public static class Defaults extends AbstractShapeGeometryFieldMapper.Defaults { @SuppressWarnings({"unchecked", "rawtypes"}) public static class Builder extends AbstractShapeGeometryFieldMapper.Builder { + ShapeFieldType> { public Builder(String name) { super(name, Defaults.FIELD_TYPE, Defaults.FIELD_TYPE); diff --git a/x-pack/plugin/vectors/src/main/java/org/elasticsearch/xpack/vectors/mapper/DenseVectorFieldMapper.java b/x-pack/plugin/vectors/src/main/java/org/elasticsearch/xpack/vectors/mapper/DenseVectorFieldMapper.java index 4d5ca89652ba5..2a8ce28a9e643 100644 --- a/x-pack/plugin/vectors/src/main/java/org/elasticsearch/xpack/vectors/mapper/DenseVectorFieldMapper.java +++ b/x-pack/plugin/vectors/src/main/java/org/elasticsearch/xpack/vectors/mapper/DenseVectorFieldMapper.java @@ -58,7 +58,7 @@ public static class Defaults { } } - public static class Builder extends FieldMapper.Builder { + public static class Builder extends FieldMapper.Builder { private int dims = 0; public Builder(String name) { @@ -97,7 +97,7 @@ public DenseVectorFieldMapper build(BuilderContext context) { public static class TypeParser implements Mapper.TypeParser { @Override - public Mapper.Builder parse(String name, Map node, ParserContext parserContext) throws MapperParsingException { + public Mapper.Builder parse(String name, Map node, ParserContext parserContext) throws MapperParsingException { DenseVectorFieldMapper.Builder builder = new DenseVectorFieldMapper.Builder(name); Object dimsField = node.remove("dims"); if (dimsField == null) { diff --git a/x-pack/plugin/vectors/src/main/java/org/elasticsearch/xpack/vectors/mapper/SparseVectorFieldMapper.java b/x-pack/plugin/vectors/src/main/java/org/elasticsearch/xpack/vectors/mapper/SparseVectorFieldMapper.java index 9308de86b664a..d5c03e2400e47 100644 --- a/x-pack/plugin/vectors/src/main/java/org/elasticsearch/xpack/vectors/mapper/SparseVectorFieldMapper.java +++ b/x-pack/plugin/vectors/src/main/java/org/elasticsearch/xpack/vectors/mapper/SparseVectorFieldMapper.java @@ -53,7 +53,7 @@ public static class Defaults { } } - public static class Builder extends FieldMapper.Builder { + public static class Builder extends FieldMapper.Builder { public Builder(String name) { super(name, Defaults.FIELD_TYPE, Defaults.FIELD_TYPE); @@ -71,7 +71,7 @@ public SparseVectorFieldMapper build(BuilderContext context) { public static class TypeParser implements Mapper.TypeParser { @Override - public Mapper.Builder parse(String name, Map node, ParserContext parserContext) + public Mapper.Builder parse(String name, Map node, ParserContext parserContext) throws MapperParsingException { if (parserContext.indexVersionCreated().onOrAfter(Version.V_8_0_0)) { throw new IllegalArgumentException(ERROR_MESSAGE); diff --git a/x-pack/plugin/wildcard/src/main/java/org/elasticsearch/xpack/wildcard/mapper/WildcardFieldMapper.java b/x-pack/plugin/wildcard/src/main/java/org/elasticsearch/xpack/wildcard/mapper/WildcardFieldMapper.java index ec50308188520..cb4dc07ba81cf 100644 --- a/x-pack/plugin/wildcard/src/main/java/org/elasticsearch/xpack/wildcard/mapper/WildcardFieldMapper.java +++ b/x-pack/plugin/wildcard/src/main/java/org/elasticsearch/xpack/wildcard/mapper/WildcardFieldMapper.java @@ -100,7 +100,7 @@ public static class Defaults { public static final int IGNORE_ABOVE = Integer.MAX_VALUE; } - public static class Builder extends FieldMapper.Builder { + public static class Builder extends FieldMapper.Builder { protected int ignoreAbove = Defaults.IGNORE_ABOVE; @@ -179,7 +179,7 @@ public WildcardFieldMapper build(BuilderContext context) { public static class TypeParser implements Mapper.TypeParser { @Override - public Mapper.Builder parse(String name, Map node, ParserContext parserContext) + public Mapper.Builder parse(String name, Map node, ParserContext parserContext) throws MapperParsingException { WildcardFieldMapper.Builder builder = new WildcardFieldMapper.Builder(name); parseField(builder, name, node, parserContext);