fixed: sonar and checkstyle issues.

TeamNewPipe · Mar 19, 2022 · fd6cb44 · fd6cb44
1 parent 69646e5
commit fd6cb44
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 30 deletions.
diff --git a/app/src/main/java/org/schabi/newpipe/player/mediaitem/ExceptionTag.java b/app/src/main/java/org/schabi/newpipe/player/mediaitem/ExceptionTag.java
@@ -87,16 +87,6 @@ public StreamType getStreamType() {
         return item.getStreamType();
     }
 
-    @Override
-    public Optional<StreamInfo> getMaybeStreamInfo() {
-        return Optional.empty();
-    }
-
-    @Override
-    public Optional<Quality> getMaybeQuality() {
-        return Optional.empty();
-    }
-
     @Override
     public <T> Optional<T> getMaybeExtras(@NonNull final Class<T> type) {
         return Optional.ofNullable(extras).map(type::cast);

diff --git a/app/src/main/java/org/schabi/newpipe/player/mediaitem/MediaItemTag.java b/app/src/main/java/org/schabi/newpipe/player/mediaitem/MediaItemTag.java
@@ -44,9 +44,15 @@ public interface MediaItemTag {
 
     StreamType getStreamType();
 
-    Optional<StreamInfo> getMaybeStreamInfo();
+    @NonNull
+    default Optional<StreamInfo> getMaybeStreamInfo() {
+        return Optional.empty();
+    }
 
-    Optional<Quality> getMaybeQuality();
+    @NonNull
+    default Optional<Quality> getMaybeQuality() {
+        return Optional.empty();
+    }
 
     <T> Optional<T> getMaybeExtras(@NonNull Class<T> type);
 
@@ -86,7 +92,7 @@ default MediaItem asMediaItem() {
                 .build();
     }
 
-    class Quality {
+    final class Quality {
         @NonNull
         private final List<VideoStream> sortedVideoStreams;
         private final int selectedVideoStreamIndex;

diff --git a/app/src/main/java/org/schabi/newpipe/player/mediaitem/PlaceholderTag.java b/app/src/main/java/org/schabi/newpipe/player/mediaitem/PlaceholderTag.java
@@ -1,6 +1,5 @@
 package org.schabi.newpipe.player.mediaitem;
 
-import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.extractor.stream.StreamType;
 import org.schabi.newpipe.util.Constants;
 
@@ -74,16 +73,6 @@ public StreamType getStreamType() {
         return StreamType.NONE;
     }
 
-    @Override
-    public Optional<StreamInfo> getMaybeStreamInfo() {
-        return Optional.empty();
-    }
-
-    @Override
-    public Optional<Quality> getMaybeQuality() {
-        return Optional.empty();
-    }
-
     @Override
     public <T> Optional<T> getMaybeExtras(@NonNull final Class<T> type) {
         return Optional.ofNullable(extras).map(type::cast);

diff --git a/app/src/main/java/org/schabi/newpipe/player/mediaitem/StreamInfoTag.java b/app/src/main/java/org/schabi/newpipe/player/mediaitem/StreamInfoTag.java
@@ -91,11 +91,13 @@ public StreamType getStreamType() {
         return streamInfo.getStreamType();
     }
 
+    @NonNull
     @Override
     public Optional<StreamInfo> getMaybeStreamInfo() {
         return Optional.of(streamInfo);
     }
 
+    @NonNull
     @Override
     public Optional<Quality> getMaybeQuality() {
         return Optional.ofNullable(quality);

diff --git a/app/src/main/java/org/schabi/newpipe/player/mediasource/FailedMediaSource.java b/app/src/main/java/org/schabi/newpipe/player/mediasource/FailedMediaSource.java
@@ -22,7 +22,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-public class FailedMediaSource extends CompositeMediaSource<Void> implements ManagedMediaSource {
+public class FailedMediaSource extends CompositeMediaSource<Integer> implements ManagedMediaSource {
     /**
      * Play 2 seconds of silenced audio when a stream fails to resolve due to a known issue,
      * such as {@link org.schabi.newpipe.extractor.exceptions.ExtractionException}.
@@ -104,7 +104,7 @@ protected void prepareSourceInternal(@Nullable final TransferListener mediaTrans
         super.prepareSourceInternal(mediaTransferListener);
         Log.e(TAG, "Loading failed source: ", error);
         if (error instanceof FailedMediaSourceException) {
-            prepareChildSource(null, source);
+            prepareChildSource(0, source);
         }
     }
 
@@ -118,7 +118,7 @@ public void maybeThrowSourceInfoRefreshError() throws IOException {
     }
 
     @Override
-    protected void onChildSourceInfoRefreshed(final Void id,
+    protected void onChildSourceInfoRefreshed(final Integer id,
                                               final MediaSource mediaSource,
                                               final Timeline timeline) {
         refreshSourceInfo(timeline);

diff --git a/app/src/main/java/org/schabi/newpipe/player/mediasource/LoadedMediaSource.java b/app/src/main/java/org/schabi/newpipe/player/mediasource/LoadedMediaSource.java
@@ -14,7 +14,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-public class LoadedMediaSource extends CompositeMediaSource<Void> implements ManagedMediaSource {
+public class LoadedMediaSource extends CompositeMediaSource<Integer> implements ManagedMediaSource {
     private final MediaSource source;
     private final PlayQueueItem stream;
     private final MediaItem mediaItem;
@@ -42,11 +42,11 @@ private boolean isExpired() {
     @Override
     protected void prepareSourceInternal(@Nullable final TransferListener mediaTransferListener) {
         super.prepareSourceInternal(mediaTransferListener);
-        prepareChildSource(null, source);
+        prepareChildSource(0, source);
     }
 
     @Override
-    protected void onChildSourceInfoRefreshed(final Void id,
+    protected void onChildSourceInfoRefreshed(final Integer id,
                                               final MediaSource mediaSource,
                                               final Timeline timeline) {
         refreshSourceInfo(timeline);