diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/linkhandler/ListLinkHandler.java b/extractor/src/main/java/org/schabi/newpipe/extractor/linkhandler/ListLinkHandler.java index 17134e4e2..4372c0649 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/linkhandler/ListLinkHandler.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/linkhandler/ListLinkHandler.java @@ -1,5 +1,7 @@ package org.schabi.newpipe.extractor.linkhandler; +import static org.schabi.newpipe.extractor.utils.Utils.EMPTY_STRING; + import java.util.Collections; import java.util.List; @@ -25,14 +27,12 @@ public class ListLinkHandler extends LinkHandler { handler.sortFilter); } - public ListLinkHandler(final LinkHandler handler, - final List contentFilters, - final String sortFilter) { + public ListLinkHandler(final LinkHandler handler) { this(handler.originalUrl, handler.url, handler.id, - contentFilters, - sortFilter); + Collections.emptyList(), + EMPTY_STRING); } public List getContentFilters() { diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/linkhandler/ListLinkHandlerFactory.java b/extractor/src/main/java/org/schabi/newpipe/extractor/linkhandler/ListLinkHandlerFactory.java index 2e3867828..9b6714f7c 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/linkhandler/ListLinkHandlerFactory.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/linkhandler/ListLinkHandlerFactory.java @@ -13,16 +13,6 @@ public abstract class ListLinkHandlerFactory extends LinkHandlerFactory { // To Override /////////////////////////////////// - @SuppressWarnings({"RedundantThrows", "unused"}) - public List getContentFilter(final String url) throws ParsingException { - return Collections.emptyList(); - } - - @SuppressWarnings({"RedundantThrows", "unused"}) - public String getSortFilter(final String url) throws ParsingException { - return ""; - } - public abstract String getUrl(String id, List contentFilter, String sortFilter) throws ParsingException; @@ -50,18 +40,17 @@ public abstract class ListLinkHandlerFactory extends LinkHandlerFactory { throw new IllegalArgumentException("url may not be null"); } - return new ListLinkHandler(super.fromUrl(url, baseUrl), getContentFilter(url), - getSortFilter(url)); + return new ListLinkHandler(super.fromUrl(url, baseUrl)); } @Override public ListLinkHandler fromId(final String id) throws ParsingException { - return new ListLinkHandler(super.fromId(id), new ArrayList<>(0), ""); + return new ListLinkHandler(super.fromId(id)); } @Override public ListLinkHandler fromId(final String id, final String baseUrl) throws ParsingException { - return new ListLinkHandler(super.fromId(id, baseUrl), new ArrayList<>(0), ""); + return new ListLinkHandler(super.fromId(id, baseUrl)); } public ListLinkHandler fromQuery(final String id, diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/linkhandler/SearchQueryHandlerFactory.java b/extractor/src/main/java/org/schabi/newpipe/extractor/linkhandler/SearchQueryHandlerFactory.java index 07e7a5dca..4a1ee776a 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/linkhandler/SearchQueryHandlerFactory.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/linkhandler/SearchQueryHandlerFactory.java @@ -3,6 +3,7 @@ package org.schabi.newpipe.extractor.linkhandler; import org.schabi.newpipe.extractor.exceptions.ParsingException; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import static org.schabi.newpipe.extractor.utils.Utils.EMPTY_STRING; @@ -39,7 +40,7 @@ public abstract class SearchQueryHandlerFactory extends ListLinkHandlerFactory { } public SearchQueryHandler fromQuery(final String query) throws ParsingException { - return fromQuery(query, new ArrayList<>(0), EMPTY_STRING); + return fromQuery(query, Collections.emptyList(), EMPTY_STRING); } /** diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/linkHandler/YoutubePlaylistLinkHandlerFactory.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/linkHandler/YoutubePlaylistLinkHandlerFactory.java index dc24839fb..fb47d95c0 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/linkHandler/YoutubePlaylistLinkHandlerFactory.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/linkHandler/YoutubePlaylistLinkHandlerFactory.java @@ -97,9 +97,7 @@ public final class YoutubePlaylistLinkHandlerFactory extends ListLinkHandlerFact } final String newUrl = "https://www.youtube.com/watch?v=" + videoID + "&list=" + listID; - return new ListLinkHandler(new LinkHandler(url, newUrl, listID), - getContentFilter(url), - getSortFilter(url)); + return new ListLinkHandler(new LinkHandler(url, newUrl, listID)); } } catch (final MalformedURLException exception) { throw new ParsingException("Error could not parse URL: " + exception.getMessage(),