Remove MappedFieldType#queryStringTermQuery, as it is never overridden.

Author: jtibshirani

server/src/main/java/org/apache/lucene/queries/ExtendedCommonTermsQuery.java

@@ -19,12 +19,8 @@
 
 package org.apache.lucene.queries;
 
-import org.apache.lucene.index.Term;
-import org.apache.lucene.index.TermContext;
 import org.apache.lucene.search.BooleanClause.Occur;
-import org.apache.lucene.search.Query;
 import org.elasticsearch.common.lucene.search.Queries;
-import org.elasticsearch.index.mapper.MappedFieldType;
 
 /**
  * Extended version of {@link CommonTermsQuery} that allows to pass in a
@@ -33,11 +29,8 @@
  */
 public class ExtendedCommonTermsQuery extends CommonTermsQuery {
 
-    private final MappedFieldType fieldType;
-
-    public ExtendedCommonTermsQuery(Occur highFreqOccur, Occur lowFreqOccur, float maxTermFrequency, MappedFieldType fieldType) {
+    public ExtendedCommonTermsQuery(Occur highFreqOccur, Occur lowFreqOccur, float maxTermFrequency) {
         super(highFreqOccur, lowFreqOccur, maxTermFrequency);
-        this.fieldType = fieldType;
     }
 
     private String lowFreqMinNumShouldMatchSpec;
@@ -80,16 +73,4 @@ public float getMaxTermFrequency() {
         return this.maxTermFrequency;
     }
 
-    @Override
-    protected Query newTermQuery(Term term, TermContext context) {
-        if (fieldType == null) {
-            return super.newTermQuery(term, context);
-        }
-        final Query query = fieldType.queryStringTermQuery(term);
-        if (query == null) {
-            return super.newTermQuery(term, context);
-        } else {
-            return query;
-        }
-    }
 }

server/src/main/java/org/elasticsearch/index/mapper/MappedFieldType.java

@@ -375,12 +375,6 @@ public Relation isFieldWithinQuery(
         return Relation.INTERSECTS;
     }
 
-    /** A term query to use when parsing a query string. Can return {@code null}. */
-    @Nullable
-    public Query queryStringTermQuery(Term term) {
-        return null;
-    }
-
     /** @throws IllegalArgumentException if the fielddata is not supported on this type.
      *  An IllegalArgumentException is needed in order to return an http error 400
      *  when this error occurs in a request. see: {@link org.elasticsearch.ExceptionsHelper#status}

server/src/main/java/org/elasticsearch/index/query/CommonTermsQueryBuilder.java

@@ -371,8 +371,7 @@ protected Query doToQuery(QueryShardContext context) throws IOException {
         Occur highFreqOccur = highFreqOperator.toBooleanClauseOccur();
         Occur lowFreqOccur = lowFreqOperator.toBooleanClauseOccur();
 
-        ExtendedCommonTermsQuery commonsQuery = new ExtendedCommonTermsQuery(highFreqOccur, lowFreqOccur,
-                cutoffFrequency, fieldType);
+        ExtendedCommonTermsQuery commonsQuery = new ExtendedCommonTermsQuery(highFreqOccur, lowFreqOccur, cutoffFrequency);
         return parseQueryString(commonsQuery, text, field, analyzerObj, lowFreqMinimumShouldMatch, highFreqMinimumShouldMatch);
     }
 

server/src/main/java/org/elasticsearch/index/search/MatchQuery.java

@@ -20,16 +20,15 @@
 package org.elasticsearch.index.search;
 
 import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.miscellaneous.DisableGraphAttribute;
 import org.apache.lucene.analysis.TokenStream;
+import org.apache.lucene.analysis.miscellaneous.DisableGraphAttribute;
 import org.apache.lucene.index.IndexOptions;
 import org.apache.lucene.index.Term;
 import org.apache.lucene.queries.ExtendedCommonTermsQuery;
 import org.apache.lucene.search.BooleanClause;
 import org.apache.lucene.search.BooleanClause.Occur;
 import org.apache.lucene.search.BooleanQuery;
 import org.apache.lucene.search.BoostQuery;
-import org.apache.lucene.search.DisjunctionMaxQuery;
 import org.apache.lucene.search.FuzzyQuery;
 import org.apache.lucene.search.MultiPhraseQuery;
 import org.apache.lucene.search.MultiTermQuery;
@@ -283,7 +282,7 @@ public Query parse(Type type, String fieldName, Object value) throws IOException
                 if (commonTermsCutoff == null) {
                     query = builder.createBooleanQuery(field, value.toString(), occur);
                 } else {
-                    query = builder.createCommonTermsQuery(field, value.toString(), occur, occur, commonTermsCutoff, fieldType);
+                    query = builder.createCommonTermsQuery(field, value.toString(), occur, occur, commonTermsCutoff);
                 }
                 break;
             case PHRASE:
@@ -463,20 +462,23 @@ private Query toSpanQueryPrefix(SpanQuery query, float boost) {
             }
         }
 
-        public Query createCommonTermsQuery(String field, String queryText, Occur highFreqOccur, Occur lowFreqOccur, float
-            maxTermFrequency, MappedFieldType fieldType) {
+        public Query createCommonTermsQuery(String field, String queryText,
+                                            Occur highFreqOccur,
+                                            Occur lowFreqOccur,
+                                            float maxTermFrequency) {
             Query booleanQuery = createBooleanQuery(field, queryText, lowFreqOccur);
             if (booleanQuery != null && booleanQuery instanceof BooleanQuery) {
                 BooleanQuery bq = (BooleanQuery) booleanQuery;
-                return boolToExtendedCommonTermsQuery(bq, highFreqOccur, lowFreqOccur, maxTermFrequency, fieldType);
+                return boolToExtendedCommonTermsQuery(bq, highFreqOccur, lowFreqOccur, maxTermFrequency);
             }
             return booleanQuery;
         }
 
-        private Query boolToExtendedCommonTermsQuery(BooleanQuery bq, Occur highFreqOccur, Occur lowFreqOccur, float
-            maxTermFrequency, MappedFieldType fieldType) {
-            ExtendedCommonTermsQuery query = new ExtendedCommonTermsQuery(highFreqOccur, lowFreqOccur, maxTermFrequency,
-                fieldType);
+        private Query boolToExtendedCommonTermsQuery(BooleanQuery bq,
+                                                     Occur highFreqOccur,
+                                                     Occur lowFreqOccur,
+                                                     float maxTermFrequency) {
+            ExtendedCommonTermsQuery query = new ExtendedCommonTermsQuery(highFreqOccur, lowFreqOccur, maxTermFrequency);
             for (BooleanClause clause : bq.clauses()) {
                 if (!(clause.getQuery() instanceof TermQuery)) {
                     return bq;

server/src/main/java/org/elasticsearch/index/search/QueryStringQueryParser.java

@@ -272,17 +272,6 @@ private Map<String, Float> extractMultiFields(String field, boolean quoted) {
         }
     }
 
-    @Override
-    protected Query newTermQuery(Term term) {
-        if (currentFieldType != null) {
-            Query termQuery = currentFieldType.queryStringTermQuery(term);
-            if (termQuery != null) {
-                return termQuery;
-            }
-        }
-        return super.newTermQuery(term);
-    }
-
     @Override
     protected Query newMatchAllDocsQuery() {
         return Queries.newMatchAllQuery();