Skip to content

Commit f163412

Browse files
committed
javadocs / rename
1 parent 4c86d3c commit f163412

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1306,7 +1306,7 @@ public final void parse(String name, MappingParserContext parserContext, Map<Str
13061306
if (parameter == null) {
13071307
if (parserContext.indexVersionCreated().isLegacyIndexVersion()) {
13081308
// ignore unknown parameters on legacy indices
1309-
handleUnknownParam(propName, propNode);
1309+
handleUnknownParamOnLegacyIndex(propName, propNode);
13101310
iterator.remove();
13111311
continue;
13121312
}
@@ -1358,7 +1358,7 @@ public final void parse(String name, MappingParserContext parserContext, Map<Str
13581358
validate();
13591359
}
13601360

1361-
protected void handleUnknownParam(String propName, Object propNode) {
1361+
protected void handleUnknownParamOnLegacyIndex(String propName, Object propNode) {
13621362
// ignore
13631363
}
13641364

@@ -1408,6 +1408,10 @@ public TypeParser(BiFunction<String, MappingParserContext, Builder> builderFunct
14081408
this(builderFunction, (n, c) -> {}, Version.CURRENT.minimumIndexCompatibilityVersion());
14091409
}
14101410

1411+
/**
1412+
* Variant of {@link #TypeParser(BiFunction)} that allows to defining a minimumCompatibilityVersion to
1413+
* allow parsing mapping definitions of legacy indices (see {@link Mapper.TypeParser#supportsVersion(Version)}).
1414+
*/
14111415
public TypeParser(BiFunction<String, MappingParserContext, Builder> builderFunction, Version minimumCompatibilityVersion) {
14121416
this(builderFunction, (n, c) -> {}, minimumCompatibilityVersion);
14131417
}
@@ -1419,7 +1423,7 @@ public TypeParser(
14191423
this(builderFunction, contextValidator, Version.CURRENT.minimumIndexCompatibilityVersion());
14201424
}
14211425

1422-
public TypeParser(
1426+
private TypeParser(
14231427
BiFunction<String, MappingParserContext, Builder> builderFunction,
14241428
BiConsumer<String, MappingParserContext> contextValidator,
14251429
Version minimumCompatibilityVersion

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
8181
}
8282

8383
@Override
84-
protected void handleUnknownParam(String propName, Object propNode) {
84+
protected void handleUnknownParamOnLegacyIndex(String propName, Object propNode) {
8585
unknownParams.put(propName, propNode);
8686
}
8787

0 commit comments

Comments
 (0)