Make MultiTermQueryBuilder an interface again

This PR is against the query-refactoring branch.

Closes #12074

Author: alexksikes

core/src/main/java/org/elasticsearch/index/query/FuzzyQueryBuilder.java

@@ -27,7 +27,7 @@
 /**
  * A Query that does fuzzy matching for a specific value.
  */
-public class FuzzyQueryBuilder extends MultiTermQueryBuilder {
+public class FuzzyQueryBuilder extends AbstractQueryBuilder<FuzzyQueryBuilder> implements MultiTermQueryBuilder<FuzzyQueryBuilder> {
 
     public static final String NAME = "fuzzy";
 

core/src/main/java/org/elasticsearch/index/query/MultiTermQueryBuilder.java

@@ -18,6 +18,6 @@
  */
 package org.elasticsearch.index.query;
 
-public abstract class MultiTermQueryBuilder<QB extends MultiTermQueryBuilder<QB>> extends AbstractQueryBuilder<QB> {
+public interface MultiTermQueryBuilder<QB extends MultiTermQueryBuilder<QB>> extends QueryBuilder<QB> {
 
 }

core/src/main/java/org/elasticsearch/index/query/PrefixQueryBuilder.java

@@ -26,7 +26,7 @@
 /**
  * A Query that matches documents containing terms with a specified prefix.
  */
-public class PrefixQueryBuilder extends MultiTermQueryBuilder {
+public class PrefixQueryBuilder extends AbstractQueryBuilder<PrefixQueryBuilder> implements MultiTermQueryBuilder<PrefixQueryBuilder> {
 
     public static final String NAME = "prefix";
 

core/src/main/java/org/elasticsearch/index/query/RangeQueryBuilder.java

@@ -38,7 +38,7 @@
 /**
  * A Query that matches documents within an range of terms.
  */
-public class RangeQueryBuilder extends MultiTermQueryBuilder<RangeQueryBuilder> {
+public class RangeQueryBuilder extends AbstractQueryBuilder<RangeQueryBuilder> implements MultiTermQueryBuilder<RangeQueryBuilder> {
 
     public static final boolean DEFAULT_INCLUDE_UPPER = true;
 

core/src/main/java/org/elasticsearch/index/query/RegexpQueryBuilder.java

@@ -27,7 +27,7 @@
 /**
  * A Query that does fuzzy matching for a specific value.
  */
-public class RegexpQueryBuilder extends MultiTermQueryBuilder {
+public class RegexpQueryBuilder extends AbstractQueryBuilder<RegexpQueryBuilder> implements MultiTermQueryBuilder<RegexpQueryBuilder> {
 
     public static final String NAME = "regexp";
     private final String name;

core/src/main/java/org/elasticsearch/index/query/WildcardQueryBuilder.java

@@ -31,7 +31,7 @@
  * a Wildcard term should not start with one of the wildcards <tt>*</tt> or
  * <tt>?</tt>.
  */
-public class WildcardQueryBuilder extends MultiTermQueryBuilder {
+public class WildcardQueryBuilder extends AbstractQueryBuilder<WildcardQueryBuilder> implements MultiTermQueryBuilder<WildcardQueryBuilder> {
 
     public static final String NAME = "wildcard";