Remove EMPTY_STRING.

Author: Isira-Seneviratne

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

@@ -6,7 +6,6 @@
 import org.schabi.newpipe.extractor.localization.DateWrapper;
 import org.schabi.newpipe.extractor.services.youtube.extractors.YoutubeCommentsInfoItemExtractor;
 import org.schabi.newpipe.extractor.stream.StreamExtractor;
-import org.schabi.newpipe.extractor.utils.Utils;
 
 import javax.annotation.Nullable;
 
@@ -36,14 +35,14 @@ default int getLikeCount() throws ParsingException {
      * It may be language dependent
      */
     default String getTextualLikeCount() throws ParsingException {
-        return Utils.EMPTY_STRING;
+        return "";
     }
 
     /**
      * The text of the comment
      */
     default String getCommentText() throws ParsingException {
-        return Utils.EMPTY_STRING;
+        return "";
     }
 
     /**
@@ -52,7 +51,7 @@ default String getCommentText() throws ParsingException {
      * @see StreamExtractor#getTextualUploadDate()
      */
     default String getTextualUploadDate() throws ParsingException {
-        return Utils.EMPTY_STRING;
+        return "";
     }
 
     /**
@@ -66,19 +65,19 @@ default DateWrapper getUploadDate() throws ParsingException {
     }
 
     default String getCommentId() throws ParsingException {
-        return Utils.EMPTY_STRING;
+        return "";
     }
 
     default String getUploaderUrl() throws ParsingException {
-        return Utils.EMPTY_STRING;
+        return "";
     }
 
     default String getUploaderName() throws ParsingException {
-        return Utils.EMPTY_STRING;
+        return "";
     }
 
     default String getUploaderAvatarUrl() throws ParsingException {
-        return Utils.EMPTY_STRING;
+        return "";
     }
 
     /**

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

@@ -1,7 +1,5 @@
 package org.schabi.newpipe.extractor.linkhandler;
 
-import static org.schabi.newpipe.extractor.utils.Utils.EMPTY_STRING;
-
 import java.util.Collections;
 import java.util.List;
 
@@ -32,7 +30,7 @@ public ListLinkHandler(final LinkHandler handler) {
                 handler.url,
                 handler.id,
                 Collections.emptyList(),
-                EMPTY_STRING);
+                "");
     }
 
     public List<String> getContentFilters() {

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

@@ -1,7 +1,5 @@
 package org.schabi.newpipe.extractor.linkhandler;
 
-import static org.schabi.newpipe.extractor.utils.Utils.EMPTY_STRING;
-
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 
 import java.util.Collections;
@@ -39,7 +37,7 @@ public SearchQueryHandler fromQuery(final String query,
     }
 
     public SearchQueryHandler fromQuery(final String query) throws ParsingException {
-        return fromQuery(query, Collections.emptyList(), EMPTY_STRING);
+        return fromQuery(query, Collections.emptyList(), "");
     }
 
     /**

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

@@ -8,8 +8,6 @@
 
 import javax.annotation.Nonnull;
 
-import static org.schabi.newpipe.extractor.utils.Utils.EMPTY_STRING;
-
 public abstract class PlaylistExtractor extends ListExtractor<StreamInfoItem> {
 
     public PlaylistExtractor(final StreamingService service, final ListLinkHandler linkHandler) {
@@ -25,29 +23,29 @@ public PlaylistExtractor(final StreamingService service, final ListLinkHandler l
 
     @Nonnull
     public String getThumbnailUrl() throws ParsingException {
-        return EMPTY_STRING;
+        return "";
     }
 
     @Nonnull
     public String getBannerUrl() throws ParsingException {
         // Banner can't be handled by frontend right now.
         // Whoever is willing to implement this should also implement it in the frontend.
-        return EMPTY_STRING;
+        return "";
     }
 
     @Nonnull
     public String getSubChannelName() throws ParsingException {
-        return EMPTY_STRING;
+        return "";
     }
 
     @Nonnull
     public String getSubChannelUrl() throws ParsingException {
-        return EMPTY_STRING;
+        return "";
     }
 
     @Nonnull
     public String getSubChannelAvatarUrl() throws ParsingException {
-        return EMPTY_STRING;
+        return "";
     }
 
     public PlaylistInfo.PlaylistType getPlaylistType() throws ParsingException {

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

@@ -3,7 +3,6 @@
 import static org.schabi.newpipe.extractor.services.bandcamp.extractors.BandcampExtractorHelper.getImageUrl;
 import static org.schabi.newpipe.extractor.services.bandcamp.extractors.BandcampStreamExtractor.getAlbumInfoJson;
 import static org.schabi.newpipe.extractor.utils.JsonUtils.getJsonData;
-import static org.schabi.newpipe.extractor.utils.Utils.EMPTY_STRING;
 import static org.schabi.newpipe.extractor.utils.Utils.HTTPS;
 
 import com.grack.nanojson.JsonArray;
@@ -73,7 +72,7 @@ public void onFetchPage(@Nonnull final Downloader downloader)
     @Override
     public String getThumbnailUrl() throws ParsingException {
         if (albumJson.isNull("art_id")) {
-            return EMPTY_STRING;
+            return "";
         } else {
             return getImageUrl(albumJson.getLong("art_id"), true);
         }
@@ -96,7 +95,7 @@ public String getUploaderAvatarUrl() {
         return document.getElementsByClass("band-photo").stream()
                 .map(element -> element.attr("src"))
                 .findFirst()
-                .orElse(EMPTY_STRING);
+                .orElse("");
     }
 
     @Override

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

@@ -1,9 +1,14 @@
 package org.schabi.newpipe.extractor.services.bandcamp.extractors;
 
+import static org.schabi.newpipe.extractor.services.bandcamp.extractors.BandcampExtractorHelper.BASE_API_URL;
+import static org.schabi.newpipe.extractor.services.bandcamp.extractors.BandcampExtractorHelper.BASE_URL;
+import static org.schabi.newpipe.extractor.services.bandcamp.extractors.BandcampExtractorHelper.getImageUrl;
+
 import com.grack.nanojson.JsonArray;
 import com.grack.nanojson.JsonObject;
 import com.grack.nanojson.JsonParser;
 import com.grack.nanojson.JsonParserException;
+
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Element;
 import org.schabi.newpipe.extractor.MediaFormat;
@@ -20,17 +25,13 @@
 import org.schabi.newpipe.extractor.stream.Description;
 import org.schabi.newpipe.extractor.stream.StreamSegment;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import static org.schabi.newpipe.extractor.services.bandcamp.extractors.BandcampExtractorHelper.BASE_API_URL;
-import static org.schabi.newpipe.extractor.services.bandcamp.extractors.BandcampExtractorHelper.BASE_URL;
-import static org.schabi.newpipe.extractor.services.bandcamp.extractors.BandcampExtractorHelper.getImageUrl;
-import static org.schabi.newpipe.extractor.utils.Utils.EMPTY_STRING;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 public class BandcampRadioStreamExtractor extends BandcampStreamExtractor {
 
@@ -163,14 +164,14 @@ public List<StreamSegment> getStreamSegments() throws ParsingException {
     @Override
     public String getLicence() {
         // Contrary to other Bandcamp streams, radio streams don't have a license
-        return EMPTY_STRING;
+        return "";
     }
 
     @Nonnull
     @Override
     public String getCategory() {
         // Contrary to other Bandcamp streams, radio streams don't have categories
-        return EMPTY_STRING;
+        return "";
     }
 
     @Nonnull

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

@@ -2,29 +2,30 @@
 
 package org.schabi.newpipe.extractor.services.bandcamp.extractors;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
 import org.schabi.newpipe.extractor.InfoItem;
 import org.schabi.newpipe.extractor.MetaInfo;
+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;
-import org.schabi.newpipe.extractor.MultiInfoItemsCollector;
 import org.schabi.newpipe.extractor.search.SearchExtractor;
 import org.schabi.newpipe.extractor.services.bandcamp.extractors.streaminfoitem.BandcampSearchStreamInfoItemExtractor;
-import org.schabi.newpipe.extractor.utils.Utils;
 
-import javax.annotation.Nonnull;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
 
+import javax.annotation.Nonnull;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+
 public class BandcampSearchExtractor extends SearchExtractor {
 
     public BandcampSearchExtractor(final StreamingService service,
@@ -35,7 +36,7 @@ public BandcampSearchExtractor(final StreamingService service,
     @NonNull
     @Override
     public String getSearchSuggestion() {
-        return Utils.EMPTY_STRING;
+        return "";
     }
 
     @Override
@@ -59,7 +60,7 @@ public InfoItemsPage<InfoItem> getPage(final Page page)
                     .flatMap(element -> element.getElementsByClass("itemtype").stream())
                     .map(Element::text)
                     .findFirst()
-                    .orElse(Utils.EMPTY_STRING);
+                    .orElse("");
 
             switch (type) {
                 case "ARTIST":

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

@@ -3,7 +3,6 @@
 package org.schabi.newpipe.extractor.services.bandcamp.extractors;
 
 import static org.schabi.newpipe.extractor.services.bandcamp.extractors.BandcampExtractorHelper.getImageUrl;
-import static org.schabi.newpipe.extractor.utils.Utils.EMPTY_STRING;
 import static org.schabi.newpipe.extractor.utils.Utils.HTTPS;
 
 import com.grack.nanojson.JsonObject;
@@ -28,13 +27,14 @@
 import org.schabi.newpipe.extractor.utils.JsonUtils;
 import org.schabi.newpipe.extractor.utils.Utils;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 public class BandcampStreamExtractor extends StreamExtractor {
     private JsonObject albumJson;
     private JsonObject current;
@@ -118,7 +118,7 @@ public DateWrapper getUploadDate() throws ParsingException {
     @Override
     public String getThumbnailUrl() throws ParsingException {
         if (albumJson.isNull("art_id")) {
-            return EMPTY_STRING;
+            return "";
         }
 
         return getImageUrl(albumJson.getLong("art_id"), true);
@@ -130,7 +130,7 @@ public String getUploaderAvatarUrl() {
         return document.getElementsByClass("band-photo").stream()
                 .map(element -> element.attr("src"))
                 .findFirst()
-                .orElse(Utils.EMPTY_STRING);
+                .orElse("");
     }
 
     @Nonnull
@@ -194,7 +194,7 @@ public String getCategory() {
                 .flatMap(element -> element.getElementsByClass("tag").stream())
                 .map(Element::text)
                 .findFirst()
-                .orElse(EMPTY_STRING);
+                .orElse("");
     }
 
     @Nonnull

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

@@ -1,5 +1,8 @@
 package org.schabi.newpipe.extractor.services.media_ccc.extractors;
 
+import static org.schabi.newpipe.extractor.stream.AudioStream.UNKNOWN_BITRATE;
+import static org.schabi.newpipe.extractor.stream.Stream.ID_UNKNOWN;
+
 import com.grack.nanojson.JsonArray;
 import com.grack.nanojson.JsonObject;
 
@@ -25,10 +28,6 @@
 
 import javax.annotation.Nonnull;
 
-import static org.schabi.newpipe.extractor.stream.AudioStream.UNKNOWN_BITRATE;
-import static org.schabi.newpipe.extractor.stream.Stream.ID_UNKNOWN;
-import static org.schabi.newpipe.extractor.utils.Utils.EMPTY_STRING;
-
 public class MediaCCCLiveStreamExtractor extends StreamExtractor {
     private static final String STREAMS = "streams";
     private static final String URLS = "urls";
@@ -149,9 +148,9 @@ private String getManifestOfDeliveryMethodWanted(@Nonnull final String deliveryM
                 .map(JsonObject.class::cast)
                 .map(streamObject -> streamObject.getObject(URLS))
                 .filter(urls -> urls.has(deliveryMethod))
-                .map(urls -> urls.getObject(deliveryMethod).getString(URL, EMPTY_STRING))
+                .map(urls -> urls.getObject(deliveryMethod).getString(URL, ""))
                 .findFirst()
-                .orElse(EMPTY_STRING);
+                .orElse("");
     }
 
     @Override

extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeCommentsInfoItemExtractor.java

@@ -1,6 +1,7 @@
 package org.schabi.newpipe.extractor.services.peertube.extractors;
 
 import com.grack.nanojson.JsonObject;
+
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.schabi.newpipe.extractor.ServiceList;
@@ -12,8 +13,6 @@
 
 import java.util.Objects;
 
-import static org.schabi.newpipe.extractor.utils.Utils.EMPTY_STRING;
-
 public class PeertubeCommentsInfoItemExtractor implements CommentsInfoItemExtractor {
     private final JsonObject item;
     private final String url;
@@ -66,7 +65,7 @@ public String getCommentText() throws ParsingException {
             final Document doc = Jsoup.parse(htmlText);
             return doc.body().text();
         } catch (final Exception e) {
-            return htmlText.replaceAll("(?s)<[^>]*>(\\s*<[^>]*>)*", EMPTY_STRING);
+            return htmlText.replaceAll("(?s)<[^>]*>(\\s*<[^>]*>)*", "");
         }
     }