Skip to content

Commit 65a83e6

Browse files
dadoonetdadoonet
committed
Mappings: Simplified mapper lookups
Due to elastic#10705 We need to adapt the mapper attachment plugin to version 2.0.0 Closes elastic#125.
1 parent 7e2a9db commit 65a83e6

File tree

9 files changed

+83
-83
lines changed

9 files changed

+83
-83
lines changed

‎src/main/java/org/elasticsearch/index/mapper/attachment/AttachmentMapper.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ public FieldDataType defaultFieldDataType() {
391391
}
392392

393393
@Override
394-
public void parse(ParseContext context) throws IOException {
394+
public Mapper parse(ParseContext context) throws IOException {
395395
byte[] content = null;
396396
String contentType = null;
397397
int indexedChars = defaultIndexedChars;
@@ -454,7 +454,7 @@ public void parse(ParseContext context) throws IOException {
454454
} else {
455455
logger.warn("Tika can not be initialized with the current Locale [{}] on the current JVM [{}]",
456456
Locale.getDefault().getLanguage(), Constants.JAVA_VERSION);
457-
return;
457+
return null;
458458
}
459459
}
460460
// Set the maximum length of strings returned by the parseToString method, -1 sets no limit
@@ -473,7 +473,7 @@ public void parse(ParseContext context) throws IOException {
473473
logger.debug("Failed to extract [{}] characters of text for [{}]: [{}]", indexedChars, name, e.getMessage());
474474
logger.trace("exception caught", e);
475475
}
476-
return;
476+
return null;
477477
}
478478

479479
context = context.createExternalValueContext(parsedContent);
@@ -580,6 +580,8 @@ public void parse(ParseContext context) throws IOException {
580580
if (copyTo != null) {
581581
copyTo.parse(context);
582582
}
583+
584+
return null;
583585
}
584586

585587
@Override
@@ -588,7 +590,7 @@ protected void parseCreateField(ParseContext parseContext, List<Field> fields) t
588590
}
589591

590592
@Override
591-
public void merge(Mapper mergeWith, MergeContext mergeContext) throws MergeMappingException {
593+
public void merge(Mapper mergeWith, MergeResult mergeResult) throws MergeMappingException {
592594
// ignore this for now
593595
}
594596

‎src/test/java/org/elasticsearch/index/mapper/attachment/test/standalone/StandaloneRunner.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public ExitStatus execute(Settings settings, Environment env) throws Exception {
113113

114114
terminal.println("## Extracted text");
115115
terminal.println("--------------------- BEGIN -----------------------");
116-
terminal.println("%s", doc.get(docMapper.mappers().smartName("file").mapper().names().indexName()));
116+
terminal.println("%s", doc.get(docMapper.mappers().getMapper("file").names().indexName()));
117117
terminal.println("---------------------- END ------------------------");
118118
terminal.println("## Metadata");
119119
printMetadataContent(doc, AttachmentMapper.FieldNames.AUTHOR);
@@ -129,7 +129,7 @@ public ExitStatus execute(Settings settings, Environment env) throws Exception {
129129
}
130130

131131
private void printMetadataContent(ParseContext.Document doc, String field) {
132-
terminal.println("- %s: %s", field, doc.get(docMapper.mappers().smartName("file." + field).mapper().names().indexName()));
132+
terminal.println("- %s: %s", field, doc.get(docMapper.mappers().getMapper("file." + field).names().indexName()));
133133
}
134134

135135
public static byte[] copyToBytes(Path path) throws IOException {

‎src/test/java/org/elasticsearch/index/mapper/attachment/test/unit/DateAttachmentMapperTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,6 @@ public void testSimpleMappings() throws Exception {
4949
DocumentMapper docMapper = mapperParser.parse(mapping);
5050

5151
// Our mapping should be kept as a String
52-
assertThat(docMapper.mappers().fullName("file.date").mapper(), instanceOf(StringFieldMapper.class));
52+
assertThat(docMapper.mappers().getMapper("file.date"), instanceOf(StringFieldMapper.class));
5353
}
5454
}

‎src/test/java/org/elasticsearch/index/mapper/attachment/test/unit/EncryptedDocMapperTest.java

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -61,19 +61,19 @@ public void testMultipleDocsEncryptedLast() throws IOException {
6161
.endObject().bytes();
6262

6363
ParseContext.Document doc = docMapper.parse(json).rootDoc();
64-
assertThat(doc.get(docMapper.mappers().smartName("file1").mapper().names().indexName()), containsString("World"));
65-
assertThat(doc.get(docMapper.mappers().smartName("file1.title").mapper().names().indexName()), equalTo("Hello"));
66-
assertThat(doc.get(docMapper.mappers().smartName("file1.author").mapper().names().indexName()), equalTo("kimchy"));
67-
assertThat(doc.get(docMapper.mappers().smartName("file1.keywords").mapper().names().indexName()), equalTo("elasticsearch,cool,bonsai"));
68-
assertThat(doc.get(docMapper.mappers().smartName("file1.content_type").mapper().names().indexName()), equalTo("text/html; charset=ISO-8859-1"));
69-
assertThat(doc.getField(docMapper.mappers().smartName("file1.content_length").mapper().names().indexName()).numericValue().longValue(), is(344L));
70-
71-
assertThat(doc.get(docMapper.mappers().smartName("file2").mapper().names().indexName()), nullValue());
72-
assertThat(doc.get(docMapper.mappers().smartName("file2.title").mapper().names().indexName()), nullValue());
73-
assertThat(doc.get(docMapper.mappers().smartName("file2.author").mapper().names().indexName()), nullValue());
74-
assertThat(doc.get(docMapper.mappers().smartName("file2.keywords").mapper().names().indexName()), nullValue());
75-
assertThat(doc.get(docMapper.mappers().smartName("file2.content_type").mapper().names().indexName()), nullValue());
76-
assertThat(doc.getField(docMapper.mappers().smartName("file2.content_length").mapper().names().indexName()), nullValue());
64+
assertThat(doc.get(docMapper.mappers().getMapper("file1").names().indexName()), containsString("World"));
65+
assertThat(doc.get(docMapper.mappers().getMapper("file1.title").names().indexName()), equalTo("Hello"));
66+
assertThat(doc.get(docMapper.mappers().getMapper("file1.author").names().indexName()), equalTo("kimchy"));
67+
assertThat(doc.get(docMapper.mappers().getMapper("file1.keywords").names().indexName()), equalTo("elasticsearch,cool,bonsai"));
68+
assertThat(doc.get(docMapper.mappers().getMapper("file1.content_type").names().indexName()), equalTo("text/html; charset=ISO-8859-1"));
69+
assertThat(doc.getField(docMapper.mappers().getMapper("file1.content_length").names().indexName()).numericValue().longValue(), is(344L));
70+
71+
assertThat(doc.get(docMapper.mappers().getMapper("file2").names().indexName()), nullValue());
72+
assertThat(doc.get(docMapper.mappers().getMapper("file2.title").names().indexName()), nullValue());
73+
assertThat(doc.get(docMapper.mappers().getMapper("file2.author").names().indexName()), nullValue());
74+
assertThat(doc.get(docMapper.mappers().getMapper("file2.keywords").names().indexName()), nullValue());
75+
assertThat(doc.get(docMapper.mappers().getMapper("file2.content_type").names().indexName()), nullValue());
76+
assertThat(doc.getField(docMapper.mappers().getMapper("file2.content_length").names().indexName()), nullValue());
7777
}
7878

7979
@Test
@@ -94,19 +94,19 @@ public void testMultipleDocsEncryptedFirst() throws IOException {
9494
.endObject().bytes();
9595

9696
ParseContext.Document doc = docMapper.parse(json).rootDoc();
97-
assertThat(doc.get(docMapper.mappers().smartName("file1").mapper().names().indexName()), nullValue());
98-
assertThat(doc.get(docMapper.mappers().smartName("file1.title").mapper().names().indexName()), nullValue());
99-
assertThat(doc.get(docMapper.mappers().smartName("file1.author").mapper().names().indexName()), nullValue());
100-
assertThat(doc.get(docMapper.mappers().smartName("file1.keywords").mapper().names().indexName()), nullValue());
101-
assertThat(doc.get(docMapper.mappers().smartName("file1.content_type").mapper().names().indexName()), nullValue());
102-
assertThat(doc.getField(docMapper.mappers().smartName("file1.content_length").mapper().names().indexName()), nullValue());
103-
104-
assertThat(doc.get(docMapper.mappers().smartName("file2").mapper().names().indexName()), containsString("World"));
105-
assertThat(doc.get(docMapper.mappers().smartName("file2.title").mapper().names().indexName()), equalTo("Hello"));
106-
assertThat(doc.get(docMapper.mappers().smartName("file2.author").mapper().names().indexName()), equalTo("kimchy"));
107-
assertThat(doc.get(docMapper.mappers().smartName("file2.keywords").mapper().names().indexName()), equalTo("elasticsearch,cool,bonsai"));
108-
assertThat(doc.get(docMapper.mappers().smartName("file2.content_type").mapper().names().indexName()), equalTo("text/html; charset=ISO-8859-1"));
109-
assertThat(doc.getField(docMapper.mappers().smartName("file2.content_length").mapper().names().indexName()).numericValue().longValue(), is(344L));
97+
assertThat(doc.get(docMapper.mappers().getMapper("file1").names().indexName()), nullValue());
98+
assertThat(doc.get(docMapper.mappers().getMapper("file1.title").names().indexName()), nullValue());
99+
assertThat(doc.get(docMapper.mappers().getMapper("file1.author").names().indexName()), nullValue());
100+
assertThat(doc.get(docMapper.mappers().getMapper("file1.keywords").names().indexName()), nullValue());
101+
assertThat(doc.get(docMapper.mappers().getMapper("file1.content_type").names().indexName()), nullValue());
102+
assertThat(doc.getField(docMapper.mappers().getMapper("file1.content_length").names().indexName()), nullValue());
103+
104+
assertThat(doc.get(docMapper.mappers().getMapper("file2").names().indexName()), containsString("World"));
105+
assertThat(doc.get(docMapper.mappers().getMapper("file2.title").names().indexName()), equalTo("Hello"));
106+
assertThat(doc.get(docMapper.mappers().getMapper("file2.author").names().indexName()), equalTo("kimchy"));
107+
assertThat(doc.get(docMapper.mappers().getMapper("file2.keywords").names().indexName()), equalTo("elasticsearch,cool,bonsai"));
108+
assertThat(doc.get(docMapper.mappers().getMapper("file2.content_type").names().indexName()), equalTo("text/html; charset=ISO-8859-1"));
109+
assertThat(doc.getField(docMapper.mappers().getMapper("file2.content_length").names().indexName()).numericValue().longValue(), is(344L));
110110
}
111111

112112
@Test(expected = MapperParsingException.class)
@@ -127,19 +127,19 @@ public void testMultipleDocsEncryptedNotIgnoringErrors() throws IOException {
127127
.endObject().bytes();
128128

129129
ParseContext.Document doc = docMapper.parse(json).rootDoc();
130-
assertThat(doc.get(docMapper.mappers().smartName("file1").mapper().names().indexName()), nullValue());
131-
assertThat(doc.get(docMapper.mappers().smartName("file1.title").mapper().names().indexName()), nullValue());
132-
assertThat(doc.get(docMapper.mappers().smartName("file1.author").mapper().names().indexName()), nullValue());
133-
assertThat(doc.get(docMapper.mappers().smartName("file1.keywords").mapper().names().indexName()), nullValue());
134-
assertThat(doc.get(docMapper.mappers().smartName("file1.content_type").mapper().names().indexName()), nullValue());
135-
assertThat(doc.getField(docMapper.mappers().smartName("file1.content_length").mapper().names().indexName()), nullValue());
136-
137-
assertThat(doc.get(docMapper.mappers().smartName("file2").mapper().names().indexName()), containsString("World"));
138-
assertThat(doc.get(docMapper.mappers().smartName("file2.title").mapper().names().indexName()), equalTo("Hello"));
139-
assertThat(doc.get(docMapper.mappers().smartName("file2.author").mapper().names().indexName()), equalTo("kimchy"));
140-
assertThat(doc.get(docMapper.mappers().smartName("file2.keywords").mapper().names().indexName()), equalTo("elasticsearch,cool,bonsai"));
141-
assertThat(doc.get(docMapper.mappers().smartName("file2.content_type").mapper().names().indexName()), equalTo("text/html; charset=ISO-8859-1"));
142-
assertThat(doc.getField(docMapper.mappers().smartName("file2.content_length").mapper().names().indexName()).numericValue().longValue(), is(344L));
130+
assertThat(doc.get(docMapper.mappers().getMapper("file1").names().indexName()), nullValue());
131+
assertThat(doc.get(docMapper.mappers().getMapper("file1.title").names().indexName()), nullValue());
132+
assertThat(doc.get(docMapper.mappers().getMapper("file1.author").names().indexName()), nullValue());
133+
assertThat(doc.get(docMapper.mappers().getMapper("file1.keywords").names().indexName()), nullValue());
134+
assertThat(doc.get(docMapper.mappers().getMapper("file1.content_type").names().indexName()), nullValue());
135+
assertThat(doc.getField(docMapper.mappers().getMapper("file1.content_length").names().indexName()), nullValue());
136+
137+
assertThat(doc.get(docMapper.mappers().getMapper("file2").names().indexName()), containsString("World"));
138+
assertThat(doc.get(docMapper.mappers().getMapper("file2.title").names().indexName()), equalTo("Hello"));
139+
assertThat(doc.get(docMapper.mappers().getMapper("file2.author").names().indexName()), equalTo("kimchy"));
140+
assertThat(doc.get(docMapper.mappers().getMapper("file2.keywords").names().indexName()), equalTo("elasticsearch,cool,bonsai"));
141+
assertThat(doc.get(docMapper.mappers().getMapper("file2.content_type").names().indexName()), equalTo("text/html; charset=ISO-8859-1"));
142+
assertThat(doc.getField(docMapper.mappers().getMapper("file2.content_length").names().indexName()).numericValue().longValue(), is(344L));
143143
}
144144

145145
}

‎src/test/java/org/elasticsearch/index/mapper/attachment/test/unit/LanguageDetectionAttachmentMapperTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public void setupMapperParser(boolean langDetect) throws IOException {
5757
String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/attachment/test/unit/language/language-mapping.json");
5858
docMapper = mapperParser.parse(mapping);
5959

60-
assertThat(docMapper.mappers().fullName("file.language").mapper(), instanceOf(StringFieldMapper.class));
60+
assertThat(docMapper.mappers().getMapper("file.language"), instanceOf(StringFieldMapper.class));
6161
}
6262

6363
private void testLanguage(String filename, String expected, String... forcedLanguage) throws IOException {
@@ -79,7 +79,7 @@ private void testLanguage(String filename, String expected, String... forcedLang
7979
ParseContext.Document doc = docMapper.parse(xcb.bytes()).rootDoc();
8080

8181
// Our mapping should be kept as a String
82-
assertThat(doc.get(docMapper.mappers().smartName("file.language").mapper().names().indexName()), equalTo(expected));
82+
assertThat(doc.get(docMapper.mappers().getMapper("file.language").names().indexName()), equalTo(expected));
8383
}
8484

8585
@Test
@@ -132,6 +132,6 @@ public void testLangDetectDocumentEnabled() throws Exception {
132132
ParseContext.Document doc = docMapper.parse(xcb.bytes()).rootDoc();
133133

134134
// Our mapping should be kept as a String
135-
assertThat(doc.get(docMapper.mappers().smartName("file.language").mapper().names().indexName()), equalTo("en"));
135+
assertThat(doc.get(docMapper.mappers().getMapper("file.language").names().indexName()), equalTo("en"));
136136
}
137137
}

‎src/test/java/org/elasticsearch/index/mapper/attachment/test/unit/MetadataMapperTest.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,18 +60,18 @@ protected void checkMeta(String filename, Settings settings, Long expectedDate,
6060
.endObject().bytes();
6161

6262
ParseContext.Document doc = docMapper.parse(json).rootDoc();
63-
assertThat(doc.get(docMapper.mappers().smartName("file").mapper().names().indexName()), containsString("World"));
64-
assertThat(doc.get(docMapper.mappers().smartName("file.name").mapper().names().indexName()), equalTo(filename));
63+
assertThat(doc.get(docMapper.mappers().getMapper("file").names().indexName()), containsString("World"));
64+
assertThat(doc.get(docMapper.mappers().getMapper("file.name").names().indexName()), equalTo(filename));
6565
if (expectedDate == null) {
66-
assertThat(doc.getField(docMapper.mappers().smartName("file.date").mapper().names().indexName()), nullValue());
66+
assertThat(doc.getField(docMapper.mappers().getMapper("file.date").names().indexName()), nullValue());
6767
} else {
68-
assertThat(doc.getField(docMapper.mappers().smartName("file.date").mapper().names().indexName()).numericValue().longValue(), is(expectedDate));
68+
assertThat(doc.getField(docMapper.mappers().getMapper("file.date").names().indexName()).numericValue().longValue(), is(expectedDate));
6969
}
70-
assertThat(doc.get(docMapper.mappers().smartName("file.title").mapper().names().indexName()), equalTo("Hello"));
71-
assertThat(doc.get(docMapper.mappers().smartName("file.author").mapper().names().indexName()), equalTo("kimchy"));
72-
assertThat(doc.get(docMapper.mappers().smartName("file.keywords").mapper().names().indexName()), equalTo("elasticsearch,cool,bonsai"));
73-
assertThat(doc.get(docMapper.mappers().smartName("file.content_type").mapper().names().indexName()), equalTo("text/html; charset=ISO-8859-1"));
74-
assertThat(doc.getField(docMapper.mappers().smartName("file.content_length").mapper().names().indexName()).numericValue().longValue(), is(expectedLength));
70+
assertThat(doc.get(docMapper.mappers().getMapper("file.title").names().indexName()), equalTo("Hello"));
71+
assertThat(doc.get(docMapper.mappers().getMapper("file.author").names().indexName()), equalTo("kimchy"));
72+
assertThat(doc.get(docMapper.mappers().getMapper("file.keywords").names().indexName()), equalTo("elasticsearch,cool,bonsai"));
73+
assertThat(doc.get(docMapper.mappers().getMapper("file.content_type").names().indexName()), equalTo("text/html; charset=ISO-8859-1"));
74+
assertThat(doc.getField(docMapper.mappers().getMapper("file.content_length").names().indexName()).numericValue().longValue(), is(expectedLength));
7575
}
7676

7777
@Test

0 commit comments

Comments
 (0)