Skip to content

Commit 904b321

Browse files
jtibshiranijtibshirani
authored
Remove the deprecated method DocumentFieldMappers#getFieldMapper. (#32148)
1 parent 2bdd9b1 commit 904b321

26 files changed

+441
-441
lines changed

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

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -71,19 +71,11 @@ public DocumentFieldMappers(Collection<FieldMapper> mappers,
7171
this.searchQuoteAnalyzer = new FieldNameAnalyzer(searchQuoteAnalyzers);
7272
}
7373

74-
/**
75-
* @deprecated Use {@link DocumentFieldMappers#getMapper} instead. To access a field's
76-
* type information, instead use {@link MapperService#fullName}.
77-
*/
78-
@Deprecated
79-
public FieldMapper getFieldMapper(String field) {
80-
Mapper mapper = getMapper(field);
81-
return (mapper instanceof FieldMapper) ? (FieldMapper) mapper : null;
82-
}
83-
8474
/**
8575
* Returns the leaf mapper associated with this field name. Note that the returned mapper
8676
* could be either a concrete {@link FieldMapper}, or a {@link FieldAliasMapper}.
77+
*
78+
* To access a field's type information, {@link MapperService#fullName} should be used instead.
8779
*/
8880
public Mapper getMapper(String field) {
8981
return fieldMappers.get(field);

‎server/src/test/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerTests.java‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,11 @@
2121
import org.apache.lucene.analysis.Analyzer;
2222
import org.elasticsearch.Version;
2323
import org.elasticsearch.cluster.metadata.IndexMetaData;
24-
import org.elasticsearch.common.Strings;
25-
import org.elasticsearch.common.compress.CompressedXContent;
2624
import org.elasticsearch.common.settings.Settings;
25+
import org.elasticsearch.common.xcontent.XContentBuilder;
2726
import org.elasticsearch.common.xcontent.XContentFactory;
28-
import org.elasticsearch.index.mapper.DocumentMapper;
29-
import org.elasticsearch.index.mapper.FieldMapper;
27+
import org.elasticsearch.index.mapper.MappedFieldType;
28+
import org.elasticsearch.index.mapper.MapperService;
3029
import org.elasticsearch.indices.analysis.PreBuiltAnalyzers;
3130
import org.elasticsearch.plugins.Plugin;
3231
import org.elasticsearch.test.ESSingleNodeTestCase;
@@ -84,14 +83,14 @@ public void testThatAnalyzersAreUsedInMapping() throws IOException {
8483

8584
NamedAnalyzer namedAnalyzer = new PreBuiltAnalyzerProvider(analyzerName, AnalyzerScope.INDEX, randomPreBuiltAnalyzer.getAnalyzer(randomVersion)).get();
8685

87-
String mapping = Strings.toString(XContentFactory.jsonBuilder().startObject().startObject("type")
86+
XContentBuilder mapping = XContentFactory.jsonBuilder().startObject().startObject("type")
8887
.startObject("properties").startObject("field").field("type", "text").field("analyzer", analyzerName).endObject().endObject()
89-
.endObject().endObject());
90-
DocumentMapper docMapper = createIndex("test", indexSettings).mapperService().documentMapperParser().parse("type", new CompressedXContent(mapping));
88+
.endObject().endObject();
89+
MapperService mapperService = createIndex("test", indexSettings, "type", mapping).mapperService();
9190

92-
FieldMapper fieldMapper = docMapper.mappers().getFieldMapper("field");
93-
assertThat(fieldMapper.fieldType().searchAnalyzer(), instanceOf(NamedAnalyzer.class));
94-
NamedAnalyzer fieldMapperNamedAnalyzer = fieldMapper.fieldType().searchAnalyzer();
91+
MappedFieldType fieldType = mapperService.fullName("field");
92+
assertThat(fieldType.searchAnalyzer(), instanceOf(NamedAnalyzer.class));
93+
NamedAnalyzer fieldMapperNamedAnalyzer = fieldType.searchAnalyzer();
9594

9695
assertThat(fieldMapperNamedAnalyzer.analyzer(), is(namedAnalyzer.analyzer()));
9796
}

‎server/src/test/java/org/elasticsearch/index/mapper/BinaryFieldMapperTests.java‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
import org.elasticsearch.common.compress.CompressorFactory;
2828
import org.elasticsearch.common.io.stream.BytesStreamOutput;
2929
import org.elasticsearch.common.io.stream.StreamOutput;
30+
import org.elasticsearch.common.settings.Settings;
31+
import org.elasticsearch.common.xcontent.XContentBuilder;
3032
import org.elasticsearch.common.xcontent.XContentFactory;
3133
import org.elasticsearch.common.xcontent.XContentType;
3234
import org.elasticsearch.plugins.Plugin;
@@ -49,32 +51,32 @@ protected Collection<Class<? extends Plugin>> getPlugins() {
4951
}
5052

5153
public void testDefaultMapping() throws Exception {
52-
String mapping = Strings.toString(XContentFactory.jsonBuilder().startObject().startObject("type")
54+
XContentBuilder mapping = XContentFactory.jsonBuilder().startObject().startObject("type")
5355
.startObject("properties")
5456
.startObject("field")
5557
.field("type", "binary")
5658
.endObject()
5759
.endObject()
58-
.endObject().endObject());
60+
.endObject().endObject();
5961

60-
DocumentMapper mapper = createIndex("test").mapperService().documentMapperParser().parse("type", new CompressedXContent(mapping));
62+
MapperService mapperService = createIndex("test", Settings.EMPTY, "type", mapping).mapperService();
63+
MappedFieldType fieldType = mapperService.fullName("field");
6164

62-
FieldMapper fieldMapper = mapper.mappers().getFieldMapper("field");
63-
assertThat(fieldMapper, instanceOf(BinaryFieldMapper.class));
64-
assertThat(fieldMapper.fieldType().stored(), equalTo(false));
65+
assertThat(fieldType, instanceOf(BinaryFieldMapper.BinaryFieldType.class));
66+
assertThat(fieldType.stored(), equalTo(false));
6567
}
6668

6769
public void testStoredValue() throws IOException {
68-
String mapping = Strings.toString(XContentFactory.jsonBuilder().startObject().startObject("type")
70+
XContentBuilder mapping = XContentFactory.jsonBuilder().startObject().startObject("type")
6971
.startObject("properties")
7072
.startObject("field")
7173
.field("type", "binary")
7274
.field("store", true)
7375
.endObject()
7476
.endObject()
75-
.endObject().endObject());
77+
.endObject().endObject();
7678

77-
DocumentMapper mapper = createIndex("test").mapperService().documentMapperParser().parse("type", new CompressedXContent(mapping));
79+
MapperService mapperService = createIndex("test", Settings.EMPTY, "type", mapping).mapperService();
7880

7981
// case 1: a simple binary value
8082
final byte[] binaryValue1 = new byte[100];
@@ -89,13 +91,14 @@ public void testStoredValue() throws IOException {
8991
assertTrue(CompressorFactory.isCompressed(new BytesArray(binaryValue2)));
9092

9193
for (byte[] value : Arrays.asList(binaryValue1, binaryValue2)) {
92-
ParsedDocument doc = mapper.parse(SourceToParse.source("test", "type", "id",
94+
ParsedDocument doc = mapperService.documentMapper().parse(SourceToParse.source("test", "type", "id",
9395
BytesReference.bytes(XContentFactory.jsonBuilder().startObject().field("field", value).endObject()),
9496
XContentType.JSON));
9597
BytesRef indexedValue = doc.rootDoc().getBinaryValue("field");
9698
assertEquals(new BytesRef(value), indexedValue);
97-
FieldMapper fieldMapper = mapper.mappers().getFieldMapper("field");
98-
Object originalValue = fieldMapper.fieldType().valueForDisplay(indexedValue);
99+
100+
MappedFieldType fieldType = mapperService.fullName("field");
101+
Object originalValue = fieldType.valueForDisplay(indexedValue);
99102
assertEquals(new BytesArray(value), originalValue);
100103
}
101104
}

‎server/src/test/java/org/elasticsearch/index/mapper/BooleanFieldMapperTests.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
public class BooleanFieldMapperTests extends ESSingleNodeTestCase {
5353
private IndexService indexService;
5454
private DocumentMapperParser parser;
55-
private DocumentMapperParser preEs6Parser;
5655

5756
@Before
5857
public void setup() {
@@ -101,7 +100,7 @@ public void testSerialization() throws IOException {
101100
.endObject().endObject());
102101

103102
DocumentMapper defaultMapper = parser.parse("type", new CompressedXContent(mapping));
104-
FieldMapper mapper = defaultMapper.mappers().getFieldMapper("field");
103+
Mapper mapper = defaultMapper.mappers().getMapper("field");
105104
XContentBuilder builder = XContentFactory.jsonBuilder().startObject();
106105
mapper.toXContent(builder, ToXContent.EMPTY_PARAMS);
107106
builder.endObject();
@@ -117,7 +116,7 @@ public void testSerialization() throws IOException {
117116
.endObject().endObject());
118117

119118
defaultMapper = parser.parse("type", new CompressedXContent(mapping));
120-
mapper = defaultMapper.mappers().getFieldMapper("field");
119+
mapper = defaultMapper.mappers().getMapper("field");
121120
builder = XContentFactory.jsonBuilder().startObject();
122121
mapper.toXContent(builder, ToXContent.EMPTY_PARAMS);
123122
builder.endObject();

‎server/src/test/java/org/elasticsearch/index/mapper/CamelCaseFieldNameTests.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ public void testCamelCaseFieldNameStaysAsIs() throws Exception {
4646
.setSource(doc.dynamicMappingsUpdate().toString(), XContentType.JSON).get();
4747

4848
documentMapper = index.mapperService().documentMapper("type");
49-
assertNotNull(documentMapper.mappers().getFieldMapper("thisIsCamelCase"));
50-
assertNull(documentMapper.mappers().getFieldMapper("this_is_camel_case"));
49+
assertNotNull(documentMapper.mappers().getMapper("thisIsCamelCase"));
50+
assertNull(documentMapper.mappers().getMapper("this_is_camel_case"));
5151

5252
documentMapper = index.mapperService().documentMapperParser().parse("type", documentMapper.mappingSource());
5353

54-
assertNotNull(documentMapper.mappers().getFieldMapper("thisIsCamelCase"));
55-
assertNull(documentMapper.mappers().getFieldMapper("this_is_camel_case"));
54+
assertNotNull(documentMapper.mappers().getMapper("thisIsCamelCase"));
55+
assertNull(documentMapper.mappers().getMapper("this_is_camel_case"));
5656
}
5757
}

0 commit comments

Comments
 (0)