Skip to content

Commit 6bf19fc

Browse files
kimchykimchy
committed
Mapper: Rename allFIeld to _all, sourceField to _source, idField to _id, and typeField to _type, closes #105.
1 parent 5da4b07 commit 6bf19fc

File tree

12 files changed

+29
-25
lines changed

12 files changed

+29
-25
lines changed

‎modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/json/JsonAllFieldMapper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
*/
4343
public class JsonAllFieldMapper extends JsonFieldMapper<Void> implements AllFieldMapper {
4444

45-
public static final String JSON_TYPE = "allField";
45+
public static final String JSON_TYPE = "_all";
4646

4747
public static class Defaults extends JsonFieldMapper.Defaults {
4848
public static final String NAME = AllFieldMapper.NAME;

‎modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/json/JsonBoostFieldMapper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
*/
3939
public class JsonBoostFieldMapper extends JsonNumberFieldMapper<Float> implements BoostFieldMapper {
4040

41-
public static final String JSON_TYPE = "boostField";
41+
public static final String JSON_TYPE = "_boost";
4242

4343
public static class Defaults extends JsonNumberFieldMapper.Defaults {
4444
public static final String NAME = "_boost";

‎modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/json/JsonDocumentMapperParser.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -120,17 +120,17 @@ public void putTypeParser(String type, JsonTypeParser typeParser) {
120120
String fieldName = entry.getKey();
121121
JsonNode fieldNode = entry.getValue();
122122

123-
if (JsonSourceFieldMapper.JSON_TYPE.equals(fieldName)) {
123+
if (JsonSourceFieldMapper.JSON_TYPE.equals(fieldName) || "sourceField".equals(fieldName)) {
124124
docBuilder.sourceField(parseSourceField((ObjectNode) fieldNode, parserContext));
125-
} else if (JsonIdFieldMapper.JSON_TYPE.equals(fieldName)) {
125+
} else if (JsonIdFieldMapper.JSON_TYPE.equals(fieldName) || "idField".equals(fieldName)) {
126126
docBuilder.idField(parseIdField((ObjectNode) fieldNode, parserContext));
127-
} else if (JsonTypeFieldMapper.JSON_TYPE.equals(fieldName)) {
127+
} else if (JsonTypeFieldMapper.JSON_TYPE.equals(fieldName) || "typeField".equals(fieldName)) {
128128
docBuilder.typeField(parseTypeField((ObjectNode) fieldNode, parserContext));
129-
} else if (JsonUidFieldMapper.JSON_TYPE.equals(fieldName)) {
129+
} else if (JsonUidFieldMapper.JSON_TYPE.equals(fieldName) || "uidField".equals(fieldName)) {
130130
docBuilder.uidField(parseUidField((ObjectNode) fieldNode, parserContext));
131-
} else if (JsonBoostFieldMapper.JSON_TYPE.equals(fieldName)) {
131+
} else if (JsonBoostFieldMapper.JSON_TYPE.equals(fieldName) || "boostField".equals(fieldName)) {
132132
docBuilder.boostField(parseBoostField((ObjectNode) fieldNode, parserContext));
133-
} else if (JsonAllFieldMapper.JSON_TYPE.equals(fieldName)) {
133+
} else if (JsonAllFieldMapper.JSON_TYPE.equals(fieldName) || "allField".equals(fieldName)) {
134134
docBuilder.allField(parseAllField((ObjectNode) fieldNode, parserContext));
135135
} else if ("indexAnalyzer".equals(fieldName)) {
136136
docBuilder.indexAnalyzer(analysisService.analyzer(fieldNode.getTextValue()));

‎modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/json/JsonIdFieldMapper.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
*/
3636
public class JsonIdFieldMapper extends JsonFieldMapper<String> implements IdFieldMapper {
3737

38-
public static final String JSON_TYPE = "idField";
38+
public static final String JSON_TYPE = "_id";
3939

4040
public static class Defaults extends JsonFieldMapper.Defaults {
4141
public static final String NAME = "_id";
@@ -118,7 +118,9 @@ protected JsonIdFieldMapper(String name, String indexName, Field.Store store, Fi
118118
}
119119

120120
@Override public void toJson(JsonBuilder builder, Params params) throws IOException {
121-
// for now, don't output it at all
121+
builder.startObject(JSON_TYPE);
122+
builder.field("store", store.name().toLowerCase());
123+
builder.endObject();
122124
}
123125

124126
@Override public void merge(JsonMapper mergeWith, JsonMergeContext mergeContext) throws MergeMappingException {

‎modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/json/JsonSourceFieldMapper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
*/
3333
public class JsonSourceFieldMapper extends JsonFieldMapper<byte[]> implements SourceFieldMapper {
3434

35-
public static final String JSON_TYPE = "sourceField";
35+
public static final String JSON_TYPE = "_source";
3636

3737
public static class Defaults extends JsonFieldMapper.Defaults {
3838
public static final String NAME = SourceFieldMapper.NAME;

‎modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/json/JsonTypeFieldMapper.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
*/
3636
public class JsonTypeFieldMapper extends JsonFieldMapper<String> implements TypeFieldMapper {
3737

38-
public static final String JSON_TYPE = "typeField";
38+
public static final String JSON_TYPE = "_type";
3939

4040
public static class Defaults extends JsonFieldMapper.Defaults {
4141
public static final String NAME = TypeFieldMapper.NAME;
@@ -107,7 +107,9 @@ public JsonTypeFieldMapper(String name, String indexName, Field.Store store, Fie
107107
}
108108

109109
@Override public void toJson(JsonBuilder builder, Params params) throws IOException {
110-
// for now, don't output it at all
110+
builder.startObject(JSON_TYPE);
111+
builder.field("store", store.name().toLowerCase());
112+
builder.endObject();
111113
}
112114

113115
@Override public void merge(JsonMapper mergeWith, JsonMergeContext mergeContext) throws MergeMappingException {

‎modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/json/JsonUidFieldMapper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
*/
3737
public class JsonUidFieldMapper extends JsonFieldMapper<Uid> implements UidFieldMapper {
3838

39-
public static final String JSON_TYPE = "uidField";
39+
public static final String JSON_TYPE = "_uid";
4040

4141
public static class Defaults extends JsonFieldMapper.Defaults {
4242
public static final String NAME = UidFieldMapper.NAME;

‎modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/json/all/mapping.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
person : {
3-
allField : {enabled : true},
3+
_all : {enabled : true},
44
properties : {
55
name : {
66
type : "object",

‎modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/json/all/store-mapping.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
person : {
3-
allField : {enabled : true, store : "yes"},
3+
_all : {enabled : true, store : "yes"},
44
properties : {
55
name : {
66
type : "object",

‎modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/json/simple/test-mapping-notype.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
dateFormats : ["yyyy-MM-dd", "dd-MM-yyyy"],
33
dynamic : false,
44
enabled : true,
5-
idField : {name : "_id", indexName : "_id"},
6-
sourceField : {name : "_source", compressionThreshold : 0},
7-
typeField : {name : "_type"},
8-
boostField : {name : "_boost", nullValue : 2.0},
5+
_id : {name : "_id", indexName : "_id"},
6+
_source : {name : "_source", compressionThreshold : 0},
7+
_type : {name : "_type"},
8+
_boost : {name : "_boost", nullValue : 2.0},
99
properties : {
1010
name : {
1111
type : "object",

‎modules/elasticsearch/src/test/java/org/elasticsearch/index/mapper/json/simple/test-mapping.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
dateFormats : ["yyyy-MM-dd", "dd-MM-yyyy"],
44
dynamic : false,
55
enabled : true,
6-
idField : {name : "_id", indexName : "_id"},
7-
sourceField : {name : "_source", compressionThreshold : 0},
8-
typeField : {name : "_type"},
9-
boostField : {name : "_boost", nullValue : 2.0},
6+
_id : {name : "_id", indexName : "_id"},
7+
_source : {name : "_source"},
8+
_type : {name : "_type"},
9+
_boost : {name : "_boost", nullValue : 2.0},
1010
properties : {
1111
name : {
1212
type : "object",

‎modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/highlight/HighlightSearchTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ private void index(Client client, String id, String nameValue, int age) throws I
109109

110110
public JsonBuilder mapping() throws IOException {
111111
return binaryJsonBuilder().startObject().startObject("type1")
112-
.startObject("allField").field("store", "yes").field("termVector", "with_positions_offsets").endObject()
112+
.startObject("_all").field("store", "yes").field("termVector", "with_positions_offsets").endObject()
113113
.endObject().endObject();
114114
}
115115

0 commit comments

Comments
 (0)