Version 1.5.2.

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.2</version>
     </parent>
 
     <artifactId>elasticsearch-annotations</artifactId>

elasticsearch-annotations/src/main/java/org/elasticsearch/annotation/query/TermFilter.java

@@ -16,4 +16,11 @@
 @Target({ ElementType.FIELD, ElementType.METHOD })
 public @interface TermFilter {
     String[] paths() default "";
+
+    /**
+     * Optional paths generator to override the paths property of the annotation for complex use-case or reflection etc.
+     *
+     * @return the path generator.
+     */
+    Class<? extends IPathGenerator> pathGenerator() default IPathGenerator.DEFAULT.class;
 }

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.2</version>
     </parent>
 
     <artifactId>elasticsearch-mapping</artifactId>

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

@@ -211,6 +211,17 @@ private void processFilterAnnotation(List<IFilterBuilderHelper> classFilters, St
         TermFilter termFilter = indexable.getAnnotation(TermFilter.class);
         if (termFilter != null) {
             String[] paths = termFilter.paths();
+            if (termFilter.pathGenerator() != null) {
+                // create an instance of the generator
+                try {
+                    IPathGenerator generator = termFilter.pathGenerator().newInstance();
+                    paths = generator.getPaths(paths);
+                } catch (InstantiationException e) {
+                    e.printStackTrace(); // TODO better exception handling
+                } catch (IllegalAccessException e) {
+                    e.printStackTrace(); // TODO better exception handling
+                }
+            }
             for (String path : paths) {
                 path = path.trim();
                 boolean isAnalyzed = isAnalyzed(indexable);

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.2</version>
     <packaging>pom</packaging>
 
     <name>Elastic search mapping parent</name>