Fix bugs and present some in the future

Author: coffeemakr

build.gradle

@@ -13,7 +13,7 @@ dependencies {
     implementation 'com.grack:nanojson:1.1'
     implementation 'org.jsoup:jsoup:1.9.2'
     implementation 'org.mozilla:rhino:1.7.7.1'
-
+    implementation 'com.github.spotbugs:spotbugs:3.1.0'
     testImplementation 'junit:junit:4.12'
 }
 

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

@@ -3,6 +3,8 @@
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import java.io.IOException;
 
 public abstract class Extractor {
@@ -29,6 +31,7 @@ public abstract class Extractor {
      * <p>
      * Is lazily-cleaned by calling {@link #getCleanUrl()}
      */
+    @Nullable
     private String cleanUrl;
 
     public Extractor(StreamingService service, String url) throws ExtractionException {
@@ -41,16 +44,26 @@ public Extractor(StreamingService service, String url) throws ExtractionExceptio
     /**
      * @return a {@link UrlIdHandler} of the current extractor type (e.g. a ChannelExtractor should return a channel url handler).
      */
+    @Nonnull
     protected abstract UrlIdHandler getUrlIdHandler() throws ParsingException;
 
     /**
      * Fetch the current page.
      */
     public abstract void fetchPage() throws IOException, ExtractionException;
 
+    @Nonnull
     public abstract String getId() throws ParsingException;
+
+    /**
+     * Get the name
+     * @return the name
+     * @throws ParsingException if the name cannot be extracted
+     */
+    @Nonnull
     public abstract String getName() throws ParsingException;
 
+    @Nonnull
     public String getOriginalUrl() {
         return originalUrl;
     }
@@ -59,6 +72,7 @@ public String getOriginalUrl() {
      * Get a clean url and as a fallback the original url.
      * @return the clean url or the original url
      */
+    @Nonnull
     public String getCleanUrl() {
         if (cleanUrl != null && !cleanUrl.isEmpty()) return cleanUrl;
 
@@ -72,6 +86,7 @@ public String getCleanUrl() {
         return cleanUrl;
     }
 
+    @Nonnull
     public StreamingService getService() {
         return service;
     }

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

@@ -6,6 +6,7 @@
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 
+import javax.annotation.Nonnull;
 import java.io.IOException;
 
 /*
@@ -34,6 +35,7 @@ public ChannelExtractor(StreamingService service, String url, String nextStreams
         super(service, url, nextStreamsUrl);
     }
 
+    @Nonnull
     @Override
     protected UrlIdHandler getUrlIdHandler() throws ParsingException {
         return getService().getChannelUrlIdHandler();

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

@@ -7,11 +7,9 @@
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
-import org.schabi.newpipe.extractor.stream.StreamInfoItemCollector;
 import org.schabi.newpipe.extractor.utils.ExtractorHelper;
 
 import java.io.IOException;
-import java.util.ArrayList;
 
 /*
  * Created by Christian Schabesberger on 31.07.16.

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

@@ -25,6 +25,7 @@
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 
+import javax.annotation.Nonnull;
 import java.io.IOException;
 
 public abstract class KioskExtractor extends ListExtractor {
@@ -51,6 +52,7 @@ public void setContentCountry(String contentCountry) {
     }
 
 
+    @Nonnull
     @Override
     public String getId() throws ParsingException {
         return id;
@@ -64,6 +66,7 @@ public String getId() throws ParsingException {
      * @return the tranlsated version of id
      * @throws ParsingException
      */
+    @Nonnull
     @Override
     public abstract String getName() throws ParsingException;
 

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

@@ -1,16 +1,13 @@
 package org.schabi.newpipe.extractor.kiosk;
 
 import org.schabi.newpipe.extractor.NewPipe;
-import org.schabi.newpipe.extractor.ServiceList;
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.UrlIdHandler;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 
-import java.io.IOError;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Random;
 import java.util.Set;
 
 public  class KioskList {

src/main/java/org/schabi/newpipe/extractor/playlist/PlaylistExtractor.java

@@ -6,6 +6,7 @@
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 
+import javax.annotation.Nonnull;
 import java.io.IOException;
 
 public abstract class PlaylistExtractor extends ListExtractor {
@@ -14,6 +15,7 @@ public PlaylistExtractor(StreamingService service, String url, String nextStream
         super(service, url, nextStreamsUrl);
     }
 
+    @Nonnull
     @Override
     protected UrlIdHandler getUrlIdHandler() throws ParsingException {
         return getService().getPlaylistUrlIdHandler();

src/main/java/org/schabi/newpipe/extractor/playlist/PlaylistInfo.java

@@ -4,7 +4,6 @@
 import org.schabi.newpipe.extractor.ListExtractor.NextItemsResult;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
-import org.schabi.newpipe.extractor.utils.ExtractorHelper;
 
 import java.io.IOException;
 

src/main/java/org/schabi/newpipe/extractor/search/SearchResult.java

@@ -3,9 +3,9 @@
 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 
+import javax.annotation.Nonnull;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
@@ -32,7 +32,9 @@
 public class SearchResult {
     private final int serviceId;
     public final String suggestion;
+    @Nonnull
     public final List<InfoItem> resultList;
+    @Nonnull
     public final List<Throwable> errors;
 
     public SearchResult(int serviceId, String suggestion, List<InfoItem> results, List<Throwable> errors) {
@@ -66,10 +68,12 @@ public String getSuggestion() {
     }
 
 
+    @Nonnull
     public List<InfoItem> getResults() {
         return Collections.unmodifiableList(resultList);
     }
 
+    @Nonnull
     public List<Throwable> getErrors() {
         return errors;
     }

src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChannelExtractor.java

@@ -11,6 +11,7 @@
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.stream.StreamInfoItemCollector;
 
+import javax.annotation.Nonnull;
 import java.io.IOException;
 
 @SuppressWarnings("WeakerAccess")
@@ -38,16 +39,19 @@ public void fetchPage() throws IOException, ExtractionException {
         }
     }
 
+    @Nonnull
     @Override
     public String getCleanUrl() {
         return user.isString("permalink_url") ? user.getString("permalink_url") : getOriginalUrl();
     }
 
+    @Nonnull
     @Override
     public String getId() {
         return userId;
     }
 
+    @Nonnull
     @Override
     public String getName() {
         return user.getString("username");