From 8c1041def62b0d839900b7c4795ccc8eaa19dcf5 Mon Sep 17 00:00:00 2001 From: Stypox Date: Thu, 17 Mar 2022 16:25:49 +0100 Subject: [PATCH] Add @ null annotations where Android Studio suggested it That is, basically where the overriding function was missing an annotation from the base method. Also apply renaming of emptyDescription to EMPTY_DESCRIPTION --- .../peertube/extractors/PeertubeChannelExtractor.java | 2 +- .../peertube/extractors/PeertubeCommentsExtractor.java | 5 ++++- .../peertube/extractors/PeertubeSearchExtractor.java | 1 + .../peertube/extractors/PeertubeStreamExtractor.java | 3 ++- .../peertube/extractors/PeertubeTrendingExtractor.java | 2 ++ .../schabi/newpipe/extractor/services/youtube/ItagItem.java | 3 +++ .../services/youtube/extractors/YoutubeSearchExtractor.java | 1 + 7 files changed, 14 insertions(+), 3 deletions(-) diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeChannelExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeChannelExtractor.java index 940f0fa5c..c5b7bf399 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeChannelExtractor.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeChannelExtractor.java @@ -138,7 +138,7 @@ public class PeertubeChannelExtractor extends ChannelExtractor { } @Override - public void onFetchPage(final Downloader downloader) + public void onFetchPage(@Nonnull final Downloader downloader) throws IOException, ExtractionException { final Response response = downloader.get( baseUrl + PeertubeChannelLinkHandlerFactory.API_ENDPOINT + getId()); diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeCommentsExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeCommentsExtractor.java index dd4a4e7b3..f0568823c 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeCommentsExtractor.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeCommentsExtractor.java @@ -23,12 +23,15 @@ import static org.schabi.newpipe.extractor.services.peertube.PeertubeParsingHelp import static org.schabi.newpipe.extractor.services.peertube.PeertubeParsingHelper.START_KEY; import static org.schabi.newpipe.extractor.utils.Utils.isNullOrEmpty; +import javax.annotation.Nonnull; + public class PeertubeCommentsExtractor extends CommentsExtractor { public PeertubeCommentsExtractor(final StreamingService service, final ListLinkHandler uiHandler) { super(service, uiHandler); } + @Nonnull @Override public InfoItemsPage getInitialPage() throws IOException, ExtractionException { @@ -84,6 +87,6 @@ public class PeertubeCommentsExtractor extends CommentsExtractor { } @Override - public void onFetchPage(final Downloader downloader) { + public void onFetchPage(@Nonnull final Downloader downloader) { } } diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeSearchExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeSearchExtractor.java index 79da72165..8be07855d 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeSearchExtractor.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeSearchExtractor.java @@ -63,6 +63,7 @@ public class PeertubeSearchExtractor extends SearchExtractor { return Collections.emptyList(); } + @Nonnull @Override public InfoItemsPage getInitialPage() throws IOException, ExtractionException { return getPage(new Page(getUrl() + "&" + START_KEY + "=0&" diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeStreamExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeStreamExtractor.java index eb33bf18b..f80815d10 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeStreamExtractor.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeStreamExtractor.java @@ -388,7 +388,8 @@ public class PeertubeStreamExtractor extends StreamExtractor { } @Override - public void onFetchPage(final Downloader downloader) throws IOException, ExtractionException { + public void onFetchPage(@Nonnull final Downloader downloader) + throws IOException, ExtractionException { final Response response = downloader.get( baseUrl + PeertubeStreamLinkHandlerFactory.VIDEO_API_ENDPOINT + getId()); if (response != null) { diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeTrendingExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeTrendingExtractor.java index 676fdfb22..2baca78ad 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeTrendingExtractor.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeTrendingExtractor.java @@ -33,11 +33,13 @@ public class PeertubeTrendingExtractor extends KioskExtractor { super(streamingService, linkHandler, kioskId); } + @Nonnull @Override public String getName() throws ParsingException { return getId(); } + @Nonnull @Override public InfoItemsPage getInitialPage() throws IOException, ExtractionException { return getPage(new Page(getUrl() + "&" + START_KEY + "=0&" diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/ItagItem.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/ItagItem.java index 5ee02cc5c..428f96433 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/ItagItem.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/ItagItem.java @@ -13,6 +13,8 @@ import static org.schabi.newpipe.extractor.services.youtube.ItagItem.ItagType.VI import org.schabi.newpipe.extractor.MediaFormat; import org.schabi.newpipe.extractor.exceptions.ParsingException; +import javax.annotation.Nonnull; + public class ItagItem { /** * List can be found here @@ -96,6 +98,7 @@ public class ItagItem { return false; } + @Nonnull public static ItagItem getItag(final int itagId) throws ParsingException { for (final ItagItem item : ITAG_LIST) { if (itagId == item.id) { diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeSearchExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeSearchExtractor.java index 895a85946..53aea1c28 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeSearchExtractor.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeSearchExtractor.java @@ -133,6 +133,7 @@ public class YoutubeSearchExtractor extends SearchExtractor { return !showingResultsForRenderer.isEmpty(); } + @Nonnull @Override public List getMetaInfo() throws ParsingException { return YoutubeParsingHelper.getMetaInfo(