Renaming prototype constants, moving them from parser to builder class and removing package private constructors

Author: cbuescher

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

@@ -39,6 +39,8 @@ public class AndQueryBuilder extends QueryBuilder {
 
     private String queryName;
 
+    static final AndQueryBuilder PROTOTYPE = new AndQueryBuilder();
+
     public AndQueryBuilder(QueryBuilder... filters) {
         for (QueryBuilder filter : filters) {
             this.filters.add(filter);

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

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

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

@@ -51,6 +51,8 @@ public class BoolQueryBuilder extends QueryBuilder implements BoostableQueryBuil
 
     private String queryName;
 
+    static final BoolQueryBuilder PROTOTYPE = new BoolQueryBuilder();
+
     /**
      * Adds a query that <b>must</b> appear in the matching documents and will
      * contribute to scoring.

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

@@ -39,8 +39,6 @@
  */
 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())));
@@ -176,6 +174,6 @@ public Query parse(QueryParseContext parseContext) throws IOException, QueryPars
 
     @Override
     public BoolQueryBuilder getBuilderPrototype() {
-        return BOOL_QUERY_BUILDER;
+        return BoolQueryBuilder.PROTOTYPE;
     }
 }

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

@@ -47,6 +47,8 @@ public class BoostingQueryBuilder extends QueryBuilder implements BoostableQuery
 
     private float boost = -1;
 
+    static final BoostingQueryBuilder PROTOTYPE = new BoostingQueryBuilder();
+
     public BoostingQueryBuilder() {
     }
 

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

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

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

@@ -72,6 +72,8 @@ public static enum Operator {
 
     private String queryName;
 
+    static final CommonTermsQueryBuilder PROTOTYPE = new CommonTermsQueryBuilder(null, null);
+
     /**
      * Constructs a new common terms query.
      */
@@ -86,14 +88,6 @@ 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,8 +39,6 @@
  */
 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;
@@ -224,6 +222,6 @@ private final Query parseQueryString(ExtendedCommonTermsQuery query, String quer
 
     @Override
     public CommonTermsQueryBuilder getBuilderPrototype() {
-        return COMMON_TERMS_QUERY_BUILDER;
+        return CommonTermsQueryBuilder.PROTOTYPE;
     }
 }

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

@@ -37,6 +37,8 @@ public class ConstantScoreQueryBuilder extends QueryBuilder implements Boostable
 
     private float boost = -1;
 
+    static final ConstantScoreQueryBuilder PROTOTYPE = new ConstantScoreQueryBuilder(null);
+
     /**
      * A query that wraps a query and simply returns a constant score equal to the
      * query boost for every document in the query.
@@ -47,13 +49,6 @@ 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,7 +33,6 @@
  */
 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
@@ -90,6 +89,6 @@ public Query parse(QueryParseContext parseContext) throws IOException, QueryPars
 
     @Override
     public ConstantScoreQueryBuilder getBuilderPrototype() {
-        return CONSTANT_SCORE_QUERY_BUILDER;
+        return ConstantScoreQueryBuilder.PROTOTYPE;
     }
 }