Refactor Databasesearcher (#13183)

Author: palukku

jabkit/src/main/java/org/jabref/cli/Search.java

@@ -78,12 +78,12 @@ public void run() {
         List<BibEntry> matches;
         try {
             // extract current thread task executor from indexManager
-            matches = new DatabaseSearcher(searchQuery,
+            matches = new DatabaseSearcher(
                     databaseContext,
                     new CurrentThreadTaskExecutor(),
                     argumentProcessor.cliPreferences,
                     postgreServer
-            ).getMatches();
+            ).getMatches(searchQuery);
         } catch (IOException ex) {
             LOGGER.error("Error occurred when searching", ex);
             return;

jablib/src/main/java/org/jabref/logic/search/DatabaseSearcher.java

@@ -2,7 +2,6 @@
 
 import java.io.IOException;
 import java.util.List;
-import java.util.Objects;
 
 import org.jabref.logic.preferences.CliPreferences;
 import org.jabref.logic.util.TaskExecutor;
@@ -18,24 +17,20 @@ public class DatabaseSearcher {
     private static final Logger LOGGER = LoggerFactory.getLogger(DatabaseSearcher.class);
 
     private final BibDatabaseContext databaseContext;
-    private final SearchQuery query;
     private final IndexManager indexManager;
 
-    // TODO: get rid of task executor here or add a constructor overload?
-    public DatabaseSearcher(SearchQuery query,
-                            BibDatabaseContext databaseContext,
+    public DatabaseSearcher(BibDatabaseContext databaseContext,
                             TaskExecutor taskExecutor,
                             CliPreferences preferences,
                             PostgreServer postgreServer) throws IOException {
         this.databaseContext = databaseContext;
-        this.query = Objects.requireNonNull(query);
         this.indexManager = new IndexManager(databaseContext, taskExecutor, preferences, postgreServer);
     }
 
     /**
      * @return The matches in the order they appear in the library.
      */
-    public List<BibEntry> getMatches() {
+    public List<BibEntry> getMatches(SearchQuery query) {
         LOGGER.debug("Search term: {}", query);
 
         if (!query.isValid()) {

jablib/src/test/java/org/jabref/logic/search/DatabaseSearcherTest.java

@@ -67,7 +67,7 @@ void databaseSearcher(List<BibEntry> expectedMatches, SearchQuery query, List<Bi
         for (BibEntry entry : entries) {
             databaseContext.getDatabase().insertEntry(entry);
         }
-        List<BibEntry> matches = new DatabaseSearcher(query, databaseContext, TASK_EXECUTOR, preferences, postgreServer).getMatches();
+        List<BibEntry> matches = new DatabaseSearcher(databaseContext, TASK_EXECUTOR, preferences, postgreServer).getMatches(query);
         assertEquals(expectedMatches, matches);
     }
 

jablib/src/test/java/org/jabref/logic/search/DatabaseSearcherWithBibFilesTest.java

@@ -151,7 +151,7 @@ private static Stream<Arguments> searchLibrary() {
     void searchLibrary(List<BibEntry> expected, String testFile, String query, boolean isFullText) throws URISyntaxException, IOException {
         BibDatabaseContext databaseContext = initializeDatabaseFromPath(testFile);
         EnumSet<SearchFlags> flags = isFullText ? EnumSet.of(SearchFlags.FULLTEXT) : EnumSet.noneOf(SearchFlags.class);
-        List<BibEntry> matches = new DatabaseSearcher(new SearchQuery(query, flags), databaseContext, TASK_EXECUTOR, preferences, postgreServer).getMatches();
+        List<BibEntry> matches = new DatabaseSearcher(databaseContext, TASK_EXECUTOR, preferences, postgreServer).getMatches(new SearchQuery(query, flags));
         assertThat(expected, Matchers.containsInAnyOrder(matches.toArray()));
     }
 }