Adding getBuilderPrototype() method to all QueryParsers

Author: cbuescher

src/main/java/org/elasticsearch/index/query/AndQueryParser.java

@@ -36,6 +36,8 @@
 @Deprecated
 public class AndQueryParser extends BaseQueryParserTemp {
 
+    private static final AndQueryBuilder AND_QUERY_BUILDER = new AndQueryBuilder();
+
     @Inject
     public AndQueryParser() {
     }
@@ -115,4 +117,9 @@ public Query parse(QueryParseContext parseContext) throws IOException, QueryPars
         }
         return query;
     }
+
+    @Override
+    public AndQueryBuilder getBuilderPrototype() {
+        return AND_QUERY_BUILDER;
+    }
 }

src/main/java/org/elasticsearch/index/query/BoolQueryParser.java

@@ -39,6 +39,8 @@
  */
 public class BoolQueryParser extends BaseQueryParserTemp {
 
+    private static final BoolQueryBuilder BOOL_QUERY_BUILDER = new BoolQueryBuilder();
+
     @Inject
     public BoolQueryParser(Settings settings) {
         BooleanQuery.setMaxClauseCount(settings.getAsInt("index.query.bool.max_clause_count", settings.getAsInt("indices.query.bool.max_clause_count", BooleanQuery.getMaxClauseCount())));
@@ -171,4 +173,9 @@ public Query parse(QueryParseContext parseContext) throws IOException, QueryPars
         }
         return query;
     }
+
+    @Override
+    public BoolQueryBuilder getBuilderPrototype() {
+        return BOOL_QUERY_BUILDER;
+    }
 }

src/main/java/org/elasticsearch/index/query/BoostingQueryBuilder.java

@@ -48,7 +48,6 @@ public class BoostingQueryBuilder extends QueryBuilder implements BoostableQuery
     private float boost = -1;
 
     public BoostingQueryBuilder() {
-
     }
 
     public BoostingQueryBuilder positive(QueryBuilder positiveQuery) {

src/main/java/org/elasticsearch/index/query/BoostingQueryParser.java

@@ -31,6 +31,8 @@
  */
 public class BoostingQueryParser extends BaseQueryParserTemp {
 
+    private static final BoostingQueryBuilder BOOSTING_QUERY_BUILDER = new BoostingQueryBuilder();
+
     @Inject
     public BoostingQueryParser() {
     }
@@ -98,4 +100,9 @@ public Query parse(QueryParseContext parseContext) throws IOException, QueryPars
         }
         return boostingQuery;
     }
+
+    @Override
+    public BoostingQueryBuilder getBuilderPrototype() {
+        return BOOSTING_QUERY_BUILDER;
+    }
 }

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

@@ -86,6 +86,14 @@ public CommonTermsQueryBuilder(String name, Object text) {
         this.name = name;
     }
 
+    /**
+     * package private constructor used for serialization only
+     */
+    CommonTermsQueryBuilder() {
+        this.name = null;
+        this.text = null;
+    }
+
     /**
      * Sets the operator to use for terms with a high document frequency
      * (greater than or equal to {@link #cutoffFrequency(float)}. Defaults to

src/main/java/org/elasticsearch/index/query/CommonTermsQueryParser.java

@@ -39,6 +39,8 @@
  */
 public class CommonTermsQueryParser extends BaseQueryParserTemp {
 
+    private static final CommonTermsQueryBuilder COMMON_TERMS_QUERY_BUILDER = new CommonTermsQueryBuilder();
+
     static final float DEFAULT_MAX_TERM_DOC_FREQ = 0.01f;
 
     static final Occur DEFAULT_HIGH_FREQ_OCCUR = Occur.SHOULD;
@@ -219,4 +221,9 @@ private final Query parseQueryString(ExtendedCommonTermsQuery query, String quer
         query.setHighFreqMinimumNumberShouldMatch(highFreqMinimumShouldMatch);
         return query;
     }
+
+    @Override
+    public CommonTermsQueryBuilder getBuilderPrototype() {
+        return COMMON_TERMS_QUERY_BUILDER;
+    }
 }

src/main/java/org/elasticsearch/index/query/ConstantScoreQueryBuilder.java

@@ -47,6 +47,13 @@ public ConstantScoreQueryBuilder(QueryBuilder filterBuilder) {
         this.filterBuilder = Objects.requireNonNull(filterBuilder);
     }
 
+    /**
+     * package private constructor used for serialization
+     */
+    ConstantScoreQueryBuilder() {
+        this.filterBuilder = null;
+    }
+
     /**
      * Sets the boost for this query.  Documents matching this query will (in addition to the normal
      * weightings) have their score multiplied by the boost provided.

src/main/java/org/elasticsearch/index/query/ConstantScoreQueryParser.java

@@ -33,6 +33,7 @@
  */
 public class ConstantScoreQueryParser extends BaseQueryParserTemp {
 
+    private static final ConstantScoreQueryBuilder CONSTANT_SCORE_QUERY_BUILDER = new ConstantScoreQueryBuilder();
     private static final ParseField INNER_QUERY_FIELD = new ParseField("filter", "query");
 
     @Inject
@@ -86,4 +87,9 @@ public Query parse(QueryParseContext parseContext) throws IOException, QueryPars
         filter.setBoost(boost);
         return filter;
     }
+
+    @Override
+    public ConstantScoreQueryBuilder getBuilderPrototype() {
+        return CONSTANT_SCORE_QUERY_BUILDER;
+    }
 }

src/main/java/org/elasticsearch/index/query/DisMaxQueryParser.java

@@ -35,6 +35,8 @@
  */
 public class DisMaxQueryParser extends BaseQueryParserTemp {
 
+    private static final DisMaxQueryBuilder DIS_MAX_QUERY_BUILDER = new DisMaxQueryBuilder();
+
     @Inject
     public DisMaxQueryParser() {
     }
@@ -111,4 +113,9 @@ public Query parse(QueryParseContext parseContext) throws IOException, QueryPars
         }
         return query;
     }
+
+    @Override
+    public DisMaxQueryBuilder getBuilderPrototype() {
+        return DIS_MAX_QUERY_BUILDER;
+    }
 }

src/main/java/org/elasticsearch/index/query/ExistsQueryBuilder.java

@@ -38,6 +38,12 @@ public ExistsQueryBuilder(String name) {
         this.name = name;
     }
 
+    /**
+     * package private constructor used for serialization
+     */
+    ExistsQueryBuilder() {
+    }
+
     /**
      * Sets the query name for the query that can be used when searching for matched_queries per hit.
      */