Skip to content

Commit dbd33f7

Browse files
romseygeekromseygeek
authored
Remove type parameter from MapperService.documentMapper() (#48593)
We only have a single mapper per MapperService now anyway, so the extra type parameter is surplus to requirements. Relates to #41059
1 parent 435e082 commit dbd33f7

File tree

24 files changed

+98
-232
lines changed

24 files changed

+98
-232
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@ protected Query doToQuery(QueryShardContext context) throws IOException {
516516
final DocumentMapper docMapper;
517517
final MapperService mapperService = context.getMapperService();
518518
String type = mapperService.documentMapper().type();
519-
docMapper = mapperService.documentMapper(type);
519+
docMapper = mapperService.documentMapper();
520520
for (BytesReference document : documents) {
521521
docs.add(docMapper.parse(new SourceToParse(context.index().getName(), "_temp_id", document, documentXContentType)));
522522
}

‎modules/percolator/src/test/java/org/elasticsearch/percolator/CandidateQueryTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ public void init() throws Exception {
164164
.startObject("properties").startObject(queryField).field("type", "percolator").endObject().endObject()
165165
.endObject().endObject());
166166
mapperService.merge("type", new CompressedXContent(percolatorMapper), MapperService.MergeReason.MAPPING_UPDATE);
167-
fieldMapper = (PercolatorFieldMapper) mapperService.documentMapper("type").mappers().getMapper(queryField);
167+
fieldMapper = (PercolatorFieldMapper) mapperService.documentMapper().mappers().getMapper(queryField);
168168
fieldType = (PercolatorFieldMapper.FieldType) fieldMapper.fieldType();
169169

170170
queries = new ArrayList<>();

‎modules/percolator/src/test/java/org/elasticsearch/percolator/PercolatorFieldMapperTests.java‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ public void testExtractTerms() throws Exception {
181181
TermQuery termQuery2 = new TermQuery(new Term("field", "term2"));
182182
bq.add(termQuery2, Occur.SHOULD);
183183

184-
DocumentMapper documentMapper = mapperService.documentMapper("doc");
184+
DocumentMapper documentMapper = mapperService.documentMapper();
185185
PercolatorFieldMapper fieldMapper = (PercolatorFieldMapper) documentMapper.mappers().getMapper(fieldName);
186186
IndexMetaData build = IndexMetaData.builder("")
187187
.settings(Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT))
@@ -236,7 +236,7 @@ public void testExtractRanges() throws Exception {
236236
.rangeQuery(15, 20, true, true, null, null, null, null);
237237
bq.add(rangeQuery2, Occur.MUST);
238238

239-
DocumentMapper documentMapper = mapperService.documentMapper("doc");
239+
DocumentMapper documentMapper = mapperService.documentMapper();
240240
IndexMetaData build = IndexMetaData.builder("")
241241
.settings(Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT))
242242
.numberOfShards(1).numberOfReplicas(0).build();
@@ -290,7 +290,7 @@ public void testExtractRanges() throws Exception {
290290
public void testExtractTermsAndRanges_failed() throws Exception {
291291
addQueryFieldMappings();
292292
TermRangeQuery query = new TermRangeQuery("field1", new BytesRef("a"), new BytesRef("z"), true, true);
293-
DocumentMapper documentMapper = mapperService.documentMapper("doc");
293+
DocumentMapper documentMapper = mapperService.documentMapper();
294294
PercolatorFieldMapper fieldMapper = (PercolatorFieldMapper) documentMapper.mappers().getMapper(fieldName);
295295
IndexMetaData build = IndexMetaData.builder("")
296296
.settings(Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT))
@@ -309,7 +309,7 @@ public void testExtractTermsAndRanges_failed() throws Exception {
309309
public void testExtractTermsAndRanges_partial() throws Exception {
310310
addQueryFieldMappings();
311311
PhraseQuery phraseQuery = new PhraseQuery("field", "term");
312-
DocumentMapper documentMapper = mapperService.documentMapper("doc");
312+
DocumentMapper documentMapper = mapperService.documentMapper();
313313
PercolatorFieldMapper fieldMapper = (PercolatorFieldMapper) documentMapper.mappers().getMapper(fieldName);
314314
IndexMetaData build = IndexMetaData.builder("")
315315
.settings(Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT))
@@ -458,7 +458,7 @@ public void testExtractTermsAndRanges_numberFields() throws Exception {
458458
public void testPercolatorFieldMapper() throws Exception {
459459
addQueryFieldMappings();
460460
QueryBuilder queryBuilder = termQuery("field", "value");
461-
ParsedDocument doc = mapperService.documentMapper("doc").parse(new SourceToParse("test", "1",
461+
ParsedDocument doc = mapperService.documentMapper().parse(new SourceToParse("test", "1",
462462
BytesReference.bytes(XContentFactory
463463
.jsonBuilder()
464464
.startObject()
@@ -477,7 +477,7 @@ public void testPercolatorFieldMapper() throws Exception {
477477

478478
// add an query for which we don't extract terms from
479479
queryBuilder = rangeQuery("field").from("a").to("z");
480-
doc = mapperService.documentMapper("doc").parse(new SourceToParse("test", "1", BytesReference.bytes(XContentFactory
480+
doc = mapperService.documentMapper().parse(new SourceToParse("test", "1", BytesReference.bytes(XContentFactory
481481
.jsonBuilder()
482482
.startObject()
483483
.field(fieldName, queryBuilder)
@@ -503,7 +503,7 @@ public void testStoringQueries() throws Exception {
503503
// (it can't use shard data for rewriting purposes, because percolator queries run on MemoryIndex)
504504

505505
for (QueryBuilder query : queries) {
506-
ParsedDocument doc = mapperService.documentMapper("doc").parse(new SourceToParse("test", "1",
506+
ParsedDocument doc = mapperService.documentMapper().parse(new SourceToParse("test", "1",
507507
BytesReference.bytes(XContentFactory.jsonBuilder().startObject()
508508
.field(fieldName, query)
509509
.endObject()),
@@ -517,7 +517,7 @@ public void testQueryWithRewrite() throws Exception {
517517
addQueryFieldMappings();
518518
client().prepareIndex("remote").setId("1").setSource("field", "value").get();
519519
QueryBuilder queryBuilder = termsLookupQuery("field", new TermsLookup("remote", "1", "field"));
520-
ParsedDocument doc = mapperService.documentMapper("doc").parse(new SourceToParse("test", "1",
520+
ParsedDocument doc = mapperService.documentMapper().parse(new SourceToParse("test", "1",
521521
BytesReference.bytes(XContentFactory
522522
.jsonBuilder()
523523
.startObject()
@@ -538,7 +538,7 @@ public void testQueryWithRewrite() throws Exception {
538538
public void testPercolatorFieldMapperUnMappedField() throws Exception {
539539
addQueryFieldMappings();
540540
MapperParsingException exception = expectThrows(MapperParsingException.class, () -> {
541-
mapperService.documentMapper("doc").parse(new SourceToParse("test", "1", BytesReference.bytes(XContentFactory
541+
mapperService.documentMapper().parse(new SourceToParse("test", "1", BytesReference.bytes(XContentFactory
542542
.jsonBuilder()
543543
.startObject()
544544
.field(fieldName, termQuery("unmapped_field", "value"))
@@ -552,7 +552,7 @@ public void testPercolatorFieldMapperUnMappedField() throws Exception {
552552

553553
public void testPercolatorFieldMapper_noQuery() throws Exception {
554554
addQueryFieldMappings();
555-
ParsedDocument doc = mapperService.documentMapper("doc").parse(new SourceToParse("test", "1", BytesReference
555+
ParsedDocument doc = mapperService.documentMapper().parse(new SourceToParse("test", "1", BytesReference
556556
.bytes(XContentFactory
557557
.jsonBuilder()
558558
.startObject()
@@ -561,7 +561,7 @@ public void testPercolatorFieldMapper_noQuery() throws Exception {
561561
assertThat(doc.rootDoc().getFields(fieldType.queryBuilderField.name()).length, equalTo(0));
562562

563563
try {
564-
mapperService.documentMapper("doc").parse(new SourceToParse("test", "1", BytesReference.bytes(XContentFactory
564+
mapperService.documentMapper().parse(new SourceToParse("test", "1", BytesReference.bytes(XContentFactory
565565
.jsonBuilder()
566566
.startObject()
567567
.nullField(fieldName)
@@ -597,7 +597,7 @@ public void testMultiplePercolatorFields() throws Exception {
597597
mapperService.merge(typeName, new CompressedXContent(percolatorMapper), MapperService.MergeReason.MAPPING_UPDATE);
598598

599599
QueryBuilder queryBuilder = matchQuery("field", "value");
600-
ParsedDocument doc = mapperService.documentMapper(typeName).parse(new SourceToParse("test", "1",
600+
ParsedDocument doc = mapperService.documentMapper().parse(new SourceToParse("test", "1",
601601
BytesReference.bytes(jsonBuilder().startObject()
602602
.field("query_field1", queryBuilder)
603603
.field("query_field2", queryBuilder)
@@ -627,7 +627,7 @@ public void testNestedPercolatorField() throws Exception {
627627
mapperService.merge(typeName, new CompressedXContent(percolatorMapper), MapperService.MergeReason.MAPPING_UPDATE);
628628

629629
QueryBuilder queryBuilder = matchQuery("field", "value");
630-
ParsedDocument doc = mapperService.documentMapper(typeName).parse(new SourceToParse("test", "1",
630+
ParsedDocument doc = mapperService.documentMapper().parse(new SourceToParse("test", "1",
631631
BytesReference.bytes(jsonBuilder().startObject().startObject("object_field")
632632
.field("query_field", queryBuilder)
633633
.endObject().endObject()),
@@ -636,7 +636,7 @@ public void testNestedPercolatorField() throws Exception {
636636
BytesRef queryBuilderAsBytes = doc.rootDoc().getField("object_field.query_field.query_builder_field").binaryValue();
637637
assertQueryBuilder(queryBuilderAsBytes, queryBuilder);
638638

639-
doc = mapperService.documentMapper(typeName).parse(new SourceToParse("test", "1",
639+
doc = mapperService.documentMapper().parse(new SourceToParse("test", "1",
640640
BytesReference.bytes(jsonBuilder().startObject()
641641
.startArray("object_field")
642642
.startObject().field("query_field", queryBuilder).endObject()
@@ -648,7 +648,7 @@ public void testNestedPercolatorField() throws Exception {
648648
assertQueryBuilder(queryBuilderAsBytes, queryBuilder);
649649

650650
MapperParsingException e = expectThrows(MapperParsingException.class, () -> {
651-
mapperService.documentMapper(typeName).parse(new SourceToParse("test", "1",
651+
mapperService.documentMapper().parse(new SourceToParse("test", "1",
652652
BytesReference.bytes(jsonBuilder().startObject()
653653
.startArray("object_field")
654654
.startObject().field("query_field", queryBuilder).endObject()
@@ -733,7 +733,7 @@ public void testImplicitlySetDefaultScriptLang() throws Exception {
733733
query.endObject();
734734
query.endObject();
735735

736-
ParsedDocument doc = mapperService.documentMapper("doc").parse(new SourceToParse("test", "1",
736+
ParsedDocument doc = mapperService.documentMapper().parse(new SourceToParse("test", "1",
737737
BytesReference.bytes(XContentFactory.jsonBuilder().startObject()
738738
.rawField(fieldName, new BytesArray(Strings.toString(query)).streamInput(), query.contentType())
739739
.endObject()),
@@ -771,7 +771,7 @@ public void testImplicitlySetDefaultScriptLang() throws Exception {
771771
query.endObject();
772772
query.endObject();
773773

774-
doc = mapperService.documentMapper("doc").parse(new SourceToParse("test", "1",
774+
doc = mapperService.documentMapper().parse(new SourceToParse("test", "1",
775775
BytesReference.bytes(XContentFactory.jsonBuilder().startObject()
776776
.rawField(fieldName, new BytesArray(Strings.toString(query)).streamInput(), query.contentType())
777777
.endObject()),
@@ -857,7 +857,7 @@ public void testDuplicatedClauses() throws Exception {
857857
QueryBuilder qb = boolQuery()
858858
.must(boolQuery().must(termQuery("field", "value1")).must(termQuery("field", "value2")))
859859
.must(boolQuery().must(termQuery("field", "value2")).must(termQuery("field", "value3")));
860-
ParsedDocument doc = mapperService.documentMapper("doc").parse(new SourceToParse("test", "1",
860+
ParsedDocument doc = mapperService.documentMapper().parse(new SourceToParse("test", "1",
861861
BytesReference.bytes(XContentFactory.jsonBuilder().startObject()
862862
.field(fieldName, qb)
863863
.endObject()),
@@ -879,7 +879,7 @@ public void testDuplicatedClauses() throws Exception {
879879
.must(boolQuery().must(termQuery("field", "value2")).must(termQuery("field", "value3")))
880880
.must(boolQuery().must(termQuery("field", "value3")).must(termQuery("field", "value4")))
881881
.must(boolQuery().should(termQuery("field", "value4")).should(termQuery("field", "value5")));
882-
doc = mapperService.documentMapper("doc").parse(new SourceToParse("test", "1",
882+
doc = mapperService.documentMapper().parse(new SourceToParse("test", "1",
883883
BytesReference.bytes(XContentFactory.jsonBuilder().startObject()
884884
.field(fieldName, qb)
885885
.endObject()),
@@ -904,7 +904,7 @@ public void testDuplicatedClauses() throws Exception {
904904
.should(boolQuery().should(termQuery("field", "value2")).should(termQuery("field", "value3")))
905905
.should(boolQuery().should(termQuery("field", "value3")).should(termQuery("field", "value4")))
906906
.should(boolQuery().should(termQuery("field", "value4")).should(termQuery("field", "value5")));
907-
doc = mapperService.documentMapper("doc").parse(new SourceToParse("test", "1",
907+
doc = mapperService.documentMapper().parse(new SourceToParse("test", "1",
908908
BytesReference.bytes(XContentFactory.jsonBuilder().startObject()
909909
.field(fieldName, qb)
910910
.endObject()),

‎plugins/mapper-size/src/test/java/org/elasticsearch/index/mapper/size/SizeMappingTests.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ protected Collection<Class<? extends Plugin>> getPlugins() {
4949

5050
public void testSizeEnabled() throws Exception {
5151
IndexService service = createIndex("test", Settings.EMPTY, "type", "_size", "enabled=true");
52-
DocumentMapper docMapper = service.mapperService().documentMapper("type");
52+
DocumentMapper docMapper = service.mapperService().documentMapper();
5353

5454
BytesReference source = BytesReference
5555
.bytes(XContentFactory.jsonBuilder()
@@ -70,7 +70,7 @@ public void testSizeEnabled() throws Exception {
7070

7171
public void testSizeDisabled() throws Exception {
7272
IndexService service = createIndex("test", Settings.EMPTY, "type", "_size", "enabled=false");
73-
DocumentMapper docMapper = service.mapperService().documentMapper("type");
73+
DocumentMapper docMapper = service.mapperService().documentMapper();
7474

7575
BytesReference source = BytesReference
7676
.bytes(XContentFactory.jsonBuilder()
@@ -84,7 +84,7 @@ public void testSizeDisabled() throws Exception {
8484

8585
public void testSizeNotSet() throws Exception {
8686
IndexService service = createIndex("test", Settings.EMPTY, "type");
87-
DocumentMapper docMapper = service.mapperService().documentMapper("type");
87+
DocumentMapper docMapper = service.mapperService().documentMapper();
8888

8989
BytesReference source = BytesReference
9090
.bytes(XContentFactory.jsonBuilder()
@@ -98,7 +98,7 @@ public void testSizeNotSet() throws Exception {
9898

9999
public void testThatDisablingWorksWhenMerging() throws Exception {
100100
IndexService service = createIndex("test", Settings.EMPTY, "type", "_size", "enabled=true");
101-
DocumentMapper docMapper = service.mapperService().documentMapper("type");
101+
DocumentMapper docMapper = service.mapperService().documentMapper();
102102
assertThat(docMapper.metadataMapper(SizeFieldMapper.class).enabled(), is(true));
103103

104104
String disabledMapping = Strings.toString(XContentFactory.jsonBuilder().startObject().startObject("type")

‎server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetFieldMappingsIndexAction.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ protected GetFieldMappingsResponse shardOperation(final GetFieldMappingsIndexReq
116116

117117
Map<String, Map<String, FieldMappingMetaData>> typeMappings = new HashMap<>();
118118
for (String type : typeIntersection) {
119-
DocumentMapper documentMapper = indexService.mapperService().documentMapper(type);
119+
DocumentMapper documentMapper = indexService.mapperService().documentMapper();
120120
Map<String, FieldMappingMetaData> fieldMapping = findFieldMappingsByType(fieldPredicate, documentMapper, request);
121121
if (!fieldMapping.isEmpty()) {
122122
typeMappings.put(type, fieldMapping);

‎server/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public Builder(RootObjectMapper.Builder builder, MapperService mapperService) {
7272
this.rootObjectMapper = builder.build(builderContext);
7373

7474
final String type = rootObjectMapper.name();
75-
final DocumentMapper existingMapper = mapperService.documentMapper(type);
75+
final DocumentMapper existingMapper = mapperService.documentMapper();
7676
final Version indexCreatedVersion = mapperService.getIndexSettings().getIndexVersionCreated();
7777
final Map<String, TypeParser> metadataMapperParsers =
7878
mapperService.mapperRegistry.getMetadataMapperParsers(indexCreatedVersion);

0 commit comments

Comments
 (0)