Upgrade ES 2

EmmanuelDuru · EmmanuelDuru · commit 47a0eb44f980 · 2019-03-12T16:33:32.000+01:00
diff --git a/elasticsearch-mapping/src/main/java/org/elasticsearch/mapping/QueryHelper.java b/elasticsearch-mapping/src/main/java/org/elasticsearch/mapping/QueryHelper.java
@@ -241,8 +241,8 @@ private QueryBuilderHelper(MappingBuilder mappingBuilder, ElasticSearchClient es
         }
 
         protected QueryBuilderHelper(MappingBuilder mappingBuilder, ElasticSearchClient esClient, int maxExpansions, String searchQuery) {
-            this.queryBuilder = getOrMatchAll(searchQuery, () -> QueryBuilders.prefixQuery("_all", searchQuery));
-            //this.queryBuilder = getOrMatchAll(searchQuery, () -> QueryBuilders.matchPhrasePrefixQuery("_all", searchQuery).maxExpansions(maxExpansions));
+            //this.queryBuilder = getOrMatchAll(searchQuery, () -> QueryBuilders.prefixQuery("_all", searchQuery));
+            this.queryBuilder = getOrMatchAll(searchQuery, () -> QueryBuilders.matchPhrasePrefixQuery("_all", searchQuery).maxExpansions(maxExpansions));
             this.mappingBuilder = mappingBuilder;
             this.esClient = esClient;
         }

Original file line number	Diff line number	Diff line change
`@@ -241,8 +241,8 @@ private QueryBuilderHelper(MappingBuilder mappingBuilder, ElasticSearchClient es`
`241`	`241`	`}`
`242`	`242`
`243`	`243`	`protected QueryBuilderHelper(MappingBuilder mappingBuilder, ElasticSearchClient esClient, int maxExpansions, String searchQuery) {`
`244`		`- this.queryBuilder = getOrMatchAll(searchQuery, () -> QueryBuilders.prefixQuery("_all", searchQuery));`
`245`		`- //this.queryBuilder = getOrMatchAll(searchQuery, () -> QueryBuilders.matchPhrasePrefixQuery("_all", searchQuery).maxExpansions(maxExpansions));`
	`244`	`+ //this.queryBuilder = getOrMatchAll(searchQuery, () -> QueryBuilders.prefixQuery("_all", searchQuery));`
	`245`	`+ this.queryBuilder = getOrMatchAll(searchQuery, () -> QueryBuilders.matchPhrasePrefixQuery("_all", searchQuery).maxExpansions(maxExpansions));`
`246`	`246`	`this.mappingBuilder = mappingBuilder;`
`247`	`247`	`this.esClient = esClient;`
`248`	`248`	`}`