Cleaning up use of generics.

Author: Isabel Drost-Fromm

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

@@ -64,8 +64,8 @@
 public abstract class BaseQueryTestCase<QB extends BaseQueryBuilder & Streamable> extends ElasticsearchTestCase {
 
     private static Injector injector;
-    protected static IndexQueryParserService queryParserService;
-    protected static Index index;
+    private static IndexQueryParserService queryParserService;
+    private static Index index;
 
     protected QB testQuery = createTestQueryBuilder();
 

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

@@ -54,12 +54,12 @@ public Object createRandomValueObject() {
         return value;
     }
 
-    protected abstract BaseTermQueryBuilder getBuilderInstance(String fieldName, Object value);
+    protected abstract QB getBuilderInstance(String fieldName, Object value);
 
     @Test
     public void testValidate() throws QueryParsingException, IOException {
 
-        BaseTermQueryBuilder queryBuilder = getBuilderInstance("all", "good");
+        QB queryBuilder = getBuilderInstance("all", "good");
         assertNull(queryBuilder.validate());
 
         queryBuilder = getBuilderInstance(null, "Term");

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

@@ -38,7 +38,7 @@ protected SpanTermQueryBuilder createEmptyQueryBuilder() {
     }
 
     @Override
-    protected BaseTermQueryBuilder getBuilderInstance(String fieldName, Object value) {
+    protected SpanTermQueryBuilder getBuilderInstance(String fieldName, Object value) {
         return new SpanTermQueryBuilder(fieldName, value);
     }
 

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

@@ -38,7 +38,7 @@ protected TermQueryBuilder createEmptyQueryBuilder() {
     }
 
     @Override
-    protected BaseTermQueryBuilder getBuilderInstance(String fieldName, Object value) {
+    protected TermQueryBuilder getBuilderInstance(String fieldName, Object value) {
         return new TermQueryBuilder(fieldName, value);
     }