Support for nested prefix field.

Author: Luc Boutier

elasticsearch-annotations/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.alien4cloud</groupId>
         <artifactId>elasticsearch-mapping-parent</artifactId>
-        <version>1.7.2</version>
+        <version>1.7.3</version>
     </parent>
 
     <artifactId>elasticsearch-annotations</artifactId>

elasticsearch-mapping/pom.xml

@@ -1,9 +1,10 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.alien4cloud</groupId>
         <artifactId>elasticsearch-mapping-parent</artifactId>
-        <version>1.7.2</version>
+        <version>1.7.3</version>
     </parent>
 
     <artifactId>elasticsearch-mapping</artifactId>

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

@@ -236,6 +236,7 @@ protected QueryBuilderHelper(MappingBuilder mappingBuilder, ElasticSearchClient
         }
 
         protected QueryBuilderHelper(MappingBuilder mappingBuilder, ElasticSearchClient esClient, String prefixField, String searchPrefix) {
+            this.prefixField = prefixField;
             this.queryBuilder = getOrMatchAll(searchPrefix, () -> QueryBuilders.prefixQuery(prefixField, searchPrefix));
             this.mappingBuilder = mappingBuilder;
             this.esClient = esClient;
@@ -259,9 +260,26 @@ private QueryBuilder getOrMatchAll(String search, Supplier<QueryBuilder> supplie
         public QueryBuilderHelper types(Class<?>... classes) {
             // you must set classes before you can set filters for them.
             this.classes = classes;
+            wrapPrefixQueryIfNested();
             return this;
         }
 
+        private void wrapPrefixQueryIfNested() {
+            if (prefixField == null) {
+                return;
+            }
+
+            List<IFilterBuilderHelper> filterBuilderHelpers = mappingBuilder.getFilters(classes[0].getName());
+            for (IFilterBuilderHelper filterBuilderHelper : filterBuilderHelpers) {
+                if (filterBuilderHelper.isNested() && prefixField.equals(filterBuilderHelper.getEsFieldName())) {
+                    this.queryBuilder = QueryBuilders.nestedQuery(filterBuilderHelper.getNestedPath(), queryBuilder);
+                    return;
+                }
+            }
+
+            return;
+        }
+
         @Override
         public QueryBuilderHelper alterQuery(QueryBuilderAdapter queryBuilderConsumer) {
             queryBuilder = queryBuilderConsumer.adapt(this.queryBuilder);
@@ -286,7 +304,6 @@ public CountResponse count(String[] indices, String... types) {
                 countRequestBuilder.setTypes(types);
             }
             countRequestBuilder.setQuery(this.queryBuilder);
-            String query = countRequestBuilder.toString();
             return countRequestBuilder.execute().actionGet();
         }
 

pom.xml

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