rebased + addressed comments

Author: alexksikes

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

@@ -283,8 +283,8 @@ public Query toQuery(QueryParseContext parseContext) throws QueryParsingExceptio
             }
         }
 
-        Occur highFreqOccur = highFreqOperator.toMustOrShouldClause();
-        Occur lowFreqOccur = lowFreqOperator.toMustOrShouldClause();
+        Occur highFreqOccur = highFreqOperator.toBooleanClauseOccur();
+        Occur lowFreqOccur = lowFreqOperator.toBooleanClauseOccur();
 
         ExtendedCommonTermsQuery commonsQuery = new ExtendedCommonTermsQuery(highFreqOccur, lowFreqOccur, cutoffFrequency, disableCoord, mapper);
         commonsQuery.setBoost(boost);
@@ -334,8 +334,8 @@ public QueryValidationException validate() {
     @Override
     public CommonTermsQueryBuilder readFrom(StreamInput in) throws IOException {
         CommonTermsQueryBuilder commonTermsQueryBuilder = new CommonTermsQueryBuilder(in.readString(), in.readGenericValue());
-        commonTermsQueryBuilder.highFreqOperator = Operator.readFrom(in);
-        commonTermsQueryBuilder.lowFreqOperator = Operator.readFrom(in);
+        commonTermsQueryBuilder.highFreqOperator = Operator.PROTOTYPE.readFrom(in);
+        commonTermsQueryBuilder.lowFreqOperator = Operator.PROTOTYPE.readFrom(in);
         commonTermsQueryBuilder.analyzer = in.readOptionalString();
         commonTermsQueryBuilder.boost = in.readFloat();
         commonTermsQueryBuilder.lowFreqMinimumShouldMatch = in.readOptionalString();

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

@@ -28,23 +28,26 @@
 import org.elasticsearch.common.io.stream.NamedWriteable;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
+import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.xcontent.ToXContent;
 import org.elasticsearch.common.xcontent.XContentType;
 
 import java.io.IOException;
 
 public interface QueryBuilder<QB extends QueryBuilder> extends NamedWriteable<QB>, ToXContent {
 
-    public static enum Operator {
+    public static enum Operator implements Writeable {
         OR(0), AND(1);
 
         private final int ordinal;
-        
+
+        static final Operator PROTOTYPE = OR;
+
         private Operator(int ordinal) {
             this.ordinal = ordinal;
         }
 
-        public BooleanClause.Occur toMustOrShouldClause() {
+        public BooleanClause.Occur toBooleanClauseOccur() {
             switch (this) {
                 case OR:
                     return BooleanClause.Occur.SHOULD;
@@ -55,7 +58,7 @@ public BooleanClause.Occur toMustOrShouldClause() {
             }
         }
 
-        public static Operator readFrom(StreamInput in) throws IOException {
+        public Operator readFrom(StreamInput in) throws IOException {
             int ord = in.readVInt();
             for (Operator operator : Operator.values()) {
                 if (operator.ordinal == ord) {

core/src/test/java/org/elasticsearch/index/query/CommonTermsQueryBuilderTest.java

@@ -23,7 +23,6 @@
 import org.apache.lucene.queries.ExtendedCommonTermsQuery;
 import org.apache.lucene.search.BooleanClause.Occur;
 import org.apache.lucene.search.Query;
-import org.elasticsearch.index.mapper.FieldMapper;
 import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.query.QueryBuilder.Operator;
 import org.junit.Test;
@@ -104,8 +103,8 @@ protected Query createExpectedQuery(CommonTermsQueryBuilder queryBuilder, QueryP
             analyzer = context.analysisService().analyzer(queryBuilder.analyzer());
         }
 
-        Occur highFreqOccur = queryBuilder.highFreqOperator().toMustOrShouldClause();
-        Occur lowFreqOccur = queryBuilder.lowFreqOperator().toMustOrShouldClause();
+        Occur highFreqOccur = queryBuilder.highFreqOperator().toBooleanClauseOccur();
+        Occur lowFreqOccur = queryBuilder.lowFreqOperator().toBooleanClauseOccur();
 
         ExtendedCommonTermsQuery expectedQuery = new ExtendedCommonTermsQuery(highFreqOccur, lowFreqOccur, queryBuilder.cutoffFrequency(), 
                 queryBuilder.disableCoord(), mapper);