From 0d7c289f4c23f7193678616814f7d5abe36b0315 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20B=C3=BCscher?= <christoph@elastic.co>
Date: Fri, 29 Jul 2016 20:28:17 +0200
Subject: [PATCH] Adressing review comments

---
 .../index/query/MultiMatchQueryBuilder.java   |  3 +--
 .../index/search/MatchQuery.java              |  4 ----
 .../index/search/MultiMatchQuery.java         | 22 +++++++++----------
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/core/src/main/java/org/elasticsearch/index/query/MultiMatchQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/MultiMatchQueryBuilder.java
index 1026717adcb..6ffcb19ea3a 100644
--- a/core/src/main/java/org/elasticsearch/index/query/MultiMatchQueryBuilder.java
+++ b/core/src/main/java/org/elasticsearch/index/query/MultiMatchQueryBuilder.java
@@ -745,8 +745,7 @@ public class MultiMatchQueryBuilder extends AbstractQueryBuilder<MultiMatchQuery
 
         Map<String, Float> newFieldsBoosts = handleFieldsMatchPattern(context.getMapperService(), fieldsBoosts);
 
-        Query query = multiMatchQuery.parse(type, newFieldsBoosts, value, minimumShouldMatch);
-        return query;
+        return multiMatchQuery.parse(type, newFieldsBoosts, value, minimumShouldMatch);
     }
 
     private static Map<String, Float> handleFieldsMatchPattern(MapperService mapperService, Map<String, Float> fieldsBoosts) {
diff --git a/core/src/main/java/org/elasticsearch/index/search/MatchQuery.java b/core/src/main/java/org/elasticsearch/index/search/MatchQuery.java
index b38d2101163..835ec8e143f 100644
--- a/core/src/main/java/org/elasticsearch/index/search/MatchQuery.java
+++ b/core/src/main/java/org/elasticsearch/index/search/MatchQuery.java
@@ -37,7 +37,6 @@ import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
-import org.elasticsearch.common.lucene.search.MatchNoDocsQuery;
 import org.elasticsearch.common.lucene.search.MultiPhrasePrefixQuery;
 import org.elasticsearch.common.lucene.search.Queries;
 import org.elasticsearch.common.unit.Fuzziness;
@@ -355,9 +354,6 @@ public class MatchQuery {
                     if (query instanceof FuzzyQuery) {
                         QueryParsers.setRewriteMethod((FuzzyQuery) query, fuzzyRewriteMethod);
                     }
-                    if (query == null) {
-                        return new MatchNoDocsQuery("could not create fuzzy query for field type " + fieldType.name());
-                    }
                     return query;
                 } catch (RuntimeException e) {
                     if (lenient) {
diff --git a/core/src/main/java/org/elasticsearch/index/search/MultiMatchQuery.java b/core/src/main/java/org/elasticsearch/index/search/MultiMatchQuery.java
index ce6b2cec706..1a5b3c02e10 100644
--- a/core/src/main/java/org/elasticsearch/index/search/MultiMatchQuery.java
+++ b/core/src/main/java/org/elasticsearch/index/search/MultiMatchQuery.java
@@ -81,17 +81,17 @@ public class MultiMatchQuery extends MatchQuery {
         } else {
             final float tieBreaker = groupTieBreaker == null ? type.tieBreaker() : groupTieBreaker;
             switch (type) {
-            case PHRASE:
-            case PHRASE_PREFIX:
-            case BEST_FIELDS:
-            case MOST_FIELDS:
-                queryBuilder = new QueryBuilder(tieBreaker);
-                break;
-            case CROSS_FIELDS:
-                queryBuilder = new CrossFieldsQueryBuilder(tieBreaker);
-                break;
-            default:
-                throw new IllegalStateException("No such type: " + type);
+                case PHRASE:
+                case PHRASE_PREFIX:
+                case BEST_FIELDS:
+                case MOST_FIELDS:
+                    queryBuilder = new QueryBuilder(tieBreaker);
+                    break;
+                case CROSS_FIELDS:
+                    queryBuilder = new CrossFieldsQueryBuilder(tieBreaker);
+                    break;
+                default:
+                    throw new IllegalStateException("No such type: " + type);
             }
             final List<? extends Query> queries = queryBuilder.buildGroupedQueries(type, fieldNames, value, minimumShouldMatch);
             result = queryBuilder.combineGrouped(queries);