Apache Solr open-source search software
remove use of deprecated SolrIndexSearcher.search variant (#2662)
Christine Poerschke9d2387f1833b
diff --git a/solr/core/src/test/org/apache/solr/search/SolrIndexSearcherTest.java b/solr/core/src/test/org/apache/solr/search/SolrIndexSearcherTest.javaindex 49fcc21e45e..a5d8c819755 100644--- a/solr/core/src/test/org/apache/solr/search/SolrIndexSearcherTest.java+++ b/solr/core/src/test/org/apache/solr/search/SolrIndexSearcherTest.java@@ -120,16 +120,14 @@ public class SolrIndexSearcherTest extends SolrTestCaseJ4 {private void assertMatchesEqual(int expectedCount, SolrIndexSearcher searcher, QueryCommand cmd)throws IOException {- QueryResult qr = new QueryResult();- searcher.search(qr, cmd);+ QueryResult qr = searcher.search(cmd);assertEquals(expectedCount, qr.getDocList().matches());assertEquals(TotalHits.Relation.EQUAL_TO, qr.getDocList().hitCountRelation());}private QueryResult assertMatchesGreaterThan(int expectedCount, SolrIndexSearcher searcher, QueryCommand cmd) throws IOException {- QueryResult qr = new QueryResult();- searcher.search(qr, cmd);+ QueryResult qr = searcher.search(cmd);assertTrue("Expecting returned matches to be greater than "+ expectedCount@@ -182,7 +180,7 @@ public class SolrIndexSearcherTest extends SolrTestCaseJ4 {searcher -> {QueryCommand cmd = createBasicQueryCommand(NUM_DOCS / 2, 10, "field1_s", "foo");cmd.clearFlags(SolrIndexSearcher.NO_CHECK_QCACHE | SolrIndexSearcher.NO_SET_QCACHE);- searcher.search(new QueryResult(), cmd);+ searcher.search(cmd);assertMatchesGreaterThan(NUM_DOCS, searcher, cmd);return null;});@@ -194,7 +192,7 @@ public class SolrIndexSearcherTest extends SolrTestCaseJ4 {searcher -> {QueryCommand cmd = createBasicQueryCommand(NUM_DOCS, 2, "field1_s", "foo");cmd.clearFlags(SolrIndexSearcher.NO_CHECK_QCACHE | SolrIndexSearcher.NO_SET_QCACHE);- searcher.search(new QueryResult(), cmd);+ searcher.search(cmd);assertMatchesEqual(NUM_DOCS, searcher, cmd);return null;});@@ -278,8 +276,7 @@ public class SolrIndexSearcherTest extends SolrTestCaseJ4 {cmd.setQuery(new FixedScoreReRankQuery(cmd.getQuery(), expectedScore));}- final QueryResult qr = new QueryResult();- searcher.search(qr, cmd);+ final QueryResult qr = searcher.search(cmd);// check score for the first documentfinal DocIterator iter = qr.getDocList().iterator();diff --git a/solr/core/src/test/org/apache/solr/search/TestFiltering.java b/solr/core/src/test/org/apache/solr/search/TestFiltering.javaindex 5d9ad6bb9da..e92cc11beea 100644--- a/solr/core/src/test/org/apache/solr/search/TestFiltering.java+++ b/solr/core/src/test/org/apache/solr/search/TestFiltering.java@@ -89,15 +89,13 @@ public class TestFiltering extends SolrTestCaseJ4 {cmd.setQuery(QParser.getParser(qstr, null, req).getQuery());cmd.setLen(random().nextInt(30));cmd.setNeedDocSet(true);- QueryResult res = new QueryResult();- searcher.search(res, cmd);+ QueryResult res = searcher.search(cmd);set = res.getDocSet();assertSame(set, live);cmd.setQuery(QParser.getParser(qstr + " OR id:0", null, req).getQuery());cmd.setFilterList(QParser.getParser(qstr + " OR id:1", null, req).getQuery());- res = new QueryResult();- searcher.search(res, cmd);+ res = searcher.search(cmd);set = res.getDocSet();assertSame(set, live);}