Mapping now manages complex objects.

Author: Luc Boutier

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

@@ -300,6 +300,18 @@ private void processComplexType(Class<?> clazz, Map<String, Object> propertiesDe
         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.parseAnnotation(null, fieldDefinition, pathPrefix, indexable);
+        }
     }
 
     @SuppressWarnings("unchecked")

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

@@ -34,12 +34,15 @@ public void parseAnnotation(ObjectField annotation, Map<String, Object> fieldDef
                     + "." + indexable.getName() + "> type is already set to <" + fieldDefinition.get("type") + ">");
         }
 
+        Class<?> objectClass = annotation == null ? ObjectField.class : annotation.objectClass();
+        Boolean enabled = annotation == null ? true : annotation.enabled();
+
         fieldDefinition.put("type", "object");
-        fieldDefinition.put("enabled", annotation.enabled());
-        if (annotation.enabled()) {
+        fieldDefinition.put("enabled", enabled);
+        if (enabled) {
             Map<String, SourceFetchContext> fetchContext = Maps.newHashMap();
             // nested types can provide replacement class to be managed. This can be usefull to override map default type for example.
-            Class<?> replaceClass = annotation.objectClass().equals(ObjectField.class) ? indexable.getType() : annotation.objectClass();
+            Class<?> replaceClass = objectClass.equals(ObjectField.class) ? indexable.getType() : objectClass;
             try {
                 this.fieldsMappingBuilder.parseFieldMappings(replaceClass, fieldDefinition, facets, filters, fetchContext, indexable.getName() + ".");
             } catch (IntrospectionException e) {

elasticsearch-mapping/src/test/java/org/elasticsearch/mapping/MappingBuilderTest.java

@@ -2,6 +2,8 @@
 
 import java.beans.IntrospectionException;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 
 import junit.framework.Assert;
 
@@ -19,13 +21,11 @@
 public class MappingBuilderTest {
 
     @Test
-    public void testSimpleClassMapping() throws IntrospectionException, JsonGenerationException, JsonMappingException,
-            IOException {
+    public void testSimpleClassMapping() throws IntrospectionException, JsonGenerationException, JsonMappingException, IOException {
         MappingBuilder mappingBuilder = new MappingBuilder();
         mappingBuilder.initialize("org.elasticsearch.mapping.model");
         String personMapping = mappingBuilder.getMapping(Person.class);
-        Assert.assertEquals(
-                "{\"person\":{\"_type\":{\"index\":\"not_analyzed\",\"store\":false},\"_source\":{\"enabled\":true},\"_id\":{\"path\":\"id\",\"index\":\"no\",\"store\":false},\"_all\":{\"analyzer\":\"simple\",\"store\":false,\"enabled\":true},\"properties\":{\"firstname\":{\"include_in_all\":false,\"term_vector\":\"no\",\"index\":\"no\",\"boost\":1.0,\"store\":false,\"type\":\"string\"},\"address\":{\"type\":\"nested\",\"properties\":{\"city\":{\"include_in_all\":false,\"term_vector\":\"no\",\"index\":\"not_analyzed\",\"boost\":1.0,\"store\":false,\"type\":\"string\"}}},\"alienScore\":{\"include_in_all\":false,\"precision_step\":4,\"index\":\"not_analyzed\",\"boost\":1.0,\"store\":false,\"ignore_malformed\":false,\"type\":\"long\"},\"lastname\":{\"include_in_all\":true,\"term_vector\":\"no\",\"index\":\"analyzed\",\"boost\":1.0,\"store\":false,\"type\":\"string\"}}}}",
-                personMapping);
+        String expected = Files.readAllLines(Paths.get("src/test/resources/mapping.json")).get(0);
+        Assert.assertEquals(expected, personMapping);
     }
 }

elasticsearch-mapping/src/test/java/org/elasticsearch/mapping/model/Person.java

@@ -21,6 +21,8 @@ public class Person {
     @NestedObject
     private Address address;
 
+    private Address alternateAddress;
+
     @NumberField(index = IndexType.not_analyzed, includeInAll = false)
     private long alienScore = 1;
 
@@ -63,4 +65,12 @@ public Address getAddress() {
     public void setAddress(Address address) {
         this.address = address;
     }
+
+    public Address getAlternateAddress() {
+        return alternateAddress;
+    }
+
+    public void setAlternateAddress(Address alternateAddress) {
+        this.alternateAddress = alternateAddress;
+    }
 }

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

@@ -0,0 +1 @@
+{"person":{"_type":{"index":"not_analyzed","store":false},"_source":{"enabled":true},"_id":{"path":"id","index":"no","store":false},"_all":{"analyzer":"simple","store":false,"enabled":true},"properties":{"firstname":{"include_in_all":false,"term_vector":"no","index":"no","boost":1.0,"store":false,"type":"string"},"address":{"type":"nested","properties":{"city":{"include_in_all":false,"term_vector":"no","index":"not_analyzed","boost":1.0,"store":false,"type":"string"}}},"alienScore":{"include_in_all":false,"precision_step":4,"index":"not_analyzed","boost":1.0,"store":false,"ignore_malformed":false,"type":"long"},"alternateAddress":{"type":"object","enabled":true,"properties":{"city":{"include_in_all":false,"term_vector":"no","index":"not_analyzed","boost":1.0,"store":false,"type":"string"}}},"lastname":{"include_in_all":true,"term_vector":"no","index":"analyzed","boost":1.0,"store":false,"type":"string"}}}}