Remove QueryParseContext (#25486)

QueryParseContext is currently only used as a wrapper for an XContentParser, so
this change removes it entirely and changes the appropriate APIs that use it so
far to only accept a parser instead.

1 files changed, 2 insertions, 2 deletions

diff --git a/core/src/test/java/org/elasticsearch/search/collapse/CollapseBuilderTests.java b/core/src/test/java/org/elasticsearch/search/collapse/CollapseBuilderTests.java
index 07eef1a2f3..e4525ac3e9 100644
--- a/core/src/test/java/org/elasticsearch/search/collapse/CollapseBuilderTests.java
+++ b/core/src/test/java/org/elasticsearch/search/collapse/CollapseBuilderTests.java
@@ -39,7 +39,6 @@ import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.NumberFieldMapper;
 import org.elasticsearch.index.query.InnerHitBuilder;
 import org.elasticsearch.index.query.InnerHitBuilderTests;
-import org.elasticsearch.index.query.QueryParseContext;
 import org.elasticsearch.index.query.QueryShardContext;
 import org.elasticsearch.search.SearchContextException;
 import org.elasticsearch.search.SearchModule;
@@ -201,12 +200,13 @@ public class CollapseBuilderTests extends AbstractSerializingTestCase<CollapseBu
 
     @Override
     protected CollapseBuilder doParseInstance(XContentParser parser) throws IOException {
-        return CollapseBuilder.fromXContent(new QueryParseContext(parser));
+        return CollapseBuilder.fromXContent(parser);
     }
 
     /**
      * Rewrite this test to disable xcontent shuffling on the highlight builder
      */
+    @Override
     public void testFromXContent() throws IOException {
         for (int runs = 0; runs < NUMBER_OF_TEST_RUNS; runs++) {
             CollapseBuilder testInstance = createTestInstance();