3131import org .apache .lucene .search .IndexSearcher ;
3232import org .apache .lucene .search .Query ;
3333import org .apache .lucene .search .ScoreDoc ;
34- import org .apache .lucene .search .TopScoreDocCollector ;
34+ import org .apache .lucene .search .TopDocs ;
35+ import org .apache .lucene .search .TopScoreDocCollectorManager ;
3536import org .apache .lucene .store .Directory ;
3637import org .apache .lucene .store .MMapDirectory ;
3738import org .junit .jupiter .api .Test ;
@@ -88,13 +89,15 @@ void testAnalyzers() throws Exception {
8889
8990 IndexReader reader = DirectoryReader .open (index );
9091 IndexSearcher searcher = new IndexSearcher (reader );
91- TopScoreDocCollector collector = TopScoreDocCollector .create (hitsPerPage , hitsThreshold );
92- searcher .search (q , collector );
93- ScoreDoc [] hits = collector .topDocs ().scoreDocs ;
92+ TopScoreDocCollectorManager manager =
93+ new TopScoreDocCollectorManager (hitsPerPage , null , hitsThreshold , false );
94+
95+ TopDocs topDocs = searcher .search (q , manager );
96+ ScoreDoc [] hits = topDocs .scoreDocs ;
9497
9598 assertEquals (1 , hits .length , "Did not find 1 document?" );
96- assertEquals ("springframework" , searcher .doc (hits [0 ].doc ).get (field1 ));
97- assertEquals ("springsource" , searcher .doc (hits [0 ].doc ).get (field2 ));
99+ assertEquals ("springframework" , searcher .storedFields (). document (hits [0 ].doc ).get (field1 ));
100+ assertEquals ("springsource" , searcher .storedFields (). document (hits [0 ].doc ).get (field2 ));
98101
99102 querystr = "product:(Apache Struts) vendor:(Apache)" ;
100103
@@ -105,11 +108,11 @@ void testAnalyzers() throws Exception {
105108 querystr = "product:( x-stream^5 ) AND vendor:( thoughtworks.xstream )" ;
106109 reset (searchAnalyzerProduct , searchAnalyzerVendor );
107110 Query q3 = parser .parse (querystr );
108- collector = TopScoreDocCollector . create (hitsPerPage , hitsThreshold );
109- searcher .search (q3 , collector );
110- hits = collector . topDocs () .scoreDocs ;
111- assertEquals ("x-stream" , searcher .doc (hits [0 ].doc ).get (field1 ));
112- assertEquals ("xstream" , searcher .doc (hits [0 ].doc ).get (field2 ));
111+ manager = new TopScoreDocCollectorManager (hitsPerPage , null , hitsThreshold , false );
112+ topDocs = searcher .search (q3 , manager );
113+ hits = topDocs .scoreDocs ;
114+ assertEquals ("x-stream" , searcher .storedFields (). document (hits [0 ].doc ).get (field1 ));
115+ assertEquals ("xstream" , searcher .storedFields (). document (hits [0 ].doc ).get (field2 ));
113116 }
114117
115118 private IndexWriter createIndex (Analyzer analyzer , Directory index ) throws IOException {
0 commit comments