Merge pull request #254 from TeamNewPipe/formatting

Improve code formatting and optimize imports

Author: TobiGr

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

@@ -1,10 +1,5 @@
 package org.schabi.newpipe.extractor;
 
-import java.io.IOException;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import org.schabi.newpipe.extractor.downloader.Downloader;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
@@ -13,27 +8,33 @@
 import org.schabi.newpipe.extractor.localization.Localization;
 import org.schabi.newpipe.extractor.localization.TimeAgoParser;
 
-public abstract class Extractor{ 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.io.IOException;
+
+public abstract class Extractor {
     /**
      * {@link StreamingService} currently related to this extractor.<br>
      * Useful for getting other things from a service (like the url handlers for cleaning/accepting/get id from urls).
      */
     private final StreamingService service;
     private final LinkHandler linkHandler;
 
-    @Nullable private Localization forcedLocalization = null;
-    @Nullable private ContentCountry forcedContentCountry = null;
+    @Nullable
+    private Localization forcedLocalization = null;
+    @Nullable
+    private ContentCountry forcedContentCountry = null;
 
     private boolean pageFetched = false;
     private final Downloader downloader;
 
     public Extractor(final StreamingService service, final LinkHandler linkHandler) {
-        if(service == null) throw new NullPointerException("service is null");
-        if(linkHandler == null) throw new NullPointerException("LinkHandler is null");
+        if (service == null) throw new NullPointerException("service is null");
+        if (linkHandler == null) throw new NullPointerException("LinkHandler is null");
         this.service = service;
         this.linkHandler = linkHandler;
         this.downloader = NewPipe.getDownloader();
-        if(downloader == null) throw new NullPointerException("downloader is null");
+        if (downloader == null) throw new NullPointerException("downloader is null");
     }
 
     /**
@@ -46,11 +47,12 @@ public LinkHandler getLinkHandler() {
 
     /**
      * Fetch the current page.
-     * @throws IOException if the page can not be loaded
+     *
+     * @throws IOException         if the page can not be loaded
      * @throws ExtractionException if the pages content is not understood
      */
     public void fetchPage() throws IOException, ExtractionException {
-        if(pageFetched) return;
+        if (pageFetched) return;
         onFetchPage(downloader);
         pageFetched = true;
     }
@@ -65,8 +67,9 @@ protected boolean isPageFetched() {
 
     /**
      * Fetch the current page.
+     *
      * @param downloader the download to use
-     * @throws IOException if the page can not be loaded
+     * @throws IOException         if the page can not be loaded
      * @throws ExtractionException if the pages content is not understood
      */
     public abstract void onFetchPage(@Nonnull Downloader downloader) throws IOException, ExtractionException;
@@ -78,6 +81,7 @@ public String getId() throws ParsingException {
 
     /**
      * Get the name
+     *
      * @return the name
      * @throws ParsingException if the name cannot be extracted
      */
@@ -93,10 +97,10 @@ public String getOriginalUrl() throws ParsingException {
     public String getUrl() throws ParsingException {
         return linkHandler.getUrl();
     }
-   
+
     @Nonnull
     public String getBaseUrl() throws ParsingException {
-       return linkHandler.getBaseUrl();
+        return linkHandler.getBaseUrl();
     }
 
     @Nonnull

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

@@ -27,7 +27,7 @@
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public abstract class InfoItemsCollector<I extends InfoItem, E extends InfoItemExtractor> implements Collector<I,E> {
+public abstract class InfoItemsCollector<I extends InfoItem, E extends InfoItemExtractor> implements Collector<I, E> {
 
     private final List<I> itemList = new ArrayList<>();
     private final List<Throwable> errors = new ArrayList<>();

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

@@ -115,26 +115,28 @@ public static MediaFormat getFromMimeType(String mimeType) {
     }
 
     /**
-     * Get the media format by it's id.
+     * Get the media format by its id.
+     *
      * @param id the id
      * @return the id of the media format or null.
      */
     public static MediaFormat getFormatById(int id) {
-        for (MediaFormat vf: values()) {
+        for (MediaFormat vf : values()) {
             if (vf.id == id) return vf;
         }
         return null;
     }
 
     public static MediaFormat getFromSuffix(String suffix) {
-        for (MediaFormat vf: values()) {
+        for (MediaFormat vf : values()) {
             if (vf.suffix.equals(suffix)) return vf;
         }
         return null;
     }
-    
+
     /**
      * Get the name of the format
+     *
      * @return the name of the format
      */
     public String getName() {
@@ -143,6 +145,7 @@ public String getName() {
 
     /**
      * Get the filename extension
+     *
      * @return the filename extension
      */
     public String getSuffix() {
@@ -151,10 +154,11 @@ public String getSuffix() {
 
     /**
      * Get the mime type
+     *
      * @return the mime type
      */
     public String getMimeType() {
         return mimeType;
     }
-    
+
 }

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

@@ -1,14 +1,14 @@
 package org.schabi.newpipe.extractor;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
 import org.schabi.newpipe.extractor.services.media_ccc.MediaCCCService;
 import org.schabi.newpipe.extractor.services.peertube.PeertubeService;
 import org.schabi.newpipe.extractor.services.soundcloud.SoundcloudService;
 import org.schabi.newpipe.extractor.services.youtube.YoutubeService;
 
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
 /*
  * Copyright (C) Christian Schabesberger 2018 <chris.schabesberger@mailbox.org>
  * ServiceList.java is part of NewPipe.

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

@@ -1,20 +1,12 @@
 package org.schabi.newpipe.extractor;
 
-import java.util.Collections;
-import java.util.List;
-
 import org.schabi.newpipe.extractor.channel.ChannelExtractor;
 import org.schabi.newpipe.extractor.comments.CommentsExtractor;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.feed.FeedExtractor;
 import org.schabi.newpipe.extractor.kiosk.KioskList;
-import org.schabi.newpipe.extractor.linkhandler.LinkHandler;
-import org.schabi.newpipe.extractor.linkhandler.LinkHandlerFactory;
-import org.schabi.newpipe.extractor.linkhandler.ListLinkHandler;
-import org.schabi.newpipe.extractor.linkhandler.ListLinkHandlerFactory;
-import org.schabi.newpipe.extractor.linkhandler.SearchQueryHandler;
-import org.schabi.newpipe.extractor.linkhandler.SearchQueryHandlerFactory;
+import org.schabi.newpipe.extractor.linkhandler.*;
 import org.schabi.newpipe.extractor.localization.ContentCountry;
 import org.schabi.newpipe.extractor.localization.Localization;
 import org.schabi.newpipe.extractor.localization.TimeAgoParser;
@@ -26,6 +18,8 @@
 import org.schabi.newpipe.extractor.suggestion.SuggestionExtractor;
 
 import javax.annotation.Nullable;
+import java.util.Collections;
+import java.util.List;
 
 /*
  * Copyright (C) Christian Schabesberger 2018 <chris.schabesberger@mailbox.org>
@@ -269,7 +263,7 @@ public StreamExtractor getStreamExtractor(String url) throws ExtractionException
 
     public CommentsExtractor getCommentsExtractor(String url) throws ExtractionException {
         ListLinkHandlerFactory llhf = getCommentsLHFactory();
-        if(null == llhf) {
+        if (llhf == null) {
             return null;
         }
         return getCommentsExtractor(llhf.fromUrl(url));

extractor/src/main/java/org/schabi/newpipe/extractor/channel/ChannelInfoItemsCollector.java

@@ -33,7 +33,7 @@ public ChannelInfoItem extract(ChannelInfoItemExtractor extractor) throws Parsin
         // important information
         int serviceId = getServiceId();
         String name = extractor.getName();
-        String  url = extractor.getUrl();
+        String url = extractor.getUrl();
 
         ChannelInfoItem resultItem = new ChannelInfoItem(serviceId, url, name);
 

extractor/src/main/java/org/schabi/newpipe/extractor/comments/CommentsInfo.java

@@ -1,7 +1,5 @@
 package org.schabi.newpipe.extractor.comments;
 
-import java.io.IOException;
-
 import org.schabi.newpipe.extractor.ListExtractor.InfoItemsPage;
 import org.schabi.newpipe.extractor.ListInfo;
 import org.schabi.newpipe.extractor.NewPipe;
@@ -10,20 +8,21 @@
 import org.schabi.newpipe.extractor.linkhandler.ListLinkHandler;
 import org.schabi.newpipe.extractor.utils.ExtractorHelper;
 
-public class CommentsInfo extends ListInfo<CommentsInfoItem>{
+import java.io.IOException;
+
+public class CommentsInfo extends ListInfo<CommentsInfoItem> {
+
+    private CommentsInfo(int serviceId, ListLinkHandler listUrlIdHandler, String name) {
+        super(serviceId, listUrlIdHandler, name);
+    }
 
-	private CommentsInfo(int serviceId, ListLinkHandler listUrlIdHandler, String name) {
-		super(serviceId, listUrlIdHandler, name);
-		// TODO Auto-generated constructor stub
-	}
-	
-	public static CommentsInfo getInfo(String url) throws IOException, ExtractionException {
+    public static CommentsInfo getInfo(String url) throws IOException, ExtractionException {
         return getInfo(NewPipe.getServiceByUrl(url), url);
     }
 
-	public static CommentsInfo getInfo(StreamingService serviceByUrl, String url) throws ExtractionException, IOException {
-	    return getInfo(serviceByUrl.getCommentsExtractor(url));
-	}
+    public static CommentsInfo getInfo(StreamingService serviceByUrl, String url) throws ExtractionException, IOException {
+        return getInfo(serviceByUrl.getCommentsExtractor(url));
+    }
 
     private static CommentsInfo getInfo(CommentsExtractor commentsExtractor) throws IOException, ExtractionException {
         // for services which do not have a comments extractor
@@ -44,21 +43,21 @@ private static CommentsInfo getInfo(CommentsExtractor commentsExtractor) throws
 
         return commentsInfo;
     }
-    
+
     public static InfoItemsPage<CommentsInfoItem> getMoreItems(CommentsInfo commentsInfo, String pageUrl)
             throws ExtractionException, IOException {
         return getMoreItems(NewPipe.getService(commentsInfo.getServiceId()), commentsInfo, pageUrl);
     }
-    
+
     public static InfoItemsPage<CommentsInfoItem> getMoreItems(StreamingService service, CommentsInfo commentsInfo,
-            String pageUrl) throws IOException, ExtractionException {
+                                                               String pageUrl) throws IOException, ExtractionException {
         if (null == commentsInfo.getCommentsExtractor()) {
             commentsInfo.setCommentsExtractor(service.getCommentsExtractor(commentsInfo.getUrl()));
             commentsInfo.getCommentsExtractor().fetchPage();
         }
         return commentsInfo.getCommentsExtractor().getPage(pageUrl);
     }
-    
+
     private transient CommentsExtractor commentsExtractor;
 
     public CommentsExtractor getCommentsExtractor() {

extractor/src/main/java/org/schabi/newpipe/extractor/kiosk/KioskExtractor.java

@@ -25,7 +25,6 @@
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.linkhandler.ListLinkHandler;
-import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 
 import javax.annotation.Nonnull;
 

extractor/src/main/java/org/schabi/newpipe/extractor/kiosk/KioskList.java

@@ -13,27 +13,30 @@
 import java.util.Map;
 import java.util.Set;
 
-public  class KioskList {
+public class KioskList {
 
     public interface KioskExtractorFactory {
         KioskExtractor createNewKiosk(final StreamingService streamingService,
                                       final String url,
                                       final String kioskId)
-            throws ExtractionException, IOException;
+                throws ExtractionException, IOException;
     }
 
     private final StreamingService service;
     private final HashMap<String, KioskEntry> kioskList = new HashMap<>();
     private String defaultKiosk = null;
 
-    @Nullable private Localization forcedLocalization;
-    @Nullable private ContentCountry forcedContentCountry;
+    @Nullable
+    private Localization forcedLocalization;
+    @Nullable
+    private ContentCountry forcedContentCountry;
 
     private class KioskEntry {
         public KioskEntry(KioskExtractorFactory ef, ListLinkHandlerFactory h) {
             extractorFactory = ef;
             handlerFactory = h;
         }
+
         final KioskExtractorFactory extractorFactory;
         final ListLinkHandlerFactory handlerFactory;
     }
@@ -43,8 +46,8 @@ public KioskList(StreamingService service) {
     }
 
     public void addKioskEntry(KioskExtractorFactory extractorFactory, ListLinkHandlerFactory handlerFactory, String id)
-        throws Exception {
-        if(kioskList.get(id) != null) {
+            throws Exception {
+        if (kioskList.get(id) != null) {
             throw new Exception("Kiosk with type " + id + " already exists.");
         }
         kioskList.put(id, new KioskEntry(extractorFactory, handlerFactory));
@@ -66,10 +69,10 @@ public KioskExtractor getDefaultKioskExtractor(String nextPageUrl)
 
     public KioskExtractor getDefaultKioskExtractor(String nextPageUrl, Localization localization)
             throws ExtractionException, IOException {
-        if(defaultKiosk != null && !defaultKiosk.equals("")) {
+        if (defaultKiosk != null && !defaultKiosk.equals("")) {
             return getExtractorById(defaultKiosk, nextPageUrl, localization);
         } else {
-            if(!kioskList.isEmpty()) {
+            if (!kioskList.isEmpty()) {
                 // if not set get any entry
                 Object[] keySet = kioskList.keySet().toArray();
                 return getExtractorById(keySet[0].toString(), nextPageUrl, localization);
@@ -91,7 +94,7 @@ public KioskExtractor getExtractorById(String kioskId, String nextPageUrl)
     public KioskExtractor getExtractorById(String kioskId, String nextPageUrl, Localization localization)
             throws ExtractionException, IOException {
         KioskEntry ke = kioskList.get(kioskId);
-        if(ke == null) {
+        if (ke == null) {
             throw new ExtractionException("No kiosk found with the type: " + kioskId);
         } else {
             final KioskExtractor kioskExtractor = ke.extractorFactory.createNewKiosk(service,
@@ -109,15 +112,15 @@ public Set<String> getAvailableKiosks() {
     }
 
     public KioskExtractor getExtractorByUrl(String url, String nextPageUrl)
-            throws ExtractionException, IOException{
+            throws ExtractionException, IOException {
         return getExtractorByUrl(url, nextPageUrl, NewPipe.getPreferredLocalization());
     }
 
     public KioskExtractor getExtractorByUrl(String url, String nextPageUrl, Localization localization)
             throws ExtractionException, IOException {
-        for(Map.Entry<String, KioskEntry> e : kioskList.entrySet()) {
+        for (Map.Entry<String, KioskEntry> e : kioskList.entrySet()) {
             KioskEntry ke = e.getValue();
-            if(ke.handlerFactory.acceptUrl(url)) {
+            if (ke.handlerFactory.acceptUrl(url)) {
                 return getExtractorById(ke.handlerFactory.getId(url), nextPageUrl, localization);
             }
         }