Patched search being static.

Author: jerryzhu509

src/main/java/org/hydev/mcpm/client/search/SearchInteractor.java

@@ -44,6 +44,7 @@ public SearchInteractor(DatabaseFetcher fetcher, DatabaseFetcherListener listene
     @Override
     public SearchPackagesResult search(SearchPackagesInput input) {
         var database = fetcher.fetchDatabase(!input.noCache(), listener);
+        var factory = new SearcherFactory();
 
         if (database == null) {
             return SearchPackagesResult.by(SearchPackagesResult.State.FAILED_TO_FETCH_DATABASE);
@@ -56,6 +57,6 @@ public SearchPackagesResult search(SearchPackagesInput input) {
         var plugins = database.plugins();
 
         return new SearchPackagesResult(SearchPackagesResult.State.SUCCESS,
-                SearcherFactory.createSearcher(input).getSearchList(searchStr, plugins));
+                factory.createSearcher(input).getSearchList(searchStr, plugins));
     }
 }

src/main/java/org/hydev/mcpm/client/search/SearcherByCommand.java

@@ -13,7 +13,7 @@
  */
 public class SearcherByCommand implements Searcher {
 
-    private static Map<String, List<PluginModel>> commandMap = null;
+    private Map<String, List<PluginModel>> commandMap = null;
 
     /**
      * Returns a dictionary mapping the different commands to the matching plugins.
@@ -52,9 +52,9 @@ public Map<String, List<PluginModel>> constructSearchMaps(List<PluginModel> plug
     @Override
     public List<PluginModel> getSearchList(String inp, List<PluginModel> plugins) {
         // Instantiate if null
-        if (SearcherByCommand.commandMap == null) {
-            SearcherByCommand.commandMap = constructSearchMaps(plugins);
+        if (commandMap == null) {
+            commandMap = constructSearchMaps(plugins);
         }
-        return SearcherByCommand.commandMap.getOrDefault(inp, List.of());
+        return commandMap.getOrDefault(inp, List.of());
     }
 }

src/main/java/org/hydev/mcpm/client/search/SearcherByKeyword.java

@@ -15,7 +15,7 @@
  */
 public class SearcherByKeyword implements Searcher {
 
-    private static Map<String, List<PluginModel>> keywordMap = null;
+    private Map<String, List<PluginModel>> keywordMap = null;
 
     /**
      * Returns a dictionary mapping the different keywords to the matching plugins
@@ -59,13 +59,13 @@ public Map<String, List<PluginModel>> constructSearchMaps(List<PluginModel> plug
     public List<PluginModel> getSearchList(String inp, List<PluginModel> plugins) {
 
         // Instantiate if null
-        if (SearcherByKeyword.keywordMap == null) {
-            SearcherByKeyword.keywordMap = constructSearchMaps(plugins);
+        if (keywordMap == null) {
+            keywordMap = constructSearchMaps(plugins);
         }
         String [] keywords = inp.split(" "); // Should be a string
-        Set<PluginModel> res = new HashSet<>(SearcherByKeyword.keywordMap.getOrDefault(keywords[0], List.of()));
+        Set<PluginModel> res = new HashSet<>(keywordMap.getOrDefault(keywords[0], List.of()));
         for (int i = 1; i < keywords.length; i++) {
-            List<PluginModel> pl = SearcherByKeyword.keywordMap.getOrDefault(keywords[i], List.of());
+            List<PluginModel> pl = keywordMap.getOrDefault(keywords[i], List.of());
             res.retainAll(pl);
             if (res.isEmpty())
                 return List.of();

src/main/java/org/hydev/mcpm/client/search/SearcherByName.java

@@ -13,7 +13,7 @@
  */
 public class SearcherByName implements Searcher {
 
-    private static Map<String, List<PluginModel>> nameMap = null;
+    private Map<String, List<PluginModel>> nameMap = null;
 
     /**
      * Returns a dictionary mapping the different names to the matching plugins.
@@ -50,9 +50,9 @@ public Map<String, List<PluginModel>> constructSearchMaps(List<PluginModel> plug
     @Override
     public List<PluginModel> getSearchList(String inp, List<PluginModel> plugins) {
         // Instantiate if null
-        if (SearcherByName.nameMap == null) {
-            SearcherByName.nameMap = constructSearchMaps(plugins);
+        if (nameMap == null) {
+            nameMap = constructSearchMaps(plugins);
         }
-        return SearcherByName.nameMap.getOrDefault(inp, List.of());
+        return nameMap.getOrDefault(inp, List.of());
     }
 }

src/main/java/org/hydev/mcpm/client/search/SearcherFactory.java

@@ -5,23 +5,33 @@
  *
  */
 public class SearcherFactory {
+    SearcherByName nameSearcher;
+    SearcherByKeyword keywordSearcher;
+    SearcherByCommand commandSearcher;
 
     /**
      * Returns the new searcher object based on the input type.
      *
      * @param input Contains the search type in particular. See SearchPackagesInput for details.
      */
-    public static Searcher createSearcher(SearchPackagesInput input) {
-        return switch (input.type()) {
-            case BY_NAME ->
-                    new SearcherByName();
-
-            case BY_COMMAND ->
-                    new SearcherByCommand();
-
-            case BY_KEYWORD ->
-                    new SearcherByKeyword();
-
-        };
+    public Searcher createSearcher(SearchPackagesInput input) {
+        switch (input.type()) {
+            case BY_NAME -> {
+                if (nameSearcher == null)
+                    nameSearcher = new SearcherByName();
+                return nameSearcher;
+            }
+            case BY_COMMAND -> {
+                if (commandSearcher == null)
+                    commandSearcher = new SearcherByCommand();
+                return commandSearcher;
+            }
+            case BY_KEYWORD -> {
+                if (keywordSearcher == null)
+                    keywordSearcher = new SearcherByKeyword();
+                return keywordSearcher;
+            }
+        }
+        return nameSearcher;
     }
 }