addressed review and added migrate guide bit

Author: javanna

core/src/main/java/org/apache/lucene/queryparser/classic/MapperQueryParser.java

@@ -19,20 +19,12 @@
 
 package org.apache.lucene.queryparser.classic;
 
+import com.google.common.collect.ImmutableMap;
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
 import org.apache.lucene.index.Term;
-import org.apache.lucene.search.BooleanClause;
-import org.apache.lucene.search.DisjunctionMaxQuery;
-import org.apache.lucene.search.FilteredQuery;
-import org.apache.lucene.search.FuzzyQuery;
-import org.apache.lucene.search.MatchNoDocsQuery;
-import org.apache.lucene.search.MultiPhraseQuery;
-import org.apache.lucene.search.PhraseQuery;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.WildcardQuery;
-import org.apache.lucene.util.Version;
+import org.apache.lucene.search.*;
 import org.apache.lucene.util.automaton.RegExp;
 import org.elasticsearch.common.lucene.search.Queries;
 import org.elasticsearch.common.unit.Fuzziness;
@@ -42,8 +34,6 @@
 import org.elasticsearch.index.query.QueryShardContext;
 import org.elasticsearch.index.query.support.QueryParsers;
 
-import com.google.common.collect.ImmutableMap;
-
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -83,7 +73,7 @@ public MapperQueryParser(QueryShardContext context) {
 
     public void reset(QueryParserSettings settings) {
         this.settings = settings;
-        if (settings.fieldsAndWeights().size() == 0) {
+        if (settings.fieldsAndWeights().isEmpty()) {
             this.field = settings.defaultField();
         } else if (settings.fieldsAndWeights().size() == 1) {
             this.field = settings.fieldsAndWeights().keySet().iterator().next();
@@ -529,13 +519,6 @@ private Query getPossiblyAnalyzedPrefixQuery(String field, String termStr) throw
                 clauses.add(new BooleanClause(super.getPrefixQuery(field, token), BooleanClause.Occur.SHOULD));
             }
             return getBooleanQuery(clauses, true);
-
-            //return super.getPrefixQuery(field, termStr);
-
-            // this means that the analyzer used either added or consumed (common for a stemmer) tokens, and we can't build a PrefixQuery
-            //throw new ParseException("Cannot build PrefixQuery with analyzer "
-            //        + getAnalyzer().getClass()
-            //        + (tlist.size() > 1 ? " - token(s) added" : " - token consumed"));
         }
 
     }

core/src/test/java/org/elasticsearch/index/query/QueryStringQueryBuilderTest.java renamed to core/src/test/java/org/elasticsearch/index/query/QueryStringQueryBuilderTests.java

@@ -35,7 +35,7 @@
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.Matchers.*;
 
-public class QueryStringQueryBuilderTest extends BaseQueryTestCase<QueryStringQueryBuilder> {
+public class QueryStringQueryBuilderTests extends BaseQueryTestCase<QueryStringQueryBuilder> {
 
     @Override
     protected QueryStringQueryBuilder doCreateTestQueryBuilder() {

docs/reference/migration/migrate_query_refactoring.asciidoc

@@ -59,6 +59,11 @@ Removed `wrapperQueryBuilder(byte[] source, int offset, int length)`. Instead si
 use  `wrapperQueryBuilder(byte[] source)`. Updated the static factory methods in
 QueryBuilders accordingly.
 
+==== QueryStringQueryBuilder
+
+Removed ability to pass in boost value using `field(String field)` method in form e.g. `field^2`.
+Use the `field(String, float)` method instead.
+
 ==== Operator
 
 Removed the enums called `Operator` from `MatchQueryBuilder`, `QueryStringQueryBuilder`,