Skip to content

Commit bfd4f47

Browse files
committed
remove unneeded method
1 parent 2af2bf2 commit bfd4f47

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

src/main/java/org/elasticsearch/index/mapper/MapperService.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -434,13 +434,6 @@ private void removeObjectAndFieldMappers(DocumentMapper docMapper) {
434434
}
435435
}
436436

437-
/**
438-
* Just parses and returns the mapper without adding it, while still applying default mapping.
439-
*/
440-
public DocumentMapper parse(String mappingType, CompressedString mappingSource) throws MapperParsingException {
441-
return parse(mappingType, mappingSource, true);
442-
}
443-
444437
public DocumentMapper parse(String mappingType, CompressedString mappingSource, boolean applyDefault) throws MapperParsingException {
445438
String defaultMappingSource;
446439
if (PercolatorService.TYPE_NAME.equals(mappingType)) {

src/test/java/org/elasticsearch/index/mapper/update/UpdateMappingTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,10 @@ protected void testConflictWhileMergingAndMappingUnchanged(XContentBuilder mappi
115115
public void testSizeTimestampParsing() throws IOException {
116116
IndexService indexService = createIndex("test", ImmutableSettings.settingsBuilder().build());
117117
String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/update/default_mapping_with_disabled_size_timestamp.json");
118-
DocumentMapper documentMapper = indexService.mapperService().parse("type", new CompressedString(mapping));
118+
DocumentMapper documentMapper = indexService.mapperService().parse("type", new CompressedString(mapping), true);
119119
assertThat(documentMapper.mappingSource().string(), equalTo(mapping));
120120
documentMapper.refreshSource(); //should be called anyway somewhere but just to be sure
121-
documentMapper = indexService.mapperService().parse("type", new CompressedString(documentMapper.mappingSource().string()));
121+
documentMapper = indexService.mapperService().parse("type", new CompressedString(documentMapper.mappingSource().string()), true);
122122
assertThat(documentMapper.mappingSource().string(), equalTo(mapping));
123123
}
124124

0 commit comments

Comments
 (0)