- Fix array or collection check.

- Do that in a minor update 1.5.1

Author: Luc Boutier

elasticsearch-annotations/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.alien4cloud</groupId>
         <artifactId>elasticsearch-mapping-parent</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.5.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>elasticsearch-annotations</artifactId>

elasticsearch-mapping/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.alien4cloud</groupId>
         <artifactId>elasticsearch-mapping-parent</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.5.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>elasticsearch-mapping</artifactId>

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

@@ -98,10 +98,9 @@ private void parseFieldMappings(Class<?> clazz, Map<String, Object> classDefinit
 
     private void processComplexOrArray(Class<?> clazz, List<IFacetBuilderHelper> facetFields, List<IFilterBuilderHelper> filteredFields, String pathPrefix,
             Map<String, Object> propertiesDefinitionMap, Indexable indexable) {
-        Class<?> arrayType = indexable.getComponentType();
-        Class<?> mapValueType = indexable.getComponentType(1);
         // mapping of a complex field
-        if (arrayType != null && mapValueType == null) {
+        if (indexable.isArrayOrCollection()) {
+            Class<?> arrayType = indexable.getComponentType();
             // process the array type.
             if (ClassUtils.isPrimitiveOrWrapper(arrayType) || arrayType == String.class || indexable.getType() == Date.class) {
                 processStringOrPrimitive(clazz, propertiesDefinitionMap, pathPrefix, indexable);
@@ -319,19 +318,22 @@ private void processComplexType(Class<?> clazz, Map<String, Object> propertiesDe
             List<IFilterBuilderHelper> filters, List<IFacetBuilderHelper> facets) {
         NestedObjectFieldAnnotationParser nested = new NestedObjectFieldAnnotationParser(this, filters, facets);
         processFieldAnnotation(NestedObject.class, nested, propertiesDefinitionMap, pathPrefix, indexable);
-        ObjectFieldAnnotationParser objectFieldAnnotationParser = new ObjectFieldAnnotationParser(this, filters, facets);
-        processFieldAnnotation(ObjectField.class, objectFieldAnnotationParser, propertiesDefinitionMap, pathPrefix, indexable);
-        // by default we consider the complex object as an object mapping and process recursive mapping of every field just as ES would process based on dynamic
-        // mapping
 
         if (propertiesDefinitionMap.get(indexable.getName()) == null) {
-            // Define mapping as object
-            Map<String, Object> fieldDefinition = (Map<String, Object>) propertiesDefinitionMap.get(indexable.getName());
-            if (fieldDefinition == null) {
-                fieldDefinition = new HashMap<String, Object>();
-                propertiesDefinitionMap.put(indexable.getName(), fieldDefinition);
+            ObjectFieldAnnotationParser objectFieldAnnotationParser = new ObjectFieldAnnotationParser(this, filters, facets);
+            processFieldAnnotation(ObjectField.class, objectFieldAnnotationParser, propertiesDefinitionMap, pathPrefix, indexable);
+            // by default we consider the complex object as an object mapping and process recursive mapping of every field just as ES would process based on
+            // dynamic
+            // mapping
+            if (propertiesDefinitionMap.get(indexable.getName()) == null) {
+                // Define mapping as object
+                Map<String, Object> fieldDefinition = (Map<String, Object>) propertiesDefinitionMap.get(indexable.getName());
+                if (fieldDefinition == null) {
+                    fieldDefinition = new HashMap<String, Object>();
+                    propertiesDefinitionMap.put(indexable.getName(), fieldDefinition);
+                }
+                objectFieldAnnotationParser.parseAnnotation(null, fieldDefinition, pathPrefix, indexable);
             }
-            objectFieldAnnotationParser.parseAnnotation(null, fieldDefinition, pathPrefix, indexable);
         }
     }
 

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

@@ -58,6 +58,11 @@ public Class<?> getComponentType() {
         return getComponentType(0);
     }
 
+    public boolean isArrayOrCollection() {
+        Class<?> type = getType();
+        return type.isArray() || Collection.class.isAssignableFrom(type);
+    }
+
     public Class<?> getComponentType(int index) {
         Class<?> type = getType();
         if (type.isArray()) {

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.alien4cloud</groupId>
     <artifactId>elasticsearch-mapping-parent</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.5.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Elastic search mapping parent</name>