Solve some review comments

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

@@ -5,6 +5,7 @@ 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;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.StreamingService;
@@ -80,9 +81,11 @@ public class BandcampRadioStreamExtractor extends BandcampStreamExtractor {
 
     @Nonnull
     @Override
-    public String getUploaderName() {
+    public String getUploaderName() throws ParsingException {
-        return Jsoup.parse(showInfo.getString("image_caption"))
+        return Jsoup.parse(showInfo.getString("image_caption")).getElementsByTag("a").stream()
-                .getElementsByTag("a").first().text();
+                .map(Element::text)
+                .findFirst()
+                .orElseThrow(() -> new ParsingException("Could not get uploader name"));
     }
 
     @Nullable

extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/DeliveryType.java

@@ -4,7 +4,7 @@ package org.schabi.newpipe.extractor.services.youtube;
  * Streaming format types used by YouTube in their streams.
  *
  * <p>
- * It is different of {@link org.schabi.newpipe.extractor.stream.DeliveryMethod delivery methods}!
+ * It is different from {@link org.schabi.newpipe.extractor.stream.DeliveryMethod delivery methods}!
  * </p>
  */
 public enum DeliveryType {

extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/dashmanifestcreators/YoutubeDashManifestCreatorsUtils.java

@@ -83,59 +83,18 @@ public final class YoutubeDashManifestCreatorsUtils {
      */
     public static final String ALR_YES = "&alr=yes";
 
-    /**
+    // XML elements of DASH MPD manifests
-     * Constant which represents the {@code MPD} element of DASH manifests.
+    // see https://www.brendanlong.com/the-structure-of-an-mpeg-dash-mpd.html
-     */
     public static final String MPD = "MPD";
-
-    /**
-     * Constant which represents the {@code Period} element of DASH manifests.
-     */
     public static final String PERIOD = "Period";
-
-    /**
-     * Constant which represents the {@code AdaptationSet} element of DASH manifests.
-     */
     public static final String ADAPTATION_SET = "AdaptationSet";
-
-    /**
-     * Constant which represents the {@code Role} element of DASH manifests.
-     */
     public static final String ROLE = "Role";
-
-    /**
-     * Constant which represents the {@code Representation} element of DASH manifests.
-     */
     public static final String REPRESENTATION = "Representation";
-
-    /**
-     * Constant which represents the {@code AudioChannelConfiguration} element of DASH manifests.
-     */
     public static final String AUDIO_CHANNEL_CONFIGURATION = "AudioChannelConfiguration";
-
-    /**
-     * Constant which represents the {@code SegmentTemplate} element of DASH manifests.
-     */
     public static final String SEGMENT_TEMPLATE = "SegmentTemplate";
-
-    /**
-     * Constant which represents the {@code SegmentTimeline} element of DASH manifests.
-     */
     public static final String SEGMENT_TIMELINE = "SegmentTimeline";
-
-    /**
-     * Constant which represents the {@code SegmentBase} element of DASH manifests.
-     */
     public static final String BASE_URL = "BaseURL";
-
-    /**
-     * Constant which represents the {@code SegmentBase} element of DASH manifests.
-     */
     public static final String SEGMENT_BASE = "SegmentBase";
-
-    /**
-     * Constant which represents the {@code Initialization} element of DASH manifests.
-     */
     public static final String INITIALIZATION = "Initialization";
 
     /**
@@ -665,7 +624,7 @@ public final class YoutubeDashManifestCreatorsUtils {
         if (isHtml5StreamingUrl) {
             baseStreamingUrl += ALR_YES;
         }
-        baseStreamingUrl = appendRnParamAndSqParamIfNeeded(baseStreamingUrl, deliveryType);
+        baseStreamingUrl = appendRnSqParamsIfNeeded(baseStreamingUrl, deliveryType);
 
         final Downloader downloader = NewPipe.getDownloader();
         if (isHtml5StreamingUrl) {
@@ -709,8 +668,8 @@ public final class YoutubeDashManifestCreatorsUtils {
             documentBuilderFactory.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, "");
             documentBuilderFactory.setAttribute(XMLConstants.ACCESS_EXTERNAL_SCHEMA, "");
         } catch (final Exception ignored) {
-            // Ignore exceptions as setting these attributes to secure XML generation is supported
+            // Ignore exceptions as setting these attributes to secure XML generation is not
-            // by all platforms (like the Android implementation)
+            // supported by all platforms (like the Android implementation)
         }
 
         final DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
@@ -736,8 +695,8 @@ public final class YoutubeDashManifestCreatorsUtils {
             transformerFactory.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, "");
             transformerFactory.setAttribute(XMLConstants.ACCESS_EXTERNAL_SCHEMA, "");
         } catch (final Exception ignored) {
-            // Ignore exceptions as setting these attributes to secure XML generation is supported
+            // Ignore exceptions as setting these attributes to secure XML generation is not
-            // by all platforms (like the Android implementation)
+            // supported by all platforms (like the Android implementation)
         }
 
         final Transformer transformer = transformerFactory.newTransformer();
@@ -759,16 +718,10 @@ public final class YoutubeDashManifestCreatorsUtils {
      * @return the base streaming URL to which the param(s) are appended, depending on the
      * {@link DeliveryType} of the stream
      */
-    @SuppressWarnings({"checkstyle:FinalParameters", "checkstyle:FinalLocalVariable"})
     @Nonnull
-    private static String appendRnParamAndSqParamIfNeeded(
+    private static String appendRnSqParamsIfNeeded(@Nonnull final String baseStreamingUrl,
-            @Nonnull String baseStreamingUrl,
                                                    @Nonnull final DeliveryType deliveryType) {
-        if (deliveryType != DeliveryType.PROGRESSIVE) {
+        return baseStreamingUrl + (deliveryType == DeliveryType.PROGRESSIVE ? "" : SQ_0) + RN_0;
-            baseStreamingUrl += SQ_0;
-        }
-
-        return baseStreamingUrl + RN_0;
     }
 
     /**

extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java

@@ -1140,17 +1140,11 @@ public class YoutubeStreamExtractor extends StreamExtractor {
         return videoSecondaryInfoRenderer;
     }
 
-    @FunctionalInterface
-    private interface StreamBuilderHelper<T extends Stream> {
-        @Nonnull
-        T buildStream(ItagInfo itagInfo);
-    }
-
     @Nonnull
     private <T extends Stream> List<T> getItags(
             final String streamingDataKey,
             final ItagItem.ItagType itagTypeWanted,
-            final StreamBuilderHelper<T> streamBuilderHelper,
+            final java.util.function.Function<ItagInfo, T> streamBuilderHelper,
             final String streamTypeExceptionMessage) throws ParsingException {
         try {
             final List<ItagInfo> itagInfos = new ArrayList<>();
@@ -1176,7 +1170,7 @@ public class YoutubeStreamExtractor extends StreamExtractor {
 
             final List<T> streamList = new ArrayList<>();
             for (final ItagInfo itagInfo : itagInfos) {
-                final T stream = streamBuilderHelper.buildStream(itagInfo);
+                final T stream = streamBuilderHelper.apply(itagInfo);
                 if (!Stream.containSimilarStream(stream, streamList)) {
                     streamList.add(stream);
                 }
@@ -1190,8 +1184,8 @@ public class YoutubeStreamExtractor extends StreamExtractor {
     }
 
     /**
-     * Get the {@link StreamBuilderHelper} which will be used to build {@link AudioStream}s in
+     * Get the stream builder helper which will be used to build {@link AudioStream}s in
-     * {@link #getItags(String, ItagItem.ItagType, StreamBuilderHelper, String)}
+     * {@link #getItags(String, ItagItem.ItagType, java.util.function.Function, String)}
      *
      * <p>
      * The {@code StreamBuilderHelper} will set the following attributes in the
@@ -1213,14 +1207,11 @@ public class YoutubeStreamExtractor extends StreamExtractor {
      * Note that the {@link ItagItem} comes from an {@link ItagInfo} instance.
      * </p>
      *
-     * @return a {@link StreamBuilderHelper} to build {@link AudioStream}s
+     * @return a stream builder helper to build {@link AudioStream}s
      */
     @Nonnull
-    private StreamBuilderHelper<AudioStream> getAudioStreamBuilderHelper() {
+    private java.util.function.Function<ItagInfo, AudioStream> getAudioStreamBuilderHelper() {
-        return new StreamBuilderHelper<AudioStream>() {
+        return (itagInfo) -> {
-            @Nonnull
-            @Override
-            public AudioStream buildStream(@Nonnull final ItagInfo itagInfo) {
             final ItagItem itagItem = itagInfo.getItagItem();
             final AudioStream.Builder builder = new AudioStream.Builder()
                     .setId(String.valueOf(itagItem.id))
@@ -1238,13 +1229,12 @@ public class YoutubeStreamExtractor extends StreamExtractor {
             }
 
             return builder.build();
-            }
         };
     }
 
     /**
-     * Get the {@link StreamBuilderHelper} which will be used to build {@link VideoStream}s in
+     * Get the stream builder helper which will be used to build {@link VideoStream}s in
-     * {@link #getItags(String, ItagItem.ItagType, StreamBuilderHelper, String)}
+     * {@link #getItags(String, ItagItem.ItagType, java.util.function.Function, String)}
      *
      * <p>
      * The {@code StreamBuilderHelper} will set the following attributes in the
@@ -1272,17 +1262,14 @@ public class YoutubeStreamExtractor extends StreamExtractor {
      * Note that the {@link ItagItem} comes from an {@link ItagInfo} instance.
      * </p>
      *
-     * @param areStreamsVideoOnly whether the {@link StreamBuilderHelper} will set the video
+     * @param areStreamsVideoOnly whether the stream builder helper will set the video
      *                            streams as video-only streams
-     * @return a {@link StreamBuilderHelper} to build {@link VideoStream}s
+     * @return a stream builder helper to build {@link VideoStream}s
      */
     @Nonnull
-    private StreamBuilderHelper<VideoStream> getVideoStreamBuilderHelper(
+    private java.util.function.Function<ItagInfo, VideoStream> getVideoStreamBuilderHelper(
             final boolean areStreamsVideoOnly) {
-        return new StreamBuilderHelper<VideoStream>() {
+        return (itagInfo) -> {
-            @Nonnull
-            @Override
-            public VideoStream buildStream(@Nonnull final ItagInfo itagInfo) {
             final ItagItem itagItem = itagInfo.getItagItem();
             final VideoStream.Builder builder = new VideoStream.Builder()
                     .setId(String.valueOf(itagItem.id))
@@ -1302,7 +1289,6 @@ public class YoutubeStreamExtractor extends StreamExtractor {
             }
 
             return builder.build();
-            }
         };
     }
 

extractor/src/main/java/org/schabi/newpipe/extractor/stream/StreamInfo.java

@@ -114,7 +114,7 @@ public class StreamInfo extends Info {
         final String name = extractor.getName();
         final int ageLimit = extractor.getAgeLimit();
 
-        // Suppress always-non-null warning as here we double-check it is really not null
+        // Suppress always-non-null warning as here we double-check it really is not null
         //noinspection ConstantConditions
         if (streamType == StreamType.NONE
                 || isNullOrEmpty(url)