Skip to content

Commit 9e92849

Browse files
romseygeekromseygeek
committed
Remove all generic params from Mapper.Builder
1 parent 71e8ced commit 9e92849

File tree

67 files changed

+275
-356
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+275
-356
lines changed

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,21 +57,19 @@ public static class Defaults {
5757
}
5858
}
5959

60-
public static class Builder extends FieldMapper.Builder<Builder> {
60+
public static class Builder extends FieldMapper.Builder {
6161

6262
public Builder(String name) {
6363
super(name, Defaults.FIELD_TYPE, Defaults.FIELD_TYPE);
64-
builder = this;
6564
}
6665

6766
@Override
6867
public RankFeatureFieldType fieldType() {
6968
return (RankFeatureFieldType) super.fieldType();
7069
}
7170

72-
public Builder positiveScoreImpact(boolean v) {
71+
public void positiveScoreImpact(boolean v) {
7372
fieldType().setPositiveScoreImpact(v);
74-
return builder;
7573
}
7674

7775
@Override
@@ -85,7 +83,7 @@ public RankFeatureFieldMapper build(BuilderContext context) {
8583

8684
public static class TypeParser implements Mapper.TypeParser {
8785
@Override
88-
public Mapper.Builder<?> parse(String name, Map<String, Object> node, ParserContext parserContext) throws MapperParsingException {
86+
public Mapper.Builder parse(String name, Map<String, Object> node, ParserContext parserContext) throws MapperParsingException {
8987
RankFeatureFieldMapper.Builder builder = new RankFeatureFieldMapper.Builder(name);
9088
for (Iterator<Map.Entry<String, Object>> iterator = node.entrySet().iterator(); iterator.hasNext();) {
9189
Map.Entry<String, Object> entry = iterator.next();

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public static class Defaults {
5555
}
5656
}
5757

58-
public static class Builder extends MetadataFieldMapper.Builder<Builder> {
58+
public static class Builder extends MetadataFieldMapper.Builder {
5959

6060
public Builder(MappedFieldType existing) {
6161
super(NAME, existing == null ? Defaults.FIELD_TYPE : existing, Defaults.FIELD_TYPE);
@@ -70,7 +70,7 @@ public RankFeatureMetaFieldMapper build(BuilderContext context) {
7070

7171
public static class TypeParser implements MetadataFieldMapper.TypeParser {
7272
@Override
73-
public MetadataFieldMapper.Builder<?> parse(String name,
73+
public MetadataFieldMapper.Builder parse(String name,
7474
Map<String, Object> node, ParserContext parserContext) throws MapperParsingException {
7575
return new Builder(parserContext.mapperService().fieldType(NAME));
7676
}

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,10 @@ public static class Defaults {
5151
}
5252
}
5353

54-
public static class Builder extends FieldMapper.Builder<Builder> {
54+
public static class Builder extends FieldMapper.Builder {
5555

5656
public Builder(String name) {
5757
super(name, Defaults.FIELD_TYPE, Defaults.FIELD_TYPE);
58-
builder = this;
5958
}
6059

6160
@Override
@@ -74,7 +73,7 @@ public RankFeaturesFieldMapper build(BuilderContext context) {
7473

7574
public static class TypeParser implements Mapper.TypeParser {
7675
@Override
77-
public Mapper.Builder<?> parse(String name, Map<String, Object> node, ParserContext parserContext) throws MapperParsingException {
76+
public Mapper.Builder parse(String name, Map<String, Object> node, ParserContext parserContext) throws MapperParsingException {
7877
RankFeaturesFieldMapper.Builder builder = new RankFeaturesFieldMapper.Builder(name);
7978
return builder;
8079
}

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

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -82,26 +82,24 @@ public class ScaledFloatFieldMapper extends FieldMapper {
8282
// use the same default as numbers
8383
private static final Setting<Boolean> COERCE_SETTING = NumberFieldMapper.COERCE_SETTING;
8484

85-
public static class Builder extends FieldMapper.Builder<Builder> {
85+
public static class Builder extends FieldMapper.Builder {
8686

8787
private boolean scalingFactorSet = false;
8888
private Boolean ignoreMalformed;
8989
private Boolean coerce;
9090

9191
public Builder(String name) {
9292
super(name, new ScaledFloatFieldType(), new ScaledFloatFieldType());
93-
builder = this;
9493
}
9594

96-
public Builder ignoreMalformed(boolean ignoreMalformed) {
95+
public void ignoreMalformed(boolean ignoreMalformed) {
9796
this.ignoreMalformed = ignoreMalformed;
98-
return builder;
9997
}
10098

10199
@Override
102-
public Builder indexOptions(IndexOptions indexOptions) {
100+
public void indexOptions(IndexOptions indexOptions) {
103101
throw new MapperParsingException(
104-
"index_options not allowed in field [" + name + "] of type [" + builder.fieldType().typeName() + "]");
102+
"index_options not allowed in field [" + name + "] of type [" + this.fieldType().typeName() + "]");
105103
}
106104

107105
protected Explicit<Boolean> ignoreMalformed(BuilderContext context) {
@@ -114,15 +112,13 @@ protected Explicit<Boolean> ignoreMalformed(BuilderContext context) {
114112
return Defaults.IGNORE_MALFORMED;
115113
}
116114

117-
public Builder coerce(boolean coerce) {
115+
public void coerce(boolean coerce) {
118116
this.coerce = coerce;
119-
return builder;
120117
}
121118

122-
public Builder scalingFactor(double scalingFactor) {
119+
public void scalingFactor(double scalingFactor) {
123120
((ScaledFloatFieldType) fieldType).setScalingFactor(scalingFactor);
124121
scalingFactorSet = true;
125-
return this;
126122
}
127123

128124
protected Explicit<Boolean> coerce(BuilderContext context) {
@@ -149,7 +145,7 @@ public ScaledFloatFieldMapper build(BuilderContext context) {
149145
public static class TypeParser implements Mapper.TypeParser {
150146

151147
@Override
152-
public Mapper.Builder<?> parse(String name, Map<String, Object> node,
148+
public Mapper.Builder parse(String name, Map<String, Object> node,
153149
ParserContext parserContext) throws MapperParsingException {
154150
Builder builder = new Builder(name);
155151
TypeParsers.parseField(builder, name, node, parserContext);

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public static class Defaults {
104104
public static class TypeParser implements Mapper.TypeParser {
105105

106106
@Override
107-
public Mapper.Builder<?> parse(String name,
107+
public Mapper.Builder parse(String name,
108108
Map<String, Object> node,
109109
ParserContext parserContext) throws MapperParsingException {
110110

@@ -129,21 +129,19 @@ public Mapper.Builder<?> parse(String name,
129129
}
130130
}
131131

132-
public static class Builder extends FieldMapper.Builder<Builder> {
132+
public static class Builder extends FieldMapper.Builder {
133133
private int maxShingleSize = Defaults.MAX_SHINGLE_SIZE;
134134

135135
public Builder(String name) {
136136
super(name, Defaults.FIELD_TYPE, Defaults.FIELD_TYPE);
137-
this.builder = this;
138137
}
139138

140-
public Builder maxShingleSize(int maxShingleSize) {
139+
public void maxShingleSize(int maxShingleSize) {
141140
if (maxShingleSize < MAX_SHINGLE_SIZE_LOWER_BOUND || maxShingleSize > MAX_SHINGLE_SIZE_UPPER_BOUND) {
142141
throw new MapperParsingException("[max_shingle_size] must be at least [" + MAX_SHINGLE_SIZE_LOWER_BOUND + "] and at most " +
143142
"[" + MAX_SHINGLE_SIZE_UPPER_BOUND + "], got [" + maxShingleSize + "]");
144143
}
145144
this.maxShingleSize = maxShingleSize;
146-
return builder;
147145
}
148146

149147
@Override

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

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,27 +47,24 @@ public static class Defaults {
4747
public static final boolean DEFAULT_POSITION_INCREMENTS = true;
4848
}
4949

50-
public static class Builder extends FieldMapper.Builder<Builder> {
50+
public static class Builder extends FieldMapper.Builder {
5151
private NamedAnalyzer analyzer;
5252
private boolean enablePositionIncrements = Defaults.DEFAULT_POSITION_INCREMENTS;
5353

5454
public Builder(String name) {
5555
super(name, Defaults.FIELD_TYPE, Defaults.FIELD_TYPE);
56-
builder = this;
5756
}
5857

59-
public Builder analyzer(NamedAnalyzer analyzer) {
58+
public void analyzer(NamedAnalyzer analyzer) {
6059
this.analyzer = analyzer;
61-
return this;
6260
}
6361

6462
public NamedAnalyzer analyzer() {
6563
return analyzer;
6664
}
6765

68-
public Builder enablePositionIncrements(boolean enablePositionIncrements) {
66+
public void enablePositionIncrements(boolean enablePositionIncrements) {
6967
this.enablePositionIncrements = enablePositionIncrements;
70-
return this;
7168
}
7269

7370
public boolean enablePositionIncrements() {
@@ -84,7 +81,7 @@ public TokenCountFieldMapper build(BuilderContext context) {
8481

8582
public static class TypeParser implements Mapper.TypeParser {
8683
@Override
87-
public Mapper.Builder<?> parse(String name, Map<String, Object> node, ParserContext parserContext) throws MapperParsingException {
84+
public Mapper.Builder parse(String name, Map<String, Object> node, ParserContext parserContext) throws MapperParsingException {
8885
TokenCountFieldMapper.Builder builder = new TokenCountFieldMapper.Builder(name);
8986
for (Iterator<Map.Entry<String, Object>> iterator = node.entrySet().iterator(); iterator.hasNext();) {
9087
Map.Entry<String, Object> entry = iterator.next();

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,9 @@ static class Defaults {
5757
}
5858
}
5959

60-
static class Builder extends FieldMapper.Builder<Builder> {
60+
static class Builder extends FieldMapper.Builder {
6161
Builder() {
6262
super(NAME, Defaults.FIELD_TYPE, Defaults.FIELD_TYPE);
63-
builder = this;
6463
}
6564

6665
@Override

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,12 @@ static class Defaults {
6666
}
6767
}
6868

69-
static class Builder extends FieldMapper.Builder<Builder> {
69+
static class Builder extends FieldMapper.Builder {
7070
private final String parent;
7171
private final Set<String> children;
7272

7373
Builder(String name, String parent, Set<String> children) {
7474
super(name, Defaults.FIELD_TYPE, Defaults.FIELD_TYPE);
75-
builder = this;
7675
this.parent = parent;
7776
this.children = children;
7877
}
@@ -81,9 +80,8 @@ public Set<String> getChildren() {
8180
return children;
8281
}
8382

84-
public Builder eagerGlobalOrdinals(boolean eagerGlobalOrdinals) {
83+
public void eagerGlobalOrdinals(boolean eagerGlobalOrdinals) {
8584
fieldType().setEagerGlobalOrdinals(eagerGlobalOrdinals);
86-
return builder;
8785
}
8886

8987
@Override

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -121,13 +121,12 @@ private static void checkParentFields(String name, List<ParentIdFieldMapper> map
121121
}
122122
}
123123

124-
public static class Builder extends FieldMapper.Builder<Builder> {
124+
public static class Builder extends FieldMapper.Builder {
125125
final List<ParentIdFieldMapper.Builder> parentIdFieldBuilders = new ArrayList<>();
126126
boolean eagerGlobalOrdinals = true;
127127

128128
public Builder(String name) {
129129
super(name, Defaults.FIELD_TYPE, Defaults.FIELD_TYPE);
130-
builder = this;
131130
}
132131

133132
@Override
@@ -138,12 +137,11 @@ public JoinFieldType fieldType() {
138137
public Builder addParent(String parent, Set<String> children) {
139138
String parentIdFieldName = getParentIdFieldName(name, parent);
140139
parentIdFieldBuilders.add(new ParentIdFieldMapper.Builder(parentIdFieldName, parent, children));
141-
return builder;
140+
return this;
142141
}
143142

144-
public Builder eagerGlobalOrdinals(boolean eagerGlobalOrdinals) {
143+
public void eagerGlobalOrdinals(boolean eagerGlobalOrdinals) {
145144
this.eagerGlobalOrdinals = eagerGlobalOrdinals;
146-
return builder;
147145
}
148146

149147
@Override
@@ -168,7 +166,7 @@ public ParentJoinFieldMapper build(BuilderContext context) {
168166

169167
public static class TypeParser implements Mapper.TypeParser {
170168
@Override
171-
public Mapper.Builder<?> parse(String name, Map<String, Object> node, ParserContext parserContext) throws MapperParsingException {
169+
public Mapper.Builder parse(String name, Map<String, Object> node, ParserContext parserContext) throws MapperParsingException {
172170
final IndexSettings indexSettings = parserContext.mapperService().getIndexSettings();
173171
checkIndexCompatibility(indexSettings, name);
174172

‎modules/percolator/src/main/java/org/elasticsearch/percolator/PercolatorFieldMapper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public class PercolatorFieldMapper extends FieldMapper {
108108
static final String RANGE_FIELD_NAME = "range_field";
109109
static final String MINIMUM_SHOULD_MATCH_FIELD_NAME = "minimum_should_match_field";
110110

111-
static class Builder extends FieldMapper.Builder<Builder> {
111+
static class Builder extends FieldMapper.Builder {
112112

113113
private final Supplier<QueryShardContext> queryShardContext;
114114

0 commit comments

Comments
 (0)