Completely move doXContent to super class.

Moves the doXContent method to the super class per suggestion from Christoph. Also fixes the validation unit test to check both, TermQueryBuilder and SpanTermQueryBuilder.

Author: Isabel Drost-Fromm

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

@@ -143,6 +143,7 @@ public float boost() {
 
     @Override
     protected void doXContent(XContentBuilder builder, Params params) throws IOException {
+        builder.startObject(parserName());
         Object valueToWrite = value;
         if (value instanceof BytesRef) {
             valueToWrite = ((BytesRef) value).utf8ToString();

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

@@ -24,11 +24,8 @@
 import org.apache.lucene.search.spans.SpanTermQuery;
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.common.lucene.BytesRefs;
-import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.index.mapper.MapperService;
 
-import java.io.IOException;
-
 /**
  * A Span Query that matches documents containing a term.
  * @see SpanTermQuery
@@ -77,13 +74,6 @@ public SpanTermQueryBuilder queryName(String queryName) {
         return this;
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public void doXContent(XContentBuilder builder, Params params) throws IOException {
-        builder.startObject(SpanTermQueryParser.NAME);
-        super.doXContent(builder, params);
-    }
-
     @Override
     protected String parserName() {
         return SpanTermQueryParser.NAME;

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

@@ -23,11 +23,8 @@
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.TermQuery;
 import org.elasticsearch.common.lucene.BytesRefs;
-import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.index.mapper.MapperService;
 
-import java.io.IOException;
-
 /**
  * A Query that matches documents containing a term.
  */
@@ -90,13 +87,6 @@ public TermQueryBuilder queryName(String queryName) {
         return this;
     }
 
-
-    @Override
-    public void doXContent(XContentBuilder builder, Params params) throws IOException {
-        builder.startObject(TermQueryParser.NAME);
-        super.doXContent(builder, params);
-    }
-
     @Override
     public Query toQuery(QueryParseContext parseContext) {
         Query query = null;

src/test/java/org/elasticsearch/index/query/BaseTermQueryTest.java

@@ -19,10 +19,7 @@
 
 package org.elasticsearch.index.query;
 
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.spans.SpanTermQuery;
 import org.elasticsearch.common.io.stream.Streamable;
-import org.elasticsearch.common.lucene.BytesRefs;
 import org.junit.Ignore;
 import org.junit.Test;
 
@@ -57,20 +54,23 @@ public Object createRandomValueObject() {
         return value;
     }
 
+    protected abstract BaseTermQueryBuilder getBuilderInstance(String fieldName, Object value);
+
     @Test
     public void testValidate() throws QueryParsingException, IOException {
-        TermQueryBuilder queryBuilder = new TermQueryBuilder("all", "good");
+        
+        BaseTermQueryBuilder queryBuilder = getBuilderInstance("all", "good");
         assertNull(queryBuilder.validate());
 
-        queryBuilder = new TermQueryBuilder(null, "Term");
+        queryBuilder = getBuilderInstance(null, "Term");
         assertNotNull(queryBuilder.validate());
         assertThat(queryBuilder.validate().validationErrors().size(), is(1));
 
-        queryBuilder = new TermQueryBuilder("", "Term");
+        queryBuilder = getBuilderInstance("", "Term");
         assertNotNull(queryBuilder.validate());
         assertThat(queryBuilder.validate().validationErrors().size(), is(1));
 
-        queryBuilder = new TermQueryBuilder("", null);
+        queryBuilder = getBuilderInstance("", null);
         assertNotNull(queryBuilder.validate());
         assertThat(queryBuilder.validate().validationErrors().size(), is(2));
     }

src/test/java/org/elasticsearch/index/query/SpanTermQueryBuilderTest.java

@@ -36,6 +36,11 @@ public class SpanTermQueryBuilderTest extends BaseTermQueryTest<SpanTermQueryBui
     protected SpanTermQueryBuilder createEmptyQueryBuilder() {
         return new SpanTermQueryBuilder();
     }
+    
+    @Override
+    protected BaseTermQueryBuilder getBuilderInstance(String fieldName, Object value) {
+        return new SpanTermQueryBuilder(fieldName, value);
+    }
 
     /** Returns a {@link SpanTermQueryBuilder} with random field name and value, optional random boost and queryname */
     protected SpanTermQueryBuilder createTestQueryBuilder() {

src/test/java/org/elasticsearch/index/query/TermQueryBuilderTest.java

@@ -37,6 +37,11 @@ protected TermQueryBuilder createEmptyQueryBuilder() {
         return new TermQueryBuilder();
     }
 
+    @Override
+    protected BaseTermQueryBuilder getBuilderInstance(String fieldName, Object value) {
+        return new TermQueryBuilder(fieldName, value);
+    }
+
     /** Returns a TermQuery with random field name and value, optional random boost and queryname. */
     protected TermQueryBuilder createTestQueryBuilder() {
         Object value = createRandomValueObject();
@@ -69,5 +74,4 @@ protected void assertLuceneQuery(TermQueryBuilder queryBuilder, Query query, Que
             }
         }
     }
-
 }