[#11930] Making CheckStyle happy

Author: tfga

app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java

@@ -399,67 +399,85 @@ public boolean onOptionsItemSelected(final MenuItem item) {
      * @param shareMode Whether the playlist details should be included in the
      *                  shared content.
      */
-    private void sharePlaylist(PlayListShareMode shareMode) {
+    private void sharePlaylist(final PlayListShareMode shareMode) {
         final Context context = requireContext();
 
         disposables.add(playlistManager.getPlaylistStreams(playlistId)
-            .flatMapSingle(playlist -> Single.just(export( shareMode
-                                                         , playlist.stream().map(PlaylistStreamEntry::getStreamEntity)
-                                                         , context
-                                                         )
-            ))
+            .flatMapSingle(playlist -> Single.just(export(
+
+                shareMode,
+                playlist.stream().map(PlaylistStreamEntry::getStreamEntity),
+                context
+            )))
             .observeOn(AndroidSchedulers.mainThread())
-            .subscribe( urlsText -> ShareUtils.shareText( context
-                                                        , name
-                                                        , shareMode == JUST_URLS ? urlsText
-                                                                                 : context.getString(R.string.share_playlist_content_details, name, urlsText))
-                      , throwable -> showUiErrorSnackbar(this, "Sharing playlist", throwable))
-                      );
+            .subscribe(
+                urlsText -> {
+
+                    final String content = shareMode == JUST_URLS
+                        ? urlsText
+                        : context.getString(R.string.share_playlist_content_details,
+                                            name,
+                                            urlsText
+                                           );
+
+                    ShareUtils.shareText(context, name, content);
+                },
+                throwable -> showUiErrorSnackbar(this, "Sharing playlist", throwable)
+            )
+        );
     }
 
-    static String export(PlayListShareMode shareMode, Stream<StreamEntity> entityStream, Context context) {
+    static String export(final PlayListShareMode shareMode,
+                         final Stream<StreamEntity> entityStream,
+                         final Context context) {
 
-        return switch(shareMode) {
+        return switch (shareMode) {
 
             case WITH_TITLES            -> exportWithTitles(entityStream, context);
             case JUST_URLS              -> exportJustUrls(entityStream);
             case YOUTUBE_TEMP_PLAYLIST  -> exportAsYoutubeTempPlaylist(entityStream);
         };
     }
 
-    static String exportWithTitles(Stream<StreamEntity> entityStream, Context context) {
+    static String exportWithTitles(final Stream<StreamEntity> entityStream, final Context context) {
 
         return entityStream
-            .map(entity -> context.getString(R.string.video_details_list_item, entity.getTitle(), entity.getUrl()))
+            .map(entity -> context.getString(R.string.video_details_list_item,
+                                             entity.getTitle(),
+                                             entity.getUrl()
+                                            )
+            )
             .collect(Collectors.joining("\n"));
     }
 
-    static String exportJustUrls(Stream<StreamEntity> entityStream) {
+    static String exportJustUrls(final Stream<StreamEntity> entityStream) {
 
         return entityStream
             .map(StreamEntity::getUrl)
             .collect(Collectors.joining("\n"));
     }
 
-    static String exportAsYoutubeTempPlaylist(Stream<StreamEntity> entityStream) {
+    static String exportAsYoutubeTempPlaylist(final Stream<StreamEntity> entityStream) {
 
-        String videoIDs = entityStream
+        final String videoIDs = entityStream
                 .map(entity -> getYouTubeId(entity.getUrl()))
                 .collect(Collectors.joining(","));
 
         return "http://www.youtube.com/watch_videos?video_ids=" + videoIDs;
     }
 
     /**
-     * Gets the video id from a YouTube URL
+     * Gets the video id from a YouTube URL.
+     *
+     * @param url YouTube URL
+     * @return the video id
      */
-    static String getYouTubeId(String url) {
+    static String getYouTubeId(final String url) {
 
-        HttpUrl httpUrl = HttpUrl.parse(url);
+        final HttpUrl httpUrl = HttpUrl.parse(url);
 
         return httpUrl == null ? null
-                               : httpUrl.queryParameter("v")
-                               ;
+                               : httpUrl.queryParameter("v");
     }
 
     public void removeWatchedStreams(final boolean removePartiallyWatched) {
@@ -924,7 +942,8 @@ private void createShareConfirmationDialog() {
                 .setPositiveButton(R.string.share_playlist_with_titles, (dialog, which) ->
                     sharePlaylist(WITH_TITLES)
                 )
-                .setNeutralButton("Share as YouTube temporary playlist", (dialog, which) -> // TODO R.string.share_playlist_as_YouTube_temporary_playlist
+                // TODO           R.string.share_playlist_as_YouTube_temporary_playlist
+                .setNeutralButton("Share as YouTube temporary playlist", (dialog, which) ->
                     sharePlaylist(YOUTUBE_TEMP_PLAYLIST)
                 )
                 .setNegativeButton(R.string.share_playlist_with_list, (dialog, which) ->

app/src/main/java/org/schabi/newpipe/local/playlist/PlayListShareMode.java

@@ -2,7 +2,7 @@
 
 public enum PlayListShareMode {
 
-    JUST_URLS
-   ,WITH_TITLES
-   ,YOUTUBE_TEMP_PLAYLIST
+    JUST_URLS,
+    WITH_TITLES,
+    YOUTUBE_TEMP_PLAYLIST
 }

app/src/test/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragmentTest.java

@@ -10,37 +10,36 @@
 import org.schabi.newpipe.database.stream.model.StreamEntity;
 import org.schabi.newpipe.extractor.stream.StreamType;
 
-import java.util.List;
 import java.util.stream.Stream;
 
 public class LocalPlaylistFragmentTest {
 
     @Test
-    public void export_asYouTubeTempPlaylist() {
+    public void exportAsYouTubeTempPlaylist() {
 
-        Stream<StreamEntity> entityStream = asStreamEntityStream(
+        final Stream<StreamEntity> entityStream = asStreamEntityStream(
 
-            "https://www.youtube.com/watch?v=1"
-           ,"https://www.youtube.com/watch?v=2"
-           ,"https://www.youtube.com/watch?v=3"
+            "https://www.youtube.com/watch?v=1",
+            "https://www.youtube.com/watch?v=2",
+            "https://www.youtube.com/watch?v=3"
         );
 
-        String url = LocalPlaylistFragment.export(YOUTUBE_TEMP_PLAYLIST, entityStream, null);
+        final String url = LocalPlaylistFragment.export(YOUTUBE_TEMP_PLAYLIST, entityStream, null);
 
         Assert.assertEquals("http://www.youtube.com/watch_videos?video_ids=1,2,3", url);
     }
 
     @Test
-    public void export_justUrls() {
+    public void exportJustUrls() {
 
-        Stream<StreamEntity> entityStream = asStreamEntityStream(
+        final Stream<StreamEntity> entityStream = asStreamEntityStream(
 
-            "https://www.youtube.com/watch?v=1"
-           ,"https://www.youtube.com/watch?v=2"
-           ,"https://www.youtube.com/watch?v=3"
+            "https://www.youtube.com/watch?v=1",
+            "https://www.youtube.com/watch?v=2",
+            "https://www.youtube.com/watch?v=3"
         );
 
-        String exported = LocalPlaylistFragment.export(JUST_URLS, entityStream, null);
+        final String exported = LocalPlaylistFragment.export(JUST_URLS, entityStream, null);
 
         Assert.assertEquals("""
             https://www.youtube.com/watch?v=1
@@ -49,30 +48,30 @@ public void export_justUrls() {
     }
 
     @NonNull
-    private static Stream<StreamEntity> asStreamEntityStream(String... urls) {
+    private static Stream<StreamEntity> asStreamEntityStream(final String... urls) {
 
         return Stream.of(urls)
             .map(LocalPlaylistFragmentTest::newStreamEntity);
     }
 
     @NonNull
-    static StreamEntity newStreamEntity(String url) {
+    static StreamEntity newStreamEntity(final String url) {
 
         return new StreamEntity(
 
-              0
-            , 1
-            , url
-            , "Title"
-            , StreamType.VIDEO_STREAM
-            , 100
-            , "Uploader"
-            , null
-            , null
-            , null
-            , null
-            , null
-            , null
+            0,
+            1,
+            url,
+            "Title",
+            StreamType.VIDEO_STREAM,
+            100,
+            "Uploader",
+            null,
+            null,
+            null,
+            null,
+            null,
+            null
         );
     }
 }