Allow subclasses to override parent mapping.

Author: Luc Boutier

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

@@ -3,7 +3,10 @@
 import java.util.Map;
 
 import org.elasticsearch.annotation.BooleanField;
+import org.elasticsearch.common.logging.ESLogger;
+import org.elasticsearch.common.logging.Loggers;
 import org.elasticsearch.mapping.Indexable;
+import org.elasticsearch.mapping.MappingBuilder;
 import org.elasticsearch.mapping.MappingException;
 
 /**
@@ -12,13 +15,14 @@
  * @author luc boutier
  */
 public class BooleanFieldAnnotationParser implements IPropertyAnnotationParser<BooleanField> {
+    private static final ESLogger LOGGER = Loggers.getLogger(MappingBuilder.class);
+
     public void parseAnnotation(BooleanField annotation, Map<String, Object> fieldDefinition, String pathPrefix,
             Indexable indexable) {
         if (fieldDefinition.get("type") != null) {
-            throw new MappingException(
-                    "A field cannot have more than one Elastic Search type. Parsing BooleanField on <"
-                            + indexable.getDeclaringClassName() + "." + indexable.getName()
-                            + "> type is already set to <" + fieldDefinition.get("type") + ">");
+            LOGGER.info("Overriding mapping for field {} for class {} was defined as type {}", indexable.getName(), indexable.getDeclaringClassName(),
+                    fieldDefinition.get("type"));
+            fieldDefinition.clear();
         }
 
         fieldDefinition.put("type", "boolean");

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

@@ -3,7 +3,10 @@
 import java.util.Map;
 
 import org.elasticsearch.annotation.DateField;
+import org.elasticsearch.common.logging.ESLogger;
+import org.elasticsearch.common.logging.Loggers;
 import org.elasticsearch.mapping.Indexable;
+import org.elasticsearch.mapping.MappingBuilder;
 import org.elasticsearch.mapping.MappingException;
 
 /**
@@ -12,13 +15,13 @@
  * @author luc boutier
  */
 public class DateFieldAnnotationParser implements IPropertyAnnotationParser<DateField> {
-    public void parseAnnotation(DateField annotation, Map<String, Object> fieldDefinition, String pathPrefix,
-            Indexable indexable) {
+    private static final ESLogger LOGGER = Loggers.getLogger(MappingBuilder.class);
+
+    public void parseAnnotation(DateField annotation, Map<String, Object> fieldDefinition, String pathPrefix, Indexable indexable) {
         if (fieldDefinition.get("type") != null) {
-            throw new MappingException(
-                    "A field cannot have more than one Elastic Search type. Parsing StringField on <"
-                            + indexable.getDeclaringClassName() + "." + indexable.getName()
-                            + "> type is already set to <" + fieldDefinition.get("type") + ">");
+            LOGGER.info("Overriding mapping for field {} for class {} was defined as type {}", indexable.getName(), indexable.getDeclaringClassName(),
+                    fieldDefinition.get("type"));
+            fieldDefinition.clear();
         }
 
         fieldDefinition.put("type", "date");

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

@@ -3,7 +3,10 @@
 import java.util.Map;
 
 import org.elasticsearch.annotation.DateFormat;
+import org.elasticsearch.common.logging.ESLogger;
+import org.elasticsearch.common.logging.Loggers;
 import org.elasticsearch.mapping.Indexable;
+import org.elasticsearch.mapping.MappingBuilder;
 import org.elasticsearch.mapping.MappingException;
 
 /**
@@ -12,14 +15,16 @@
  * @author luc boutier
  */
 public class DateFormatAnnotationParser implements IPropertyAnnotationParser<DateFormat> {
+    private static final ESLogger LOGGER = Loggers.getLogger(MappingBuilder.class);
+
     public void parseAnnotation(DateFormat annotation, Map<String, Object> fieldDefinition, String pathPrefix,
             Indexable indexable) {
         if (fieldDefinition.get("type") == null) {
             fieldDefinition.put("type", "date");
         } else if (!fieldDefinition.get("type").equals("date")) {
-            throw new MappingException(
-                    "Date format annotation requires a date type to be set for the field current is <"
-                            + fieldDefinition.get("type") + ">.");
+            LOGGER.info("Overriding mapping for field {} for class {} was defined as type {}", indexable.getName(), indexable.getDeclaringClassName(),
+                    fieldDefinition.get("type"));
+            fieldDefinition.clear();
         }
 
         fieldDefinition.put("format", annotation.format());

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

@@ -26,8 +26,9 @@ public NestedObjectFieldAnnotationParser(FieldsMappingBuilder fieldsMappingBuild
     @Override
     public void parseAnnotation(NestedObject annotation, Map<String, Object> fieldDefinition, String pathPrefix, Indexable indexable) {
         if (fieldDefinition.get("type") != null) {
-            throw new MappingException("A field cannot have more than one Elastic Search type. Parsing NestedObject on <" + indexable.getDeclaringClassName()
-                    + "." + indexable.getName() + "> type is already set to <" + fieldDefinition.get("type") + ">");
+            LOGGER.info("Overriding mapping for field {} for class {} was defined as type {}", indexable.getName(), indexable.getDeclaringClassName(),
+                    fieldDefinition.get("type"));
+            fieldDefinition.clear();
         }
 
         fieldDefinition.put("type", "nested");

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

@@ -3,7 +3,10 @@
 import java.util.Map;
 
 import org.elasticsearch.annotation.NumberField;
+import org.elasticsearch.common.logging.ESLogger;
+import org.elasticsearch.common.logging.Loggers;
 import org.elasticsearch.mapping.Indexable;
+import org.elasticsearch.mapping.MappingBuilder;
 import org.elasticsearch.mapping.MappingException;
 
 /**
@@ -12,13 +15,14 @@
  * @author luc boutier
  */
 public class NumberFieldAnnotationParser implements IPropertyAnnotationParser<NumberField> {
+    private static final ESLogger LOGGER = Loggers.getLogger(MappingBuilder.class);
+
     public void parseAnnotation(NumberField annotation, Map<String, Object> fieldDefinition, String pathPrefix,
             Indexable indexable) {
         if (fieldDefinition.get("type") != null) {
-            throw new MappingException(
-                    "A field cannot have more than one Elastic Search type. Parsing StringField on <"
-                            + indexable.getDeclaringClassName() + "." + indexable.getName()
-                            + "> type is already set to <" + fieldDefinition.get("type") + ">");
+            LOGGER.info("Overriding mapping for field {} for class {} was defined as type {}", indexable.getName(), indexable.getDeclaringClassName(),
+                    fieldDefinition.get("type"));
+            fieldDefinition.clear();
         }
 
         String type = getESNumberType(indexable);

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

@@ -14,7 +14,6 @@
  * Parse a {@link org.elasticsearch.annotation.ObjectField} to enrich the mapping
  */
 public class ObjectFieldAnnotationParser implements IPropertyAnnotationParser<ObjectField> {
-
     private static final ESLogger LOGGER = Loggers.getLogger(MappingBuilder.class);
 
     private final FieldsMappingBuilder fieldsMappingBuilder;
@@ -30,8 +29,9 @@ public ObjectFieldAnnotationParser(FieldsMappingBuilder fieldsMappingBuilder, Li
     @Override
     public void parseAnnotation(ObjectField annotation, Map<String, Object> fieldDefinition, String pathPrefix, Indexable indexable) {
         if (fieldDefinition.get("type") != null) {
-            throw new MappingException("A field cannot have more than one Elastic Search type. Parsing ComplexObject on <" + indexable.getDeclaringClassName()
-                    + "." + indexable.getName() + "> type is already set to <" + fieldDefinition.get("type") + ">");
+            LOGGER.info("Overriding mapping for field {} for class {} was defined as type {}", indexable.getName(), indexable.getDeclaringClassName(),
+                    fieldDefinition.get("type"));
+            fieldDefinition.clear();
         }
 
         Class<?> objectClass = annotation == null ? ObjectField.class : annotation.objectClass();

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

@@ -4,25 +4,24 @@
 import java.util.Map;
 
 import org.elasticsearch.annotation.StringField;
-import org.elasticsearch.mapping.IndexOptions;
-import org.elasticsearch.mapping.Indexable;
-import org.elasticsearch.mapping.MappingException;
-import org.elasticsearch.mapping.NormEnabled;
-import org.elasticsearch.mapping.NormLoading;
+import org.elasticsearch.common.logging.ESLogger;
+import org.elasticsearch.common.logging.Loggers;
+import org.elasticsearch.mapping.*;
 
 /**
  * Parse a {@link StringField} annotation.
  * 
  * @author luc boutier
  */
 public class StringFieldAnnotationParser implements IPropertyAnnotationParser<StringField> {
+    private static final ESLogger LOGGER = Loggers.getLogger(MappingBuilder.class);
+
     public void parseAnnotation(StringField annotation, Map<String, Object> fieldDefinition, String pathPrefix,
             Indexable indexable) {
         if (fieldDefinition.get("type") != null) {
-            throw new MappingException(
-                    "A field cannot have more than one Elastic Search type. Parsing StringField on <"
-                            + indexable.getDeclaringClassName() + "." + indexable.getName()
-                            + "> type is already set to <" + fieldDefinition.get("type") + ">");
+            LOGGER.info("Overriding mapping for field {} for class {} was defined as type {}", indexable.getName(), indexable.getDeclaringClassName(),
+                    fieldDefinition.get("type"));
+            fieldDefinition.clear();
         }
 
         fieldDefinition.put("type", "string");