address review

jimczi · jimczi · commit 0abf44c2e0dd · 2018-04-04T08:32:06.000+02:00
diff --git a/server/src/main/java/org/elasticsearch/index/search/QueryStringQueryParser.java b/server/src/main/java/org/elasticsearch/index/search/QueryStringQueryParser.java
@@ -59,14 +59,14 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import static org.elasticsearch.common.lucene.search.Queries.fixNegativeQueryIfNeeded;
 import static org.elasticsearch.common.lucene.search.Queries.newLenientFieldQuery;
 import static org.elasticsearch.common.lucene.search.Queries.newUnmappedFieldQuery;
 import static org.elasticsearch.index.search.QueryParserHelper.resolveMappingField;
+import static org.elasticsearch.index.search.QueryParserHelper.resolveMappingFields;
 
 /**
  * A {@link XQueryParser} that uses the {@link MapperService} in order to build smarter
@@ -266,15 +266,7 @@ private Map<String, Float> extractMultiFields(String field, boolean quoted) {
             // Filters metadata fields if all fields are requested
             return resolveMappingField(context, field, 1.0f, !allFields, !multiFields, quoted ? quoteFieldSuffix : null);
         } else if (quoted && quoteFieldSuffix != null) {
-            Map<String, Float> newFields = new HashMap<>(fieldsAndWeights.size());
-            for (Map.Entry<String, Float> entry : fieldsAndWeights.entrySet()) {
-                String fieldName = entry.getKey();
-                if (context.fieldMapper(entry.getKey() + quoteFieldSuffix) != null) {
-                    fieldName += quoteFieldSuffix;
-                }
-                newFields.put(fieldName, entry.getValue());
-            }
-            return newFields;
+            return resolveMappingFields(context, fieldsAndWeights, quoteFieldSuffix);
         } else {
             return fieldsAndWeights;
         }
