Upgrade ES 2.0

root · root · commit 2ed49b6b9124 · 2019-02-27T17:17:41.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
@@ -240,7 +240,8 @@ private QueryBuilderHelper(MappingBuilder mappingBuilder, ElasticSearchClient es
         }
 
         protected QueryBuilderHelper(MappingBuilder mappingBuilder, ElasticSearchClient esClient, int maxExpansions, String 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
`@@ -240,7 +240,8 @@ private QueryBuilderHelper(MappingBuilder mappingBuilder, ElasticSearchClient es`
`240`	`240`	`}`
`241`	`241`
`242`	`242`	`protected QueryBuilderHelper(MappingBuilder mappingBuilder, ElasticSearchClient esClient, int maxExpansions, String searchQuery) {`
`243`		`- this.queryBuilder = getOrMatchAll(searchQuery, () -> QueryBuilders.matchPhrasePrefixQuery("_all", searchQuery).maxExpansions(maxExpansions));`
	`243`	`+ this.queryBuilder = getOrMatchAll(searchQuery, () -> QueryBuilders.prefixQuery("_all", searchQuery));`
	`244`	`+ //this.queryBuilder = getOrMatchAll(searchQuery, () -> QueryBuilders.matchPhrasePrefixQuery("_all", searchQuery).maxExpansions(maxExpansions));`
`244`	`245`	`this.mappingBuilder = mappingBuilder;`
`245`	`246`	`this.esClient = esClient;`
`246`	`247`	`}`