Refactor Extractor#onFetchPage to not recieve downloader as parameter

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

@@ -29,13 +29,10 @@ public abstract class Extractor {
     private ContentCountry forcedContentCountry = null;
 
     private boolean pageFetched = false;
-    // called like this to prevent checkstyle errors about "hiding a field"
-    private final Downloader downloader;
 
     protected Extractor(final StreamingService service, final LinkHandler linkHandler) {
         this.service = Objects.requireNonNull(service, "service is null");
         this.linkHandler = Objects.requireNonNull(linkHandler, "LinkHandler is null");
-        this.downloader = Objects.requireNonNull(NewPipe.getDownloader(), "downloader is null");
     }
 
     /**
@@ -57,7 +54,7 @@ public void fetchPage() throws IOException, ExtractionException {
         if (pageFetched) {
             return;
         }
-        onFetchPage(downloader);
+        onFetchPage();
         pageFetched = true;
     }
 
@@ -74,13 +71,10 @@ protected boolean isPageFetched() {
     /**
      * Fetch the current page.
      *
-     * @param downloader the downloader to use
      * @throws IOException         if the page can not be loaded
      * @throws ExtractionException if the pages content is not understood
      */
-    @SuppressWarnings("HiddenField")
-    public abstract void onFetchPage(@Nonnull Downloader downloader)
-            throws IOException, ExtractionException;
+    public abstract void onFetchPage() throws IOException, ExtractionException;
 
     @Nonnull
     public String getId() throws ParsingException {
@@ -120,8 +114,8 @@ public int getServiceId() {
         return service.getServiceId();
     }
 
-    public Downloader getDownloader() {
-        return downloader;
+    public static Downloader getDownloader() {
+        return NewPipe.getDownloader();
     }
 
     /*//////////////////////////////////////////////////////////////////////////

extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampChannelExtractor.java

@@ -17,7 +17,6 @@
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.channel.ChannelExtractor;
 import org.schabi.newpipe.extractor.channel.tabs.ChannelTabExtractor;
-import org.schabi.newpipe.extractor.downloader.Downloader;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
@@ -163,8 +162,7 @@ public List<ListLinkHandler> getTabs() throws ParsingException {
     }
 
     @Override
-    public void onFetchPage(@Nonnull final Downloader downloader)
-            throws IOException, ExtractionException {
+    public void onFetchPage() throws IOException, ExtractionException {
         channelInfo = getArtistDetails(getId());
     }
 

extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampChannelTabExtractor.java

@@ -8,7 +8,6 @@
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.channel.tabs.ChannelTabExtractor;
 import org.schabi.newpipe.extractor.channel.tabs.ChannelTabs;
-import org.schabi.newpipe.extractor.downloader.Downloader;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.linkhandler.ListLinkHandler;
@@ -48,7 +47,7 @@ public static BandcampChannelTabExtractor fromDiscography(final StreamingService
     }
 
     @Override
-    public void onFetchPage(@Nonnull final Downloader downloader) throws ParsingException {
+    public void onFetchPage() throws ParsingException {
         if (discography == null) {
             discography = BandcampExtractorHelper.getArtistDetails(getId())
                     .getArray("discography");

extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampCommentsExtractor.java

@@ -13,7 +13,6 @@
 import org.schabi.newpipe.extractor.comments.CommentsExtractor;
 import org.schabi.newpipe.extractor.comments.CommentsInfoItem;
 import org.schabi.newpipe.extractor.comments.CommentsInfoItemsCollector;
-import org.schabi.newpipe.extractor.downloader.Downloader;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
@@ -40,9 +39,8 @@ public BandcampCommentsExtractor(final StreamingService service,
     }
 
     @Override
-    public void onFetchPage(@Nonnull final Downloader downloader)
-            throws IOException, ExtractionException {
-        document = Jsoup.parse(downloader.get(getLinkHandler().getUrl()).responseBody());
+    public void onFetchPage() throws IOException, ExtractionException {
+        document = Jsoup.parse(getDownloader().get(getLinkHandler().getUrl()).responseBody());
     }
 
     @Nonnull

extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampFeaturedExtractor.java

@@ -8,7 +8,6 @@
 import com.grack.nanojson.JsonParserException;
 import org.schabi.newpipe.extractor.Page;
 import org.schabi.newpipe.extractor.StreamingService;
-import org.schabi.newpipe.extractor.downloader.Downloader;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.kiosk.KioskExtractor;
@@ -39,8 +38,7 @@ public BandcampFeaturedExtractor(final StreamingService streamingService,
     }
 
     @Override
-    public void onFetchPage(@Nonnull final Downloader downloader)
-            throws IOException, ExtractionException {
+    public void onFetchPage() throws IOException, ExtractionException {
         try {
             json = JsonParser.object().from(getDownloader().postWithContentTypeJson(
                             FEATURED_API_URL,

extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampPlaylistExtractor.java

@@ -17,7 +17,6 @@
 import org.schabi.newpipe.extractor.Image;
 import org.schabi.newpipe.extractor.Page;
 import org.schabi.newpipe.extractor.StreamingService;
-import org.schabi.newpipe.extractor.downloader.Downloader;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.exceptions.PaidContentException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
@@ -54,9 +53,8 @@ public BandcampPlaylistExtractor(final StreamingService service,
     }
 
     @Override
-    public void onFetchPage(@Nonnull final Downloader downloader)
-            throws IOException, ExtractionException {
-        final String html = downloader.get(getLinkHandler().getUrl()).responseBody();
+    public void onFetchPage() throws IOException, ExtractionException {
+        final String html = getDownloader().get(getLinkHandler().getUrl()).responseBody();
         document = Jsoup.parse(html);
         albumJson = getAlbumInfoJson(html);
         trackInfo = albumJson.getArray("trackinfo");

extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampRadioExtractor.java

@@ -8,7 +8,6 @@
 import com.grack.nanojson.JsonParserException;
 import org.schabi.newpipe.extractor.Page;
 import org.schabi.newpipe.extractor.StreamingService;
-import org.schabi.newpipe.extractor.downloader.Downloader;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.kiosk.KioskExtractor;
@@ -35,8 +34,7 @@ public BandcampRadioExtractor(final StreamingService streamingService,
     }
 
     @Override
-    public void onFetchPage(@Nonnull final Downloader downloader)
-            throws IOException, ExtractionException {
+    public void onFetchPage() throws IOException, ExtractionException {
         try {
             json = JsonParser.object().from(
                     getDownloader().get(RADIO_API_URL).responseBody());

extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampRadioStreamExtractor.java

@@ -15,9 +15,7 @@
 import org.schabi.newpipe.extractor.Image;
 import org.schabi.newpipe.extractor.Image.ResolutionLevel;
 import org.schabi.newpipe.extractor.MediaFormat;
-import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.StreamingService;
-import org.schabi.newpipe.extractor.downloader.Downloader;
 import org.schabi.newpipe.extractor.exceptions.ContentNotSupportedException;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
@@ -49,16 +47,15 @@ public BandcampRadioStreamExtractor(final StreamingService service,
 
     static JsonObject query(final int id) throws ParsingException {
         try {
-            return JsonParser.object().from(NewPipe.getDownloader()
+            return JsonParser.object().from(getDownloader()
                     .get(BASE_API_URL + "/bcweekly/1/get?id=" + id).responseBody());
         } catch (final IOException | ReCaptchaException | JsonParserException e) {
             throw new ParsingException("could not get show data", e);
         }
     }
 
     @Override
-    public void onFetchPage(@Nonnull final Downloader downloader)
-            throws IOException, ExtractionException {
+    public void onFetchPage() throws IOException, ExtractionException {
         showInfo = query(Integer.parseInt(getId()));
     }
 

extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampSearchExtractor.java

@@ -11,7 +11,6 @@
 import org.schabi.newpipe.extractor.MultiInfoItemsCollector;
 import org.schabi.newpipe.extractor.Page;
 import org.schabi.newpipe.extractor.StreamingService;
-import org.schabi.newpipe.extractor.downloader.Downloader;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.linkhandler.SearchQueryHandler;
@@ -113,7 +112,6 @@ public InfoItemsPage<InfoItem> getInitialPage() throws IOException, ExtractionEx
     }
 
     @Override
-    public void onFetchPage(@Nonnull final Downloader downloader)
-            throws IOException, ExtractionException {
+    public void onFetchPage() throws IOException, ExtractionException {
     }
 }

extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampStreamExtractor.java

@@ -17,7 +17,6 @@
 import org.schabi.newpipe.extractor.Image;
 import org.schabi.newpipe.extractor.MediaFormat;
 import org.schabi.newpipe.extractor.StreamingService;
-import org.schabi.newpipe.extractor.downloader.Downloader;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.exceptions.PaidContentException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
@@ -51,9 +50,8 @@ public BandcampStreamExtractor(final StreamingService service, final LinkHandler
 
 
     @Override
-    public void onFetchPage(@Nonnull final Downloader downloader)
-            throws IOException, ExtractionException {
-        final String html = downloader.get(getLinkHandler().getUrl()).responseBody();
+    public void onFetchPage() throws IOException, ExtractionException {
+        final String html = getDownloader().get(getLinkHandler().getUrl()).responseBody();
         document = Jsoup.parse(html);
         albumJson = getAlbumInfoJson(html);
         current = albumJson.getObject("current");

extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCChannelTabExtractor.java

@@ -8,7 +8,6 @@
 import org.schabi.newpipe.extractor.Page;
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.channel.tabs.ChannelTabExtractor;
-import org.schabi.newpipe.extractor.downloader.Downloader;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.linkhandler.ListLinkHandler;
 import org.schabi.newpipe.extractor.services.media_ccc.extractors.infoItems.MediaCCCStreamInfoItemExtractor;
@@ -40,11 +39,10 @@ public MediaCCCChannelTabExtractor(final StreamingService service,
     }
 
     @Override
-    public void onFetchPage(@Nonnull final Downloader downloader)
-            throws ExtractionException, IOException {
+    public void onFetchPage() throws ExtractionException, IOException {
         if (conferenceData == null) {
             // only fetch conference data if we don't have it already
-            conferenceData = MediaCCCConferenceExtractor.fetchConferenceData(downloader, getId());
+            conferenceData = MediaCCCConferenceExtractor.fetchConferenceData(getId());
         }
     }
 

extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCConferenceExtractor.java

@@ -10,7 +10,6 @@
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.channel.ChannelExtractor;
 import org.schabi.newpipe.extractor.channel.tabs.ChannelTabs;
-import org.schabi.newpipe.extractor.downloader.Downloader;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.linkhandler.ListLinkHandler;
@@ -31,13 +30,13 @@ public MediaCCCConferenceExtractor(final StreamingService service,
         super(service, linkHandler);
     }
 
-    static JsonObject fetchConferenceData(@Nonnull final Downloader downloader,
-                                          @Nonnull final String conferenceId)
+    static JsonObject fetchConferenceData(@Nonnull final String conferenceId)
             throws IOException, ExtractionException {
         final String conferenceUrl
                 = MediaCCCConferenceLinkHandlerFactory.CONFERENCE_API_ENDPOINT + conferenceId;
         try {
-            return JsonParser.object().from(downloader.get(conferenceUrl).responseBody());
+            return JsonParser.object().from(getDownloader()
+                    .get(conferenceUrl).responseBody());
         } catch (final JsonParserException jpe) {
             throw new ExtractionException("Could not parse json returned by URL: " + conferenceUrl);
         }
@@ -103,9 +102,8 @@ public List<ListLinkHandler> getTabs() throws ParsingException {
     }
 
     @Override
-    public void onFetchPage(@Nonnull final Downloader downloader)
-            throws IOException, ExtractionException {
-        conferenceData = fetchConferenceData(downloader, getId());
+    public void onFetchPage() throws IOException, ExtractionException {
+        conferenceData = fetchConferenceData(getId());
     }
 
     @Nonnull

extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCConferenceKiosk.java

@@ -9,7 +9,6 @@
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.channel.ChannelInfoItem;
 import org.schabi.newpipe.extractor.channel.ChannelInfoItemsCollector;
-import org.schabi.newpipe.extractor.downloader.Downloader;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.kiosk.KioskExtractor;
@@ -50,8 +49,8 @@ public InfoItemsPage<ChannelInfoItem> getPage(final Page page) {
     }
 
     @Override
-    public void onFetchPage(@Nonnull final Downloader downloader)
-            throws IOException, ExtractionException {
+    public void onFetchPage() throws IOException, ExtractionException {
+        final var downloader = getDownloader();
         final String site = downloader.get(getLinkHandler().getUrl(), getExtractorLocalization())
                 .responseBody();
         try {

extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCLiveStreamExtractor.java

@@ -10,7 +10,6 @@
 import org.schabi.newpipe.extractor.Image;
 import org.schabi.newpipe.extractor.MediaFormat;
 import org.schabi.newpipe.extractor.StreamingService;
-import org.schabi.newpipe.extractor.downloader.Downloader;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.linkhandler.LinkHandler;
@@ -45,10 +44,8 @@ public MediaCCCLiveStreamExtractor(final StreamingService service,
     }
 
     @Override
-    public void onFetchPage(@Nonnull final Downloader downloader)
-            throws IOException, ExtractionException {
-        final JsonArray doc = MediaCCCParsingHelper.getLiveStreams(downloader,
-                getExtractorLocalization());
+    public void onFetchPage() throws IOException, ExtractionException {
+        final JsonArray doc = MediaCCCParsingHelper.getLiveStreams(getExtractorLocalization());
         // Find the correct room
         for (int c = 0; c < doc.size(); c++) {
             final JsonObject conferenceObject = doc.getObject(c);

extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCLiveStreamKiosk.java

@@ -4,7 +4,6 @@
 import com.grack.nanojson.JsonObject;
 import org.schabi.newpipe.extractor.Page;
 import org.schabi.newpipe.extractor.StreamingService;
-import org.schabi.newpipe.extractor.downloader.Downloader;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.kiosk.KioskExtractor;
@@ -27,9 +26,8 @@ public MediaCCCLiveStreamKiosk(final StreamingService streamingService,
     }
 
     @Override
-    public void onFetchPage(@Nonnull final Downloader downloader)
-            throws IOException, ExtractionException {
-        doc = MediaCCCParsingHelper.getLiveStreams(downloader, getExtractorLocalization());
+    public void onFetchPage() throws IOException, ExtractionException {
+        doc = MediaCCCParsingHelper.getLiveStreams(getExtractorLocalization());
     }
 
     @Nonnull

extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCParsingHelper.java

@@ -6,7 +6,7 @@
 import com.grack.nanojson.JsonParserException;
 import org.schabi.newpipe.extractor.Image;
 import org.schabi.newpipe.extractor.Image.ResolutionLevel;
-import org.schabi.newpipe.extractor.downloader.Downloader;
+import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
 import org.schabi.newpipe.extractor.localization.Localization;
@@ -46,20 +46,19 @@ public static boolean isLiveStreamId(final String id) {
      *     https://streaming.media.ccc.de/streams/v2.json</a>.
      * Use this method to cache requests, because they can get quite big.
      * TODO: implement better caching policy (max-age: 3 min)
-     * @param downloader The downloader to use for making the request
      * @param localization The localization to be used. Will most likely be ignored.
      * @return {@link JsonArray} containing current conferences and info about their rooms and
      *         streams.
      * @throws ExtractionException if the data could not be fetched or the retrieved data could not
      *                             be parsed to a {@link JsonArray}
      */
-    public static JsonArray getLiveStreams(final Downloader downloader,
-                                           final Localization localization)
+    public static JsonArray getLiveStreams(final Localization localization)
             throws ExtractionException {
         if (liveStreams == null) {
             try {
-                final String site = downloader.get("https://streaming.media.ccc.de/streams/v2.json",
-                        localization).responseBody();
+                final String site = NewPipe.getDownloader()
+                        .get("https://streaming.media.ccc.de/streams/v2.json", localization)
+                        .responseBody();
                 liveStreams = JsonParser.array().from(site);
             } catch (final IOException | ReCaptchaException e) {
                 throw new ExtractionException("Could not get live stream JSON.", e);

extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCRecentKiosk.java

@@ -7,7 +7,6 @@
 
 import org.schabi.newpipe.extractor.Page;
 import org.schabi.newpipe.extractor.StreamingService;
-import org.schabi.newpipe.extractor.downloader.Downloader;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.kiosk.KioskExtractor;
@@ -34,9 +33,8 @@ public MediaCCCRecentKiosk(final StreamingService streamingService,
     }
 
     @Override
-    public void onFetchPage(@Nonnull final Downloader downloader)
-            throws IOException, ExtractionException {
-        final String site = downloader.get("https://api.media.ccc.de/public/events/recent",
+    public void onFetchPage() throws IOException, ExtractionException {
+        final String site = getDownloader().get("https://api.media.ccc.de/public/events/recent",
                 getExtractorLocalization()).responseBody();
         try {
             doc = JsonParser.object().from(site);