Made code non-nullable (MediaFormatRegistry)

Author: litetex

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

@@ -171,7 +171,7 @@ public List<AudioStream> getAudioStreams() throws IOException, ExtractionExcepti
 
                     return new SimpleAudioStreamImpl(
                             // TODO: This looks wrong
-                            new AudioFormatRegistry().getFromSuffix(dto.getUrlKey()),
+                            new AudioFormatRegistry().getFromSuffixOrThrow(dto.getUrlKey()),
                             deliveryData
                     );
                 })
@@ -196,7 +196,7 @@ public List<VideoAudioStream> getVideoStreams() throws IOException, ExtractionEx
 
                     return new SimpleVideoAudioStreamImpl(
                             // TODO: This looks wrong
-                            new VideoAudioFormatRegistry().getFromSuffix(dto.getUrlKey()),
+                            new VideoAudioFormatRegistry().getFromSuffixOrThrow(dto.getUrlKey()),
                             deliveryData,
                             VideoQualityData.fromHeightWidth(
                                     /*height=*/videoSize.getInt(1, VideoQualityData.UNKNOWN),

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

@@ -98,7 +98,7 @@ public String getUploaderAvatarUrl() {
     public List<AudioStream> getAudioStreams() throws ExtractionException {
         return getRecordingsByMimeType("audio")
                 .map(o -> new SimpleAudioStreamImpl(
-                        new AudioFormatRegistry().getFromMimeType(o.getString("mime_type")),
+                        new AudioFormatRegistry().getFromMimeTypeOrThrow(o.getString("mime_type")),
                         new SimpleProgressiveHTTPDeliveryDataImpl(o.getString("recording_url"))
                 ))
                 .collect(Collectors.toList());
@@ -108,7 +108,8 @@ public List<AudioStream> getAudioStreams() throws ExtractionException {
     public List<VideoAudioStream> getVideoStreams() throws ExtractionException {
         return getRecordingsByMimeType("video")
                 .map(o -> new SimpleVideoAudioStreamImpl(
-                        new VideoAudioFormatRegistry().getFromMimeType(o.getString("mime_type")),
+                        new VideoAudioFormatRegistry()
+                                .getFromMimeTypeOrThrow(o.getString("mime_type")),
                         new SimpleProgressiveHTTPDeliveryDataImpl(o.getString("recording_url")),
                         VideoQualityData.fromHeightWidth(
                                 o.getInt("height", VideoQualityData.UNKNOWN),

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

@@ -403,7 +403,7 @@ private void tryExtractSubtitles() {
                             return new SimpleSubtitleStreamImpl(
                                     // TODO: Check for null
                                     new SubtitleFormatRegistry()
-                                            .getFromSuffix(
+                                            .getFromSuffixOrThrow(
                                                     url.substring(url.lastIndexOf(".") + 1)),
                                     new SimpleProgressiveHTTPDeliveryDataImpl(url),
                                     false,
@@ -498,7 +498,7 @@ private void addStreamsFromArray(
                                 playlistUrl,
                                 (s, dd) -> new SimpleAudioStreamImpl(
                                         new AudioFormatRegistry()
-                                                .getFromSuffix(getExtensionFromStream(s)),
+                                                .getFromSuffixOrThrow(getExtensionFromStream(s)),
                                         dd
                                 )
                         );
@@ -511,7 +511,7 @@ private void addStreamsFromArray(
                                 playlistUrl,
                                 (s, dd) -> new SimpleVideoAudioStreamImpl(
                                         new VideoAudioFormatRegistry()
-                                                .getFromSuffix(getExtensionFromStream(s)),
+                                                .getFromSuffixOrThrow(getExtensionFromStream(s)),
                                         dd,
                                         VideoQualityData.fromHeightFps(
                                                 resJson.getInt("id", VideoQualityData.UNKNOWN),

extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/extractors/SoundcloudStreamExtractor.java

@@ -334,7 +334,7 @@ private Optional<AudioStream> extractDownloadableFileIfAvailable() {
             }
 
             return Optional.of(new SimpleAudioStreamImpl(
-                    new AudioFormatRegistry().getFromSuffix(fileType),
+                    new AudioFormatRegistry().getFromSuffixOrThrow(fileType),
                     new SimpleProgressiveHTTPDeliveryDataImpl(downloadUrl)
             ));
         } catch (final Exception ignored) {

extractor/src/main/java/org/schabi/newpipe/extractor/streamdata/format/registry/MediaFormatRegistry.java

@@ -57,23 +57,29 @@ public String getMimeById(final int id) {
     /**
      * Return the MediaFormat with the supplied mime type
      *
-     * @return MediaFormat associated with this mime type,
-     * or null if none match it.
+     * @return MediaFormat associated with this mime type
+     * @throws IllegalStateException if there is no matching MediaFormat
      */
-    @Nullable
-    public F getFromMimeType(final String mimeType) {
+    @Nonnull
+    public F getFromMimeTypeOrThrow(final String mimeType) {
         return Arrays.stream(values())
                 .filter(mediaFormat -> mediaFormat.mimeType().equals(mimeType))
                 .findFirst()
-                .orElse(null);
+                .orElseThrow(() -> new IllegalStateException("No matching MediaFormat"));
     }
 
-    @Nullable
-    public F getFromSuffix(final String suffix) {
+    /**
+     * Return the MediaFormat with the supplied suffix
+     *
+     * @return MediaFormat associated with this suffix
+     * @throws IllegalStateException if there is no matching MediaFormat
+     */
+    @Nonnull
+    public F getFromSuffixOrThrow(final String suffix) {
         return Arrays.stream(values())
                 .filter(mediaFormat -> mediaFormat.suffix().equals(suffix))
                 .findFirst()
-                .orElse(null);
+                .orElseThrow(() -> new IllegalStateException("No matching MediaFormat"));
     }
 
 }