[ALIEN-2975][ALIEN-2981] MetaProperties filter

All objects that have meta properties should be filtered using meta
property values (Facets filters)

Author: SebastienLaurent

elasticsearch-annotations/pom.xml

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

elasticsearch-mapping/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.alien4cloud</groupId>
         <artifactId>elasticsearch-mapping-parent</artifactId>
-        <version>1.7.5</version>
+        <version>1.7.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>elasticsearch-mapping</artifactId>

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

@@ -1,11 +1,7 @@
 package org.elasticsearch.mapping;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
-import java.util.Set;
 import java.util.function.Supplier;
 
 import javax.annotation.Resource;
@@ -187,6 +183,11 @@ public interface ISearchQueryBuilderHelper extends IFilterableQueryBuilderHelper
          */
         ISearchQueryBuilderHelper facets();
 
+        /**
+         * Set the aggregations for the given classes.
+         */
+        ISearchQueryBuilderHelper facets(List<IFacetBuilderHelper> facetBuilderHelpers);
+
         /**
          * Execute the given consumer to alter the search request builder.
          *
@@ -547,19 +548,24 @@ private String[][] includeExcludes(String fetchContext) {
 
         @Override
         public QueryBuilderHelper facets() {
+            return facets(new ArrayList<>());
+        }
+
+        @Override
+        public QueryBuilderHelper facets(List<IFacetBuilderHelper> facetBuilderHelpers) {
             Set<String> aggIds = Sets.newHashSet();
             for (Class<?> clazz : classes) {
                 if (filters == null) {
-                    addAggregations(new HashMap(), clazz.getName(), searchRequestBuilder, aggIds);
+                    addAggregations(new HashMap(), clazz.getName(), searchRequestBuilder, aggIds,facetBuilderHelpers);
                 } else {
-                    addAggregations(filters, clazz.getName(), searchRequestBuilder, aggIds);
+                    addAggregations(filters, clazz.getName(), searchRequestBuilder, aggIds,facetBuilderHelpers);
                 }
             }
             return this;
         }
 
-        private void addAggregations(Map<String, String[]> filters, String className, SearchRequestBuilder searchRequestBuilder, Set<String> aggIds) {
-            final List<AggregationBuilder> aggregations = buildAggregations(className, filters.keySet());
+        private void addAggregations(Map<String, String[]> filters, String className, SearchRequestBuilder searchRequestBuilder, Set<String> aggIds,List<IFacetBuilderHelper> facetBuilderHelpers) {
+            final List<AggregationBuilder> aggregations = buildAggregations(className, filters.keySet(),facetBuilderHelpers);
             for (AggregationBuilder aggregation : aggregations) {
                 if (!aggIds.contains(aggregation.getName())) {
                     aggIds.add(aggregation.getName());
@@ -575,10 +581,13 @@ private void addAggregations(Map<String, String[]> filters, String className, Se
          * @param filters The set of aggregations to exclude from the facet creation.
          * @return a {@link List} of {@link AggregationBuilder aggregation builders}.
          */
-        private List<AggregationBuilder> buildAggregations(String className, Set<String> filters) {
+        private List<AggregationBuilder> buildAggregations(String className, Set<String> filters,List<IFacetBuilderHelper> externalHelpers) {
             final List<AggregationBuilder> aggregationBuilders = new ArrayList<AggregationBuilder>();
             List<IFacetBuilderHelper> facetBuilderHelpers = mappingBuilder.getFacets(className);
 
+            // Add external Helpers
+            facetBuilderHelpers.addAll(externalHelpers);
+
             if (facetBuilderHelpers == null || facetBuilderHelpers.size() < 1) {
                 return aggregationBuilders;
             }