Upgrade ES 6 (IT)

Author: EmmanuelDuru

elasticsearch-mapping/src/main/java/org/elasticsearch/mapping/FieldsMappingBuilder.java

@@ -40,7 +40,7 @@ public class FieldsMappingBuilder {
      */
     @SuppressWarnings("unchecked")
     public void parseFieldMappings(Class<?> clazz, Map<String, Object> classDefinitionMap, List<IFacetBuilderHelper> facetFields,
-            List<IFilterBuilderHelper> filteredFields, Map<String, SourceFetchContext> fetchContexts, String pathPrefix, String nestedPrefix, boolean isAll)
+            List<IFilterBuilderHelper> filteredFields, Map<String, SourceFetchContext> fetchContexts, String pathPrefix, String nestedPrefix, String isAll)
             throws IntrospectionException {
         if (clazz.getSuperclass() != null && clazz.getSuperclass() != Object.class) {
             parseFieldMappings(clazz.getSuperclass(), classDefinitionMap, facetFields, filteredFields, fetchContexts, pathPrefix, nestedPrefix, isAll);
@@ -58,9 +58,12 @@ public void parseFieldMappings(Class<?> clazz, Map<String, Object> classDefiniti
             parseFieldMappings(clazz, classDefinitionMap, facetFields, filteredFields, fetchContexts, propertiesDefinitionMap, pathPrefix, nestedPrefix,
                     indexable);
         }
-        if (isAll) {
+        if (isAll != null) {
             Map<String, String> fieldsDefinitionMap = new HashMap<String, String>();
             fieldsDefinitionMap.put ("type", "text");
+            if (!isAll.equals("")) {
+               fieldsDefinitionMap.put ("analyzer", isAll);
+            }
             propertiesDefinitionMap.put ("all", fieldsDefinitionMap);
         }
     }

elasticsearch-mapping/src/main/java/org/elasticsearch/mapping/MappingBuilder.java

@@ -203,7 +203,7 @@ public void parseClassAnnotations(Class<?> clazz, String pathPrefix)
         //classDefinitionMap.put("_type", MapUtil.getMap(new String[] { "store", "index" }, new Object[] { esObject.store(), esObject.index() }));
 ****************************/
 
-        this.fieldsMappingBuilder.parseFieldMappings(clazz, classDefinitionMap, facetFields, filteredFields, fetchContexts, pathPrefix, null, true);
+        this.fieldsMappingBuilder.parseFieldMappings(clazz, classDefinitionMap, facetFields, filteredFields, fetchContexts, pathPrefix, null, esAll == null ? "" : esAll.analyser());
 
         ObjectMapper mapper = new ObjectMapper();
         if (typeNameStr != null) {

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

@@ -101,7 +101,7 @@ public void parseAnnotation(MapKeyValue annotation, Map<String, Object> fieldDef
             Map<String, SourceFetchContext> fetchContext = Maps.newHashMap();
             try {
                 this.fieldsMappingBuilder.parseFieldMappings(mapValueType, valueFieldDefinition, facets, filters, fetchContext,
-                        indexable.getName() + ".value.", nestedPrefix, false);
+                        indexable.getName() + ".value.", nestedPrefix, null);
             } catch (IntrospectionException e) {
                 log.error("Fail to parse object class <" + mapValueType.getName() + ">", e);
             }

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

@@ -36,7 +36,7 @@ public void parseAnnotation(NestedObject annotation, Map<String, Object> fieldDe
         Class<?> replaceClass = annotation.nestedClass().equals(NestedObject.class) ? indexable.getType() : annotation.nestedClass();
         try {
             this.fieldsMappingBuilder.parseFieldMappings(replaceClass, fieldDefinition, facets, filters, fetchContext, indexable.getName() + ".",
-                    indexable.getName(), false);
+                    indexable.getName(), null);
         } catch (IntrospectionException e) {
             log.error("Fail to parse nested class <" + replaceClass.getName() + ">", e);
         }

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

@@ -44,7 +44,7 @@ public void parseAnnotation(ObjectField annotation, Map<String, Object> fieldDef
             Class<?> replaceClass = objectClass.equals(ObjectField.class) ? indexable.getType() : objectClass;
             try {
                 String newPrefix = pathPrefix == null ? indexable.getName() + "." : pathPrefix + indexable.getName() + ".";
-                this.fieldsMappingBuilder.parseFieldMappings(replaceClass, fieldDefinition, facets, filters, fetchContext, newPrefix, nestedPrefix, false);
+                this.fieldsMappingBuilder.parseFieldMappings(replaceClass, fieldDefinition, facets, filters, fetchContext, newPrefix, nestedPrefix, null);
             } catch (IntrospectionException e) {
                 log.error("Fail to parse object class <" + replaceClass.getName() + ">", e);
             }

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

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