Fix mapping issues for date and enums that must be considered as primitive and not objects.

Author: Luc Boutier

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

@@ -74,14 +74,19 @@ private void parseFieldMappings(Class<?> clazz, Map<String, Object> classDefinit
         processFacetAnnotation(facetFields, filteredFields, esFieldName, indexable);
 
         // process the fields
-        if (ClassUtils.isPrimitiveOrWrapper(indexable.getType()) || indexable.getType() == String.class) {
+        if (ClassUtils.isPrimitiveOrWrapper(indexable.getType()) || indexable.getType() == String.class || indexable.getType() == Date.class) {
             processStringOrPrimitive(clazz, propertiesDefinitionMap, pathPrefix, indexable);
+        } else if (indexable.getType().isEnum()) {
+            StringField annotation = indexable.getAnnotation(StringField.class);
+            if (annotation != null) {
+                processStringOrPrimitive(clazz, propertiesDefinitionMap, pathPrefix, indexable);
+            }
         } else {
             Class<?> arrayType = indexable.getComponentType();
             // mapping of a complex field
             if (arrayType != null) {
                 // process the array type.
-                if (ClassUtils.isPrimitiveOrWrapper(arrayType) || arrayType == String.class) {
+                if (ClassUtils.isPrimitiveOrWrapper(arrayType) || arrayType == String.class || indexable.getType() == Date.class) {
                     processStringOrPrimitive(clazz, propertiesDefinitionMap, pathPrefix, indexable);
                 } else if (arrayType.isEnum()) {
                     // if this is an enum and there is a String

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

@@ -7,7 +7,6 @@
 import org.elasticsearch.common.logging.Loggers;
 import org.elasticsearch.mapping.Indexable;
 import org.elasticsearch.mapping.MappingBuilder;
-import org.elasticsearch.mapping.MappingException;
 
 /**
  * Parse a {@link BooleanField} annotation.

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

@@ -44,6 +44,10 @@ public void parseAnnotation(ObjectField annotation, Map<String, Object> fieldDef
             // nested types can provide replacement class to be managed. This can be usefull to override map default type for example.
             Class<?> replaceClass = objectClass.equals(ObjectField.class) ? indexable.getType() : objectClass;
             try {
+                if(replaceClass.getName().equals("alien4cloud.model.components.PropertyDefinition")) {
+                    LOGGER.info("Process class {}", replaceClass.getName());
+                }
+
                 this.fieldsMappingBuilder.parseFieldMappings(replaceClass, fieldDefinition, facets, filters, fetchContext, indexable.getName() + ".");
             } catch (IntrospectionException e) {
                 LOGGER.error("Fail to parse object class <" + replaceClass.getName() + ">", e);