Upgrade ES 2.0

Author: Jenkins Continuous Integration Server

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

@@ -6,6 +6,7 @@
 import java.lang.annotation.Annotation;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.*;
 
@@ -459,18 +460,27 @@ private Map<String, PropertyDescriptor> getValidPropertyDescriptorMap(Class<?> c
     @SuppressWarnings("unchecked")
     public String getIdValue (Object obj) throws IntrospectionException, IllegalAccessException, InvocationTargetException,
 												 NoSuchMethodException  {
-		String value = null;
-		Class<?> clazz = obj.getClass();
-		List<Indexable> indexables = getIndexables(clazz);
+	String value = null;
+	Class<?> clazz = obj.getClass();
+	List<Indexable> indexables = getIndexables(clazz);
+
+	for (Indexable indexable : indexables) {
+		Id id = indexable.getAnnotation(Id.class);
+		if (id != null) {
+			String name = indexable.getName();
+			value = (String)(PropertyUtils.getSimpleProperty(obj, name));
+		}			 
+	}
 
-        for (Indexable indexable : indexables) {
-        	Id id = indexable.getAnnotation(Id.class);
-        	if (id != null) {
-				String name = indexable.getName();
-				value = (String)(PropertyUtils.getSimpleProperty(obj, name));
-        	} 
-    	}
-		return value;
+	if (value == null) {
+		try  {
+			Method getIdMethod = clazz.getMethod ("getId");
+			Object oresult = getIdMethod.invoke(obj);
+			value = (String)oresult;
+		} catch (Exception e) {}
 	}
 
+	return value;
+    }
+
 }

pom.xml

@@ -39,7 +39,6 @@
         <artifactId>jna</artifactId>
         <version>${jna.version}</version>
     </dependency>
-
             <dependency>
                 <groupId>org.apache.lucene</groupId>
                 <artifactId>lucene-expressions</artifactId>