remove searchengine

Author: theScrabi

extractor/src/main/java/org/schabi/newpipe/extractor/ListInfo.java

@@ -1,16 +1,14 @@
 package org.schabi.newpipe.extractor;
 
-import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.uih.ListUIHandler;
 
-import java.util.ArrayList;
 import java.util.List;
 
 public abstract class ListInfo<T extends InfoItem> extends Info {
     private List<T> relatedItems;
     private String nextPageUrl = null;
-    private List<String> contentFilters = new ArrayList<>();
-    private String sortFilter = "";
+    private final List<String> contentFilters;
+    private final String sortFilter;
 
     public ListInfo(int serviceId,
                     String id,
@@ -24,7 +22,7 @@ public ListInfo(int serviceId,
         this.sortFilter = sortFilter;
     }
 
-    public ListInfo(int serviceId, ListUIHandler listUrlIdHandler, String name) throws ParsingException {
+    public ListInfo(int serviceId, ListUIHandler listUrlIdHandler, String name) {
         super(serviceId, listUrlIdHandler, name);
         this.contentFilters = listUrlIdHandler.getContentFilters();
         this.sortFilter = listUrlIdHandler.getSortFilter();

extractor/src/main/java/org/schabi/newpipe/extractor/playlist/PlaylistInfo.java

@@ -15,7 +15,7 @@
 
 public class PlaylistInfo extends ListInfo<StreamInfoItem> {
 
-    public PlaylistInfo(int serviceId, ListUIHandler urlIdHandler, String name) throws ParsingException {
+    private PlaylistInfo(int serviceId, ListUIHandler urlIdHandler, String name) throws ParsingException {
         super(serviceId, urlIdHandler, name);
     }
 

extractor/src/main/java/org/schabi/newpipe/extractor/search/SearchEngine.java

@@ -2,21 +2,19 @@
 
 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.ListInfo;
-import org.schabi.newpipe.extractor.uih.ListUIHFactory;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
-import org.schabi.newpipe.extractor.uih.ListUIHandler;
+import org.schabi.newpipe.extractor.uih.SearchQIHandler;
 
 public class SearchInfo extends ListInfo<InfoItem> {
 
-    private String searchString = "";
-    private String searchSuggestion = "";
-
+    private String searchString;
+    private String searchSuggestion;
 
     public SearchInfo(int serviceId,
-                      ListUIHandler urlIdHandler,
+                      SearchQIHandler qIHandler,
                       String searchString) throws ParsingException {
-        super(serviceId, urlIdHandler, "Search");
+        super(serviceId, qIHandler, "Search");
         this.searchString = searchString;
     }
 

extractor/src/main/java/org/schabi/newpipe/extractor/search/SearchInfo.java

@@ -8,7 +8,6 @@
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.search.InfoItemsSearchCollector;
-import org.schabi.newpipe.extractor.search.SearchEngine;
 import org.schabi.newpipe.extractor.search.SearchExtractor;
 import org.schabi.newpipe.extractor.uih.SearchQIHandler;
 import org.schabi.newpipe.extractor.utils.Parser;
@@ -70,7 +69,7 @@ public void onFetchPage(@Nonnull Downloader downloader) throws IOException, Extr
         }
 
         if (searchCollection.size() == 0) {
-            throw new SearchEngine.NothingFoundException("Nothing found");
+            throw new SearchExtractor.NothingFoundException("Nothing found");
         }
     }