Merge pull request #578 from TeamNewPipe/code_improvements

Code improvements

Author: XiangRongLin

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

@@ -4,6 +4,7 @@
 import org.schabi.newpipe.extractor.InfoItemsCollector;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Vector;
 
@@ -95,7 +96,7 @@ public void commit(CommentsInfoItemExtractor extractor) {
     }
 
     public List<CommentsInfoItem> getCommentsInfoItemList() {
-        List<CommentsInfoItem> siiList = new Vector<>();
+        List<CommentsInfoItem> siiList = new ArrayList<>();
         for (InfoItem ii : super.getItems()) {
             if (ii instanceof CommentsInfoItem) {
                 siiList.add((CommentsInfoItem) ii);

extractor/src/main/java/org/schabi/newpipe/extractor/downloader/Response.java

@@ -69,10 +69,8 @@ public String latestUrl() {
     public String getHeader(String name) {
         for (Map.Entry<String, List<String>> headerEntry : responseHeaders.entrySet()) {
             final String key = headerEntry.getKey();
-            if (key != null && key.equalsIgnoreCase(name)) {
-                if (headerEntry.getValue().size() > 0) {
-                    return headerEntry.getValue().get(0);
-                }
+            if (key != null && key.equalsIgnoreCase(name) && !headerEntry.getValue().isEmpty()) {
+                return headerEntry.getValue().get(0);
             }
         }
 

extractor/src/main/java/org/schabi/newpipe/extractor/exceptions/ReCaptchaException.java

@@ -21,7 +21,7 @@
  */
 
 public class ReCaptchaException extends ExtractionException {
-    private String url;
+    private final String url;
 
     public ReCaptchaException(final String message, final String url) {
         super(message);

extractor/src/main/java/org/schabi/newpipe/extractor/linkhandler/SearchQueryHandlerFactory.java

@@ -37,7 +37,7 @@ public SearchQueryHandler fromQuery(String query,
     }
 
     public SearchQueryHandler fromQuery(String query) throws ParsingException {
-        return fromQuery(query, new ArrayList<String>(0), EMPTY_STRING);
+        return fromQuery(query, new ArrayList<>(0), EMPTY_STRING);
     }
 
     /**

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

@@ -106,7 +106,7 @@ public static PlaylistInfo getInfo(PlaylistExtractor extractor) throws Extractio
             info.addError(e);
         }
         // do not fail if everything but the uploader infos could be collected
-        if (uploaderParsingErrors.size() > 0 &&
+        if (!uploaderParsingErrors.isEmpty() &&
                 (!info.getErrors().isEmpty() || uploaderParsingErrors.size() < 3)) {
             info.addAllErrors(uploaderParsingErrors);
         }

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

@@ -87,7 +87,7 @@ public InfoItemsPage<InfoItem> getPage(final Page page) throws IOException, Extr
 
         // Count pages
         final Elements pageLists = d.getElementsByClass("pagelist");
-        if (pageLists.size() == 0)
+        if (pageLists.isEmpty())
             return new InfoItemsPage<>(collector, null);
 
         final Elements pages = pageLists.first().getElementsByTag("li");
@@ -96,7 +96,7 @@ public InfoItemsPage<InfoItem> getPage(final Page page) throws IOException, Extr
         int currentPage = -1;
         for (int i = 0; i < pages.size(); i++) {
             final Element pageElement = pages.get(i);
-            if (pageElement.getElementsByTag("span").size() > 0) {
+            if (!pageElement.getElementsByTag("span").isEmpty()) {
                 currentPage = i + 1;
                 break;
             }

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

@@ -217,7 +217,7 @@ public List<VideoStream> getVideoStreams() throws IOException, ExtractionExcepti
     }
 
     @Override
-    public List<VideoStream> getVideoOnlyStreams() throws IOException, ExtractionException {
+    public List<VideoStream> getVideoOnlyStreams() {
         return null;
     }
 
@@ -251,8 +251,8 @@ public String getErrorMessage() {
 
     @Nonnull
     @Override
-    public String getHost() throws ParsingException {
-        return null;
+    public String getHost() {
+        return "";
     }
 
     @Nonnull

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

@@ -2,8 +2,6 @@
 
 import com.grack.nanojson.JsonArray;
 import com.grack.nanojson.JsonObject;
-import com.grack.nanojson.JsonParser;
-import com.grack.nanojson.JsonParserException;
 import org.schabi.newpipe.extractor.Page;
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.downloader.Downloader;
@@ -18,7 +16,7 @@
 import java.io.IOException;
 
 public class MediaCCCLiveStreamKiosk extends KioskExtractor<StreamInfoItem> {
-    public JsonArray doc;
+    private JsonArray doc;
 
     public MediaCCCLiveStreamKiosk(StreamingService streamingService, ListLinkHandler linkHandler, String kioskId) {
         super(streamingService, linkHandler, kioskId);

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

@@ -12,7 +12,6 @@
 import java.io.IOException;
 import java.time.OffsetDateTime;
 import java.time.format.DateTimeParseException;
-import java.util.Locale;
 import java.util.regex.Pattern;
 
 public final class MediaCCCParsingHelper {

extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/PeertubeService.java

@@ -63,7 +63,7 @@ public ListLinkHandlerFactory getCommentsLHFactory() {
     public SearchExtractor getSearchExtractor(SearchQueryHandler queryHandler) {
         final List<String> contentFilters = queryHandler.getContentFilters();
         boolean external = false;
-        if (contentFilters.size() > 0 && contentFilters.get(0).startsWith("sepia_")) {
+        if (!contentFilters.isEmpty() && contentFilters.get(0).startsWith("sepia_")) {
             external = true;
         }
         return new PeertubeSearchExtractor(this, queryHandler, external);