Query Refactoring: Moving parser NAME constant to corresponding query builder

As part of the query refactoring, this PR moves the NAME field that currently identifies each query parser to the
corresponding query builder. The reason for this, as discussed in elastic#11121 (comment), is that we need still need to
be able to link parser and builder implementations, but that the query builder is independent of the parser (queries
don't necessarily need to be coverted to XContent any more). Builders don't need to know about their parsers, but
parsers need to be linked to their respective builders.

Closes elastic#11178

Author: cbuescher

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

@@ -20,6 +20,7 @@
 package org.elasticsearch.index.query;
 
 import com.google.common.collect.Lists;
+
 import org.elasticsearch.common.xcontent.XContentBuilder;
 
 import java.io.IOException;
@@ -32,6 +33,8 @@
 @Deprecated
 public class AndQueryBuilder extends QueryBuilder {
 
+    public static final String NAME = "and";
+
     private ArrayList<QueryBuilder> filters = Lists.newArrayList();
 
     private String queryName;
@@ -60,7 +63,7 @@ public AndQueryBuilder queryName(String queryName) {
 
     @Override
     protected void doXContent(XContentBuilder builder, Params params) throws IOException {
-        builder.startObject(AndQueryParser.NAME);
+        builder.startObject(NAME);
         builder.startArray("filters");
         for (QueryBuilder filter : filters) {
             filter.toXContent(builder, params);
@@ -73,7 +76,7 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep
     }
 
     @Override
-    protected String parserName() {
-        return AndQueryParser.NAME;
+    public String queryId() {
+        return NAME;
     }
 }

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

@@ -36,15 +36,13 @@
 @Deprecated
 public class AndQueryParser extends BaseQueryParserTemp {
 
-    public static final String NAME = "and";
-
     @Inject
     public AndQueryParser() {
     }
 
     @Override
     public String[] names() {
-        return new String[]{NAME};
+        return new String[]{AndQueryBuilder.NAME};
     }
 
     @Override

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

@@ -28,7 +28,7 @@
 import java.util.Objects;
 
 public abstract class BaseTermQueryBuilder<QB extends BaseTermQueryBuilder<QB>> extends QueryBuilder<QB> implements BoostableQueryBuilder<QB> {
-    
+
     /** Name of field to match against. */
     protected final String fieldName;
 
@@ -158,7 +158,7 @@ public QB boost(float boost) {
 
     @Override
     protected void doXContent(XContentBuilder builder, Params params) throws IOException {
-        builder.startObject(parserName());
+        builder.startObject(queryId());
         if (boost == 1.0f && queryName == null) {
             builder.field(fieldName, convertToStringIfBytesRef(this.value));
         } else {

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

@@ -31,6 +31,8 @@
  */
 public class BoolQueryBuilder extends QueryBuilder implements BoostableQueryBuilder<BoolQueryBuilder> {
 
+    public static final String NAME = "bool";
+
     private final List<QueryBuilder> mustClauses = new ArrayList<>();
 
     private final List<QueryBuilder> mustNotClauses = new ArrayList<>();
@@ -160,7 +162,7 @@ public BoolQueryBuilder queryName(String queryName) {
 
     @Override
     protected void doXContent(XContentBuilder builder, Params params) throws IOException {
-        builder.startObject("bool");
+        builder.startObject(NAME);
         doXArrayContent("must", mustClauses, builder, params);
         doXArrayContent("filter", filterClauses, builder, params);
         doXArrayContent("must_not", mustNotClauses, builder, params);
@@ -200,7 +202,7 @@ private void doXArrayContent(String field, List<QueryBuilder> clauses, XContentB
     }
 
     @Override
-    protected String parserName() {
-        return BoolQueryParser.NAME;
+    public String queryId() {
+        return NAME;
     }
 }

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

@@ -39,16 +39,14 @@
  */
 public class BoolQueryParser extends BaseQueryParserTemp {
 
-    public static final String NAME = "bool";
-
     @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())));
     }
 
     @Override
     public String[] names() {
-        return new String[]{NAME};
+        return new String[]{BoolQueryBuilder.NAME};
     }
 
     @Override

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

@@ -37,6 +37,8 @@
  */
 public class BoostingQueryBuilder extends QueryBuilder implements BoostableQueryBuilder<BoostingQueryBuilder> {
 
+    public static final String NAME = "boosting";
+
     private QueryBuilder positiveQuery;
 
     private QueryBuilder negativeQuery;
@@ -81,7 +83,7 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep
         if (negativeBoost == -1) {
             throw new IllegalArgumentException("boosting query requires negativeBoost to be set");
         }
-        builder.startObject(BoostingQueryParser.NAME);
+        builder.startObject(NAME);
         builder.field("positive");
         positiveQuery.toXContent(builder, params);
         builder.field("negative");
@@ -96,7 +98,7 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep
     }
 
     @Override
-    protected String parserName() {
-        return BoostingQueryParser.NAME;
+    public String queryId() {
+        return NAME;
     }
 }

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

@@ -31,15 +31,13 @@
  */
 public class BoostingQueryParser extends BaseQueryParserTemp {
 
-    public static final String NAME = "boosting";
-
     @Inject
     public BoostingQueryParser() {
     }
 
     @Override
     public String[] names() {
-        return new String[]{NAME};
+        return new String[]{BoostingQueryBuilder.NAME};
     }
 
     @Override

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

@@ -44,6 +44,8 @@
  */
 public class CommonTermsQueryBuilder extends QueryBuilder implements BoostableQueryBuilder<CommonTermsQueryBuilder> {
 
+    public static final String NAME = "common";
+
     public static enum Operator {
         OR, AND
     }
@@ -161,7 +163,7 @@ public CommonTermsQueryBuilder queryName(String queryName) {
 
     @Override
     public void doXContent(XContentBuilder builder, Params params) throws IOException {
-        builder.startObject(CommonTermsQueryParser.NAME);
+        builder.startObject(NAME);
         builder.startObject(name);
 
         builder.field("query", text);
@@ -202,7 +204,7 @@ public void doXContent(XContentBuilder builder, Params params) throws IOExceptio
     }
 
     @Override
-    protected String parserName() {
-        return CommonTermsQueryParser.NAME;
+    public String queryId() {
+        return NAME;
     }
 }

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

@@ -39,8 +39,6 @@
  */
 public class CommonTermsQueryParser extends BaseQueryParserTemp {
 
-    public static final String NAME = "common";
-
     static final float DEFAULT_MAX_TERM_DOC_FREQ = 0.01f;
 
     static final Occur DEFAULT_HIGH_FREQ_OCCUR = Occur.SHOULD;
@@ -56,7 +54,7 @@ public CommonTermsQueryParser() {
 
     @Override
     public String[] names() {
-        return new String[] { NAME };
+        return new String[] { CommonTermsQueryBuilder.NAME };
     }
 
     @Override

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

@@ -31,6 +31,8 @@
  */
 public class ConstantScoreQueryBuilder extends QueryBuilder implements BoostableQueryBuilder<ConstantScoreQueryBuilder> {
 
+    public static final String NAME = "constant_score";
+
     private final QueryBuilder filterBuilder;
 
     private float boost = -1;
@@ -57,7 +59,7 @@ public ConstantScoreQueryBuilder boost(float boost) {
 
     @Override
     protected void doXContent(XContentBuilder builder, Params params) throws IOException {
-        builder.startObject(ConstantScoreQueryParser.NAME);
+        builder.startObject(NAME);
         builder.field("filter");
         filterBuilder.toXContent(builder, params);
 
@@ -68,7 +70,7 @@ protected void doXContent(XContentBuilder builder, Params params) throws IOExcep
     }
 
     @Override
-    protected String parserName() {
-        return ConstantScoreQueryParser.NAME;
+    public String queryId() {
+        return NAME;
     }
 }