searchfilters: annotate changed method signatures with Nullable or Nonnull

Annotate methods in classes that got some signatures changed due to the
searchfilters integration

Author: evermind-zz

extractor/src/main/java/org/schabi/newpipe/extractor/linkhandler/ListLinkHandlerFactory.java

@@ -7,15 +7,18 @@
 import java.util.List;
 import java.util.Objects;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 public abstract class ListLinkHandlerFactory extends LinkHandlerFactory {
 
     ///////////////////////////////////
     // To Override
     ///////////////////////////////////
 
     public abstract String getUrl(String id,
-                                  List<FilterItem> contentFilter,
-                                  List<FilterItem> sortFilter)
+                                  @Nonnull List<FilterItem> contentFilter,
+                                  @Nullable List<FilterItem> sortFilter)
             throws ParsingException, UnsupportedOperationException;
 
     public String getUrl(final String id,

extractor/src/main/java/org/schabi/newpipe/extractor/linkhandler/SearchQueryHandlerFactory.java

@@ -5,9 +5,11 @@
 import org.schabi.newpipe.extractor.search.filter.FilterContainer;
 import org.schabi.newpipe.extractor.search.filter.FilterItem;
 
-import java.util.Collections;
 import java.util.List;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 public abstract class SearchQueryHandlerFactory extends ListLinkHandlerFactory {
     protected final BaseSearchFilters searchFilters;
 
@@ -20,8 +22,9 @@ protected SearchQueryHandlerFactory(final BaseSearchFilters searchFilters) {
     ///////////////////////////////////
 
     @Override
-    public abstract String getUrl(String query, List<FilterItem> selectedContentFilter,
-                                  List<FilterItem> selectedSortFilter)
+    public abstract String getUrl(String query,
+                                  @Nonnull List<FilterItem> selectedContentFilter,
+                                  @Nullable List<FilterItem> selectedSortFilter)
             throws ParsingException, UnsupportedOperationException;
 
     @SuppressWarnings("unused")

extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/linkHandler/BandcampChannelLinkHandlerFactory.java

@@ -16,6 +16,9 @@
 import java.io.IOException;
 import java.util.List;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 /**
  * Artist do have IDs that are useful
  */
@@ -51,8 +54,9 @@ public String getId(final String url) throws ParsingException, UnsupportedOperat
      * Uses the mobile endpoint as a "translator" from id to url
      */
     @Override
-    public String getUrl(final String id, final List<FilterItem> contentFilter,
-                         final List<FilterItem> sortFilter)
+    public String getUrl(final String id,
+                         @Nonnull final List<FilterItem> contentFilter,
+                         @Nullable final List<FilterItem> sortFilter)
             throws ParsingException, UnsupportedOperationException {
         final JsonObject artistDetails = BandcampExtractorHelper.getArtistDetails(id);
         if (artistDetails.getBoolean("error")) {

extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/linkHandler/BandcampCommentsLinkHandlerFactory.java

@@ -8,6 +8,9 @@
 
 import java.util.List;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 /**
  * Like in {@link BandcampStreamLinkHandlerFactory}, tracks have no meaningful IDs except for
  * their URLs
@@ -46,8 +49,8 @@ public boolean onAcceptUrl(final String url) throws ParsingException {
 
     @Override
     public String getUrl(final String id,
-                         final List<FilterItem> contentFilter,
-                         final List<FilterItem> sortFilter)
+                         @Nonnull final List<FilterItem> contentFilter,
+                         @Nullable final List<FilterItem> sortFilter)
             throws ParsingException, UnsupportedOperationException {
         return id;
     }

extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/linkHandler/BandcampFeaturedLinkHandlerFactory.java

@@ -11,6 +11,9 @@
 
 import java.util.List;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import static org.schabi.newpipe.extractor.services.bandcamp.extractors.BandcampFeaturedExtractor.FEATURED_API_URL;
 import static org.schabi.newpipe.extractor.services.bandcamp.extractors.BandcampFeaturedExtractor.KIOSK_FEATURED;
 import static org.schabi.newpipe.extractor.services.bandcamp.extractors.BandcampRadioExtractor.KIOSK_RADIO;
@@ -30,8 +33,8 @@ public static BandcampFeaturedLinkHandlerFactory getInstance() {
 
     @Override
     public String getUrl(final String id,
-                         final List<FilterItem> contentFilter,
-                         final List<FilterItem> sortFilter)
+                         @Nonnull final List<FilterItem> contentFilter,
+                         @Nullable final List<FilterItem> sortFilter)
             throws ParsingException, UnsupportedOperationException {
         if (id.equals(KIOSK_FEATURED)) {
             return FEATURED_API_URL; // doesn't have a website

extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/linkHandler/BandcampPlaylistLinkHandlerFactory.java

@@ -10,6 +10,9 @@
 
 import java.util.List;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 /**
  * Just as with streams, the album ids are essentially useless for us.
  */
@@ -32,8 +35,8 @@ public String getId(final String url) throws ParsingException, UnsupportedOperat
 
     @Override
     public String getUrl(final String url,
-                         final List<FilterItem> contentFilter,
-                         final List<FilterItem> sortFilter)
+                         @Nonnull final List<FilterItem> contentFilter,
+                         @Nullable final List<FilterItem> sortFilter)
             throws ParsingException, UnsupportedOperationException {
         return url;
     }

extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/linkHandler/BandcampSearchQueryHandlerFactory.java

@@ -13,6 +13,9 @@
 import java.io.UnsupportedEncodingException;
 import java.util.List;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 public final class BandcampSearchQueryHandlerFactory extends SearchQueryHandlerFactory {
 
     private static final BandcampSearchQueryHandlerFactory INSTANCE
@@ -28,11 +31,10 @@ public static BandcampSearchQueryHandlerFactory getInstance() {
 
     @Override
     public String getUrl(final String query,
-                         final List<FilterItem> selectedContentFilter,
-                         final List<FilterItem> selectedSortFilter)
+                         @Nonnull final List<FilterItem> selectedContentFilter,
+                         @Nullable final List<FilterItem> selectedSortFilter)
             throws ParsingException, UnsupportedOperationException {
 
-
         searchFilters.setSelectedSortFilter(selectedSortFilter);
         searchFilters.setSelectedContentFilter(selectedContentFilter);
 

extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/linkHandler/MediaCCCConferenceLinkHandlerFactory.java

@@ -8,11 +8,13 @@
 
 import java.util.List;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 public final class MediaCCCConferenceLinkHandlerFactory extends ListLinkHandlerFactory {
 
     private static final MediaCCCConferenceLinkHandlerFactory INSTANCE
             = new MediaCCCConferenceLinkHandlerFactory();
-
     public static final String CONFERENCE_API_ENDPOINT
             = "https://api.media.ccc.de/public/conferences/";
     public static final String CONFERENCE_PATH = "https://media.ccc.de/c/";
@@ -29,8 +31,8 @@ public static MediaCCCConferenceLinkHandlerFactory getInstance() {
 
     @Override
     public String getUrl(final String id,
-                         final List<FilterItem> contentFilter,
-                         final List<FilterItem> sortFilter)
+                         @Nonnull final List<FilterItem> contentFilter,
+                         @Nullable final List<FilterItem> sortFilter)
             throws ParsingException, UnsupportedOperationException {
         return CONFERENCE_PATH + id;
     }

extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/linkHandler/MediaCCCConferencesListLinkHandlerFactory.java

@@ -7,6 +7,9 @@
 
 import java.util.List;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 public final class MediaCCCConferencesListLinkHandlerFactory extends ListLinkHandlerFactory {
 
     private static final MediaCCCConferencesListLinkHandlerFactory INSTANCE =
@@ -18,16 +21,15 @@ private MediaCCCConferencesListLinkHandlerFactory() {
     public static MediaCCCConferencesListLinkHandlerFactory getInstance() {
         return INSTANCE;
     }
-
     @Override
     public String getId(final String url) throws ParsingException, UnsupportedOperationException {
         return "conferences";
     }
 
     @Override
     public String getUrl(final String id,
-                         final List<FilterItem> contentFilter,
-                         final List<FilterItem> sortFilter)
+                         @Nonnull final List<FilterItem> contentFilter,
+                         @Nullable final List<FilterItem> sortFilter)
             throws ParsingException, UnsupportedOperationException {
         return "https://media.ccc.de/public/conferences";
     }

extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/linkHandler/MediaCCCLiveListLinkHandlerFactory.java

@@ -8,11 +8,13 @@
 import java.util.List;
 import java.util.regex.Pattern;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 public final class MediaCCCLiveListLinkHandlerFactory extends ListLinkHandlerFactory {
 
     private static final MediaCCCLiveListLinkHandlerFactory INSTANCE =
             new MediaCCCLiveListLinkHandlerFactory();
-
     private static final String STREAM_PATTERN = "^(?:https?://)?media\\.ccc\\.de/live$";
 
     private MediaCCCLiveListLinkHandlerFactory() {
@@ -34,8 +36,8 @@ public boolean onAcceptUrl(final String url) throws ParsingException {
 
     @Override
     public String getUrl(final String id,
-                         final List<FilterItem> contentFilter,
-                         final List<FilterItem> sortFilter)
+                         @Nonnull final List<FilterItem> contentFilter,
+                         @Nullable final List<FilterItem> sortFilter)
             throws ParsingException, UnsupportedOperationException {
         // FIXME: wrong URL; should be https://streaming.media.ccc.de/{conference_slug}/{room_slug}
         return "https://media.ccc.de/live";