Remove generics from Mapper.Builder

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

@@ -48,7 +48,6 @@ public static class Builder extends ParametrizedFieldMapper.Builder {
 
         public Builder(String name) {
             super(name);
-            builder = this;
         }
 
         @Override

modules/parent-join/src/main/java/org/elasticsearch/join/mapper/MetaJoinFieldMapper.java

@@ -61,13 +61,12 @@ static class Defaults {
         }
     }
 
-    static class Builder extends FieldMapper.Builder<Builder> {
+    static class Builder extends FieldMapper.Builder {
 
         final String joinField;
 
         Builder(String joinField) {
             super(NAME, Defaults.FIELD_TYPE);
-            builder = this;
             this.joinField = joinField;
         }
 

modules/parent-join/src/main/java/org/elasticsearch/join/mapper/ParentIdFieldMapper.java

@@ -68,13 +68,12 @@ static class Defaults {
         }
     }
 
-    static class Builder extends FieldMapper.Builder<Builder> {
+    static class Builder extends FieldMapper.Builder {
         private final String parent;
         private final Set<String> children;
 
         Builder(String name, String parent, Set<String> children) {
             super(name, Defaults.FIELD_TYPE);
-            builder = this;
             this.parent = parent;
             this.children = children;
         }
@@ -85,7 +84,7 @@ public Set<String> getChildren() {
 
         public Builder eagerGlobalOrdinals(boolean eagerGlobalOrdinals) {
             this.eagerGlobalOrdinals = eagerGlobalOrdinals;
-            return builder;
+            return this;
         }
 
         @Override

modules/parent-join/src/main/java/org/elasticsearch/join/mapper/ParentJoinFieldMapper.java

@@ -137,24 +137,23 @@ private static void checkParentFields(String name, List<ParentIdFieldMapper> map
         }
     }
 
-    public static class Builder extends FieldMapper.Builder<Builder> {
+    public static class Builder extends FieldMapper.Builder {
         final List<ParentIdFieldMapper.Builder> parentIdFieldBuilders = new ArrayList<>();
         boolean eagerGlobalOrdinals = true;
 
         public Builder(String name) {
             super(name, Defaults.FIELD_TYPE);
-            builder = this;
         }
 
         public Builder addParent(String parent, Set<String> children) {
             String parentIdFieldName = getParentIdFieldName(name, parent);
             parentIdFieldBuilders.add(new ParentIdFieldMapper.Builder(parentIdFieldName, parent, children));
-            return builder;
+            return this;
         }
 
         public Builder eagerGlobalOrdinals(boolean eagerGlobalOrdinals) {
             this.eagerGlobalOrdinals = eagerGlobalOrdinals;
-            return builder;
+            return this;
         }
 
         @Override
@@ -178,7 +177,7 @@ public ParentJoinFieldMapper build(BuilderContext context) {
 
     public static class TypeParser implements Mapper.TypeParser {
         @Override
-        public Mapper.Builder<?> parse(String name, Map<String, Object> node, ParserContext parserContext) throws MapperParsingException {
+        public Mapper.Builder parse(String name, Map<String, Object> node, ParserContext parserContext) throws MapperParsingException {
             final IndexSettings indexSettings = parserContext.mapperService().getIndexSettings();
             checkIndexCompatibility(indexSettings, name);
 

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

@@ -118,8 +118,7 @@ public Object parseAndFormatObject(Object value, String format) {
         }
     }
 
-    public abstract static class Builder<T extends Builder<T, FT>, FT extends AbstractGeometryFieldType>
-            extends FieldMapper.Builder<T> {
+    public abstract static class Builder extends FieldMapper.Builder {
         protected Boolean ignoreMalformed;
         protected Boolean ignoreZValue;
         protected boolean indexed = true;

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

@@ -57,8 +57,7 @@ public static class Names extends AbstractGeometryFieldMapper.Names {
         DEFAULT_FIELD_TYPE.freeze();
     }
 
-    public abstract static class Builder<T extends Builder<T, FT>,
-            FT extends AbstractPointGeometryFieldType> extends AbstractGeometryFieldMapper.Builder<T, FT> {
+    public abstract static class Builder extends AbstractGeometryFieldMapper.Builder {
 
         protected ParsedPoint nullValue;
 

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

@@ -48,8 +48,7 @@ public static class Defaults extends AbstractGeometryFieldMapper.Defaults {
         public static final Explicit<Boolean> COERCE = new Explicit<>(false, false);
     }
 
-    public abstract static class Builder<T extends Builder<T, FT>,
-            FT extends AbstractShapeGeometryFieldType> extends AbstractGeometryFieldMapper.Builder<T, FT> {
+    public abstract static class Builder extends AbstractGeometryFieldMapper.Builder {
         protected Boolean coerce;
         protected Orientation orientation;
 

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

@@ -620,15 +620,15 @@ private static void parseNullValue(ParseContext context, ObjectMapper parentMapp
         }
     }
 
-    private static Mapper.Builder<?> newLongBuilder(String name, Settings settings) {
+    private static Mapper.Builder newLongBuilder(String name, Settings settings) {
         return new NumberFieldMapper.Builder(name, NumberFieldMapper.NumberType.LONG, settings);
     }
 
-    private static Mapper.Builder<?> newFloatBuilder(String name, Settings settings) {
+    private static Mapper.Builder newFloatBuilder(String name, Settings settings) {
         return new NumberFieldMapper.Builder(name, NumberFieldMapper.NumberType.FLOAT, settings);
     }
 
-    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) {
@@ -747,7 +747,7 @@ private static void parseDynamicValue(final ParseContext context, ObjectMapper p
             return;
         }
         final Mapper.BuilderContext builderContext = new Mapper.BuilderContext(context.indexSettings().getSettings(), context.path());
-        final Mapper.Builder<?> builder = createBuilderFromDynamicValue(context, token, currentFieldName);
+        final Mapper.Builder builder = createBuilderFromDynamicValue(context, token, currentFieldName);
         Mapper mapper = builder.build(builderContext);
         context.addDynamicMapper(mapper);
 

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

@@ -133,7 +133,7 @@ public Mapper.Builder parse(String name, Map<String, Object> node, ParserContext
         }
     }
 
-    public static class Builder extends Mapper.Builder<FieldAliasMapper.Builder> {
+    public static class Builder extends Mapper.Builder {
         private String name;
         private String path;
 

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

@@ -52,7 +52,7 @@ public abstract class FieldMapper extends Mapper implements Cloneable {
         Setting.boolSetting("index.mapping.ignore_malformed", false, Property.IndexScope);
     public static final Setting<Boolean> COERCE_SETTING =
         Setting.boolSetting("index.mapping.coerce", false, Property.IndexScope);
-    public abstract static class Builder<T extends Builder<T>> extends Mapper.Builder<T> {
+    public abstract static class Builder extends Mapper.Builder {
 
         protected final FieldType fieldType;
         protected boolean omitNormsSet = false;
@@ -75,106 +75,109 @@ protected Builder(String name, FieldType fieldType) {
             multiFieldsBuilder = new MultiFields.Builder();
         }
 
-        public T index(boolean index) {
+        public Builder index(boolean index) {
             this.indexed = index;
             if (index == false) {
                 this.fieldType.setIndexOptions(IndexOptions.NONE);
             }
-            return builder;
+            return this;
         }
 
-        public T store(boolean store) {
+        public Builder store(boolean store) {
             this.fieldType.setStored(store);
-            return builder;
+            return this;
         }
 
-        public T docValues(boolean docValues) {
+        public FieldMapper.Builder docValues(boolean docValues) {
             this.hasDocValues = docValues;
-            return builder;
+            return this;
         }
 
-        public T storeTermVectors(boolean termVectors) {
+        public Builder storeTermVectors(boolean termVectors) {
             if (termVectors != this.fieldType.storeTermVectors()) {
                 this.fieldType.setStoreTermVectors(termVectors);
             } // don't set it to false, it is default and might be flipped by a more specific option
-            return builder;
+            return this;
         }
 
-        public T storeTermVectorOffsets(boolean termVectorOffsets) {
+        public Builder storeTermVectorOffsets(boolean termVectorOffsets) {
             if (termVectorOffsets) {
                 this.fieldType.setStoreTermVectors(termVectorOffsets);
             }
             this.fieldType.setStoreTermVectorOffsets(termVectorOffsets);
-            return builder;
+            return this;
         }
 
-        public T storeTermVectorPositions(boolean termVectorPositions) {
+        public Builder storeTermVectorPositions(boolean termVectorPositions) {
             if (termVectorPositions) {
                 this.fieldType.setStoreTermVectors(termVectorPositions);
             }
             this.fieldType.setStoreTermVectorPositions(termVectorPositions);
-            return builder;
+            return this;
         }
 
-        public T storeTermVectorPayloads(boolean termVectorPayloads) {
+        public Builder storeTermVectorPayloads(boolean termVectorPayloads) {
             if (termVectorPayloads) {
                 this.fieldType.setStoreTermVectors(termVectorPayloads);
             }
             this.fieldType.setStoreTermVectorPayloads(termVectorPayloads);
-            return builder;
+            return this;
         }
 
-        public T omitNorms(boolean omitNorms) {
+        public Builder omitNorms(boolean omitNorms) {
             this.fieldType.setOmitNorms(omitNorms);
             this.omitNormsSet = true;
-            return builder;
+            return this;
         }
 
-        public T indexOptions(IndexOptions indexOptions) {
+        public Builder indexOptions(IndexOptions indexOptions) {
             this.fieldType.setIndexOptions(indexOptions);
             this.indexOptionsSet = true;
-            return builder;
+            return this;
         }
 
-        public T indexAnalyzer(NamedAnalyzer indexAnalyzer) {
+        public Builder indexAnalyzer(NamedAnalyzer indexAnalyzer) {
             this.indexAnalyzer = indexAnalyzer;
-            return builder;
+            return this;
         }
 
-        public T searchAnalyzer(NamedAnalyzer searchAnalyzer) {
+        public Builder searchAnalyzer(NamedAnalyzer searchAnalyzer) {
             this.searchAnalyzer = searchAnalyzer;
-            return builder;
+            return this;
         }
 
-        public T searchQuoteAnalyzer(NamedAnalyzer searchQuoteAnalyzer) {
+        public Builder searchQuoteAnalyzer(NamedAnalyzer searchQuoteAnalyzer) {
             this.searchQuoteAnalyzer = searchQuoteAnalyzer;
-            return builder;
+            return this;
         }
 
-        public T setEagerGlobalOrdinals(boolean eagerGlobalOrdinals) {
+        public Builder setEagerGlobalOrdinals(boolean eagerGlobalOrdinals) {
             this.eagerGlobalOrdinals = eagerGlobalOrdinals;
-            return builder;
+            return this;
         }
 
-        public T addMultiField(Mapper.Builder<?> mapperBuilder) {
+        public Builder addMultiField(Mapper.Builder mapperBuilder) {
             multiFieldsBuilder.add(mapperBuilder);
-            return builder;
+            return this;
         }
 
-        public T copyTo(CopyTo copyTo) {
+        public Builder copyTo(CopyTo copyTo) {
             this.copyTo = copyTo;
-            return builder;
+            return this;
         }
 
         protected String buildFullName(BuilderContext context) {
             return context.path().pathAsText(name);
         }
 
         /** Set metadata on this field. */
-        public T meta(Map<String, String> meta) {
+        public Builder meta(Map<String, String> meta) {
             this.meta = meta;
-            return (T) this;
+            return this;
         }
+
+        @Override
+        public abstract FieldMapper build(BuilderContext context);
     }
 
     protected FieldType fieldType;

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

@@ -63,12 +63,11 @@ public class GeoPointFieldMapper extends AbstractPointGeometryFieldMapper<List<P
         FIELD_TYPE.freeze();
     }
 
-    public static class Builder extends AbstractPointGeometryFieldMapper.Builder<Builder, GeoPointFieldType> {
+    public static class Builder extends AbstractPointGeometryFieldMapper.Builder {
 
         public Builder(String name) {
             super(name, FIELD_TYPE);
             hasDocValues = true;
-            builder = this;
         }
 
         @Override

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

@@ -63,7 +63,7 @@ public class GeoShapeFieldMapper extends AbstractShapeGeometryFieldMapper<Geomet
         FIELD_TYPE.freeze();
     }
 
-    public static class Builder extends AbstractShapeGeometryFieldMapper.Builder<Builder,GeoShapeFieldType> {
+    public static class Builder extends AbstractShapeGeometryFieldMapper.Builder {
 
         public Builder(String name) {
             super (name, FIELD_TYPE);

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

@@ -184,8 +184,7 @@ private static void checkPrefixTreeSupport(String fieldName) {
 
     private static final DeprecationLogger DEPRECATION_LOGGER = DeprecationLogger.getLogger(LegacyGeoShapeFieldMapper.class);
 
-    public static class Builder extends AbstractShapeGeometryFieldMapper.Builder<Builder,
-        LegacyGeoShapeFieldMapper.GeoShapeFieldType> {
+    public static class Builder extends AbstractShapeGeometryFieldMapper.Builder {
 
         DeprecatedParameters deprecatedParameters;
 

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

@@ -58,12 +58,10 @@ public Version indexCreatedVersion() {
         }
     }
 
-    public abstract static class Builder<T extends Builder> {
+    public abstract static class Builder {
 
         public String name;
 
-        protected T builder;
-
         protected Builder(String name) {
             this.name = name;
         }
@@ -173,7 +171,7 @@ static class MultiFieldParserContext extends ParserContext {
 
         }
 
-        Mapper.Builder<?> parse(String name, Map<String, Object> node, ParserContext parserContext) throws MapperParsingException;
+        Mapper.Builder parse(String name, Map<String, Object> node, ParserContext parserContext) throws MapperParsingException;
     }
 
     private final String simpleName;