Upgrade ES 5

Author: EmmanuelDuru

elasticsearch-mapping/src/main/java/org/elasticsearch/mapping/parser/MapKeyValueAnnotationParser.java

@@ -46,6 +46,7 @@ public void parseAnnotation(MapKeyValue annotation, Map<String, Object> fieldDef
         if (annotation.indexType() == IndexType.analyzed) {
            keyFieldDefinition.put("type", "text");
            keyFieldDefinition.put("index", "true");
+           keyFieldDefinition.put("fielddata", "true");
         } else if (annotation.indexType() == IndexType.not_analyzed) {
            keyFieldDefinition.put("type", "keyword");
            keyFieldDefinition.put("index", "true");

elasticsearch-mapping/src/main/java/org/elasticsearch/mapping/parser/StringFieldAnnotationParser.java

@@ -25,6 +25,7 @@ public void parseAnnotation(StringField annotation, Map<String, Object> fieldDef
         if (annotation.indexType() == IndexType.analyzed) {
            fieldDefinition.put("type", "text");
            fieldDefinition.put("index", "true"); 
+           fieldDefinition.put("fielddata", "true");
         } else if (annotation.indexType() == IndexType.not_analyzed) {
            fieldDefinition.put("type", "keyword");
            fieldDefinition.put("index", "true"); 

elasticsearch-mapping/src/test/resources/city-mapping.json

@@ -1 +1 @@
-{"city":{"_source":{"enabled":true},"_all":{"enabled":true},"properties":{"city":{"include_in_all":true,"index":"true","boost":1.0,"store":false,"type":"keyword","fields":{"lower_case":{"include_in_all":false,"analyzer":"lowerCaseAnalyser","index":"true","boost":1.0,"store":false,"type":"text"}}}}}}
+{"city":{"_source":{"enabled":true},"_all":{"enabled":true},"properties":{"city":{"include_in_all":true,"index":"true","boost":1.0,"store":false,"type":"keyword","fields":{"lower_case":{"include_in_all":false,"fielddata":"true","analyzer":"lowerCaseAnalyser","index":"true","boost":1.0,"store":false,"type":"text"}}}}}}

elasticsearch-mapping/src/test/resources/person-mapping.json

@@ -1 +1 @@
-{"person":{"_source":{"enabled":true},"_all":{"analyzer":"simple","store":false,"enabled":true},"properties":{"firstname":{"include_in_all":false,"index":"false","boost":1.0,"store":false,"type":"keyword"},"address":{"type":"nested","properties":{"city":{"include_in_all":false,"index":"true","boost":1.0,"store":false,"type":"keyword"}}},"alienScore":{"include_in_all":false,"index":"true","boost":1.0,"store":false,"ignore_malformed":false,"type":"long"},"addressMap":{"type":"object","enabled":"true","properties":{"value":{"properties":{"city":{"include_in_all":false,"index":"true","boost":1.0,"store":false,"type":"keyword"}}},"key":{"include_in_all":true,"index":"false","boost":1.0,"store":false,"type":"keyword"}}},"alternateAddress":{"type":"object","enabled":true,"properties":{"city":{"include_in_all":false,"index":"true","boost":1.0,"store":false,"type":"keyword"}}},"lastname":{"include_in_all":true,"index":"true","boost":1.0,"store":false,"type":"text"}}}}
+{"person":{"_source":{"enabled":true},"_all":{"analyzer":"simple","store":false,"enabled":true},"properties":{"firstname":{"include_in_all":false,"index":"false","boost":1.0,"store":false,"type":"keyword"},"address":{"type":"nested","properties":{"city":{"include_in_all":false,"index":"true","boost":1.0,"store":false,"type":"keyword"}}},"alienScore":{"include_in_all":false,"index":"true","boost":1.0,"store":false,"ignore_malformed":false,"type":"long"},"addressMap":{"type":"object","enabled":"true","properties":{"value":{"properties":{"city":{"include_in_all":false,"index":"true","boost":1.0,"store":false,"type":"keyword"}}},"key":{"include_in_all":true,"index":"false","boost":1.0,"store":false,"type":"keyword"}}},"alternateAddress":{"type":"object","enabled":true,"properties":{"city":{"include_in_all":false,"index":"true","boost":1.0,"store":false,"type":"keyword"}}},"lastname":{"include_in_all":true,"fielddata":"true","index":"true","boost":1.0,"store":false,"type":"text"}}}}