ALIEN-1812 : As a user I want to have facet on null values

Author: vuminhkh

elasticsearch-annotations/pom.xml

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

elasticsearch-mapping/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.alien4cloud</groupId>
         <artifactId>elasticsearch-mapping-parent</artifactId>
-        <version>1.7.0</version>
+        <version>1.7.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>elasticsearch-mapping</artifactId>

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

@@ -1,5 +1,7 @@
 package org.elasticsearch.mapping;
 
+import java.util.List;
+
 import org.elasticsearch.search.aggregations.AggregationBuilder;
 
 /**
@@ -9,9 +11,9 @@
  */
 public interface IFacetBuilderHelper extends IFilterBuilderHelper {
     /**
-     * Build a facet.
+     * Build facets.
      * 
-     * @return The facet.
+     * @return The facets.
      */
-    AggregationBuilder buildFacet();
+    List<AggregationBuilder> buildFacets();
 }

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

@@ -1,7 +1,11 @@
 package org.elasticsearch.mapping;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Set;
 import java.util.function.Supplier;
 
 import javax.annotation.Resource;
@@ -551,7 +555,7 @@ private List<AggregationBuilder> buildAggregations(String className, Set<String>
 
             for (IFacetBuilderHelper facetBuilderHelper : facetBuilderHelpers) {
                 if (filters == null || !filters.contains(facetBuilderHelper.getEsFieldName())) {
-                    aggregationBuilders.add(facetBuilderHelper.buildFacet());
+                    aggregationBuilders.addAll(facetBuilderHelper.buildFacets());
                 }
             }
 

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

@@ -1,5 +1,8 @@
 package org.elasticsearch.mapping;
 
+import java.util.Collections;
+import java.util.List;
+
 import org.elasticsearch.annotation.query.RangeFacet;
 import org.elasticsearch.search.aggregations.AggregationBuilder;
 import org.elasticsearch.search.aggregations.AggregationBuilders;
@@ -26,13 +29,13 @@ public RangeAggregationBuilderHelper(final String nestedPath, final String esFie
     }
 
     @Override
-    public AggregationBuilder buildFacet() {
+    public List<AggregationBuilder> buildFacets() {
         RangeBuilder rangeFacetBuilder = AggregationBuilders.range(getEsFieldName()).field(getEsFieldName()).addUnboundedFrom(this.ranges[0]);
         int i = 1;
         for (; i < this.ranges.length - 2; i += 2) {
             rangeFacetBuilder.addRange(this.ranges[i], this.ranges[i + 1]);
         }
         rangeFacetBuilder.addUnboundedTo(this.ranges[i]);
-        return rangeFacetBuilder;
+        return Collections.singletonList(rangeFacetBuilder);
     }
 }

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

@@ -1,8 +1,12 @@
 package org.elasticsearch.mapping;
 
+import java.util.List;
+
 import org.elasticsearch.annotation.query.TermsFacet;
+import org.elasticsearch.common.collect.Lists;
 import org.elasticsearch.search.aggregations.AggregationBuilder;
 import org.elasticsearch.search.aggregations.AggregationBuilders;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
 import org.elasticsearch.search.facet.terms.TermsFacet.ComparatorType;
 
@@ -34,12 +38,13 @@ public TermsAggregationBuilderHelper(final boolean isAnalyzed, final String nest
     }
 
     @Override
-    public AggregationBuilder buildFacet() {
+    public List<AggregationBuilder> buildFacets() {
         TermsBuilder termsBuilder = AggregationBuilders.terms(getEsFieldName()).field(getEsFieldName()).size(size);
+        MissingBuilder missingBuilder = AggregationBuilders.missing("missing_" + getEsFieldName()).field(getEsFieldName());
         // Elastic search has a bug with excludes so don't use it. https://github.com/elastic/elasticsearch/issues/18575
         // if (exclude != null) {
         // termsBuilder.exclude(exclude);
         // }
-        return termsBuilder;
+        return Lists.newArrayList(termsBuilder, missingBuilder);
     }
 }

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.alien4cloud</groupId>
     <artifactId>elasticsearch-mapping-parent</artifactId>
-    <version>1.7.0</version>
+    <version>1.7.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Elastic search mapping parent</name>