diff --git a/airsonic-main/src/main/java/org/airsonic/player/ajax/PlayQueueService.java b/airsonic-main/src/main/java/org/airsonic/player/ajax/PlayQueueService.java index 5a480a3a..c95ae5e0 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/ajax/PlayQueueService.java +++ b/airsonic-main/src/main/java/org/airsonic/player/ajax/PlayQueueService.java @@ -28,8 +28,6 @@ import org.airsonic.player.service.*; import org.airsonic.player.service.PlaylistService; import org.airsonic.player.util.StringUtil; import org.directwebremoting.WebContextFactory; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.servlet.support.RequestContextUtils; @@ -82,8 +80,6 @@ public class PlayQueueService { @Autowired private InternetRadioService internetRadioService; - private static final Logger LOG = LoggerFactory.getLogger(PlayQueueService.class); - /** * Returns the play queue for the player of the current user. * @@ -382,7 +378,6 @@ public class PlayQueueService { HttpServletRequest request = WebContextFactory.get().getHttpServletRequest(); HttpServletResponse response = WebContextFactory.get().getHttpServletResponse(); String username = securityService.getCurrentUsername(request); - UserSettings userSettings = settingsService.getUserSettings(securityService.getCurrentUsername(request)); MusicFolder selectedMusicFolder = settingsService.getSelectedMusicFolder(username); List musicFolders = settingsService.getMusicFoldersForUser(username, @@ -664,8 +659,6 @@ public class PlayQueueService { private PlayQueueInfo convert(HttpServletRequest request, Player player, boolean serverSidePlaylist, int offset) { - String url = NetworkService.getBaseUrl(request); - Locale locale = RequestContextUtils.getLocale(request); PlayQueue playQueue = player.getPlayQueue(); List entries; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/ImportPlaylistController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/ImportPlaylistController.java index 5e055245..a71a5998 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/ImportPlaylistController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/ImportPlaylistController.java @@ -76,7 +76,6 @@ public class ImportPlaylistController { } String playlistName = FilenameUtils.getBaseName(item.getName()); String fileName = FilenameUtils.getName(item.getName()); - String format = StringUtils.lowerCase(FilenameUtils.getExtension(item.getName())); String username = securityService.getCurrentUsername(request); Playlist playlist = playlistService.importPlaylist(username, playlistName, fileName, item.getInputStream(), null); diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/InternetRadioSettingsController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/InternetRadioSettingsController.java index 6a5e12b6..ed48607e 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/InternetRadioSettingsController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/InternetRadioSettingsController.java @@ -64,7 +64,6 @@ public class InternetRadioSettingsController { public String doPost(HttpServletRequest request, RedirectAttributes redirectAttributes) { String error = handleParameters(request); - Map map = new HashMap<>(); if (error == null) { redirectAttributes.addFlashAttribute("settings_toast", true); redirectAttributes.addFlashAttribute("settings_reload", true); diff --git a/airsonic-main/src/main/java/org/airsonic/player/io/ShoutCastOutputStream.java b/airsonic-main/src/main/java/org/airsonic/player/io/ShoutCastOutputStream.java index c8cfbcfe..f1edd27d 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/io/ShoutCastOutputStream.java +++ b/airsonic-main/src/main/java/org/airsonic/player/io/ShoutCastOutputStream.java @@ -23,8 +23,6 @@ import org.airsonic.player.domain.MediaFile; import org.airsonic.player.domain.PlayQueue; import org.airsonic.player.service.SettingsService; import org.apache.commons.lang.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.io.IOException; import java.io.OutputStream; @@ -40,8 +38,6 @@ import java.nio.charset.StandardCharsets; */ public class ShoutCastOutputStream extends OutputStream { - private static final Logger LOG = LoggerFactory.getLogger(ShoutCastOutputStream.class); - /** * Number of bytes between each SHOUTcast metadata block. */ diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/SettingsService.java b/airsonic-main/src/main/java/org/airsonic/player/service/SettingsService.java index 5ee92d33..6f8fd32f 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/SettingsService.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/SettingsService.java @@ -168,7 +168,6 @@ public class SettingsService { private static final int DEFAULT_PODCAST_EPISODE_DOWNLOAD_COUNT = 1; private static final long DEFAULT_DOWNLOAD_BITRATE_LIMIT = 0; private static final long DEFAULT_UPLOAD_BITRATE_LIMIT = 0; - private static final boolean DEFAULT_ENABLE_SEEK = true; private static final String DEFAULT_DOWNSAMPLING_COMMAND = "ffmpeg -i %s -map 0:0 -b:a %bk -v 0 -f mp3 -"; private static final String DEFAULT_HLS_COMMAND = "ffmpeg -ss %o -t %d -i %s -async 1 -b:v %bk -s %wx%h -ar 44100 -ac 2 -v 0 -f mpegts -c:v libx264 -preset superfast -c:a libmp3lame -threads 0 -"; private static final String DEFAULT_JUKEBOX_COMMAND = "ffmpeg -ss %o -i %s -map 0:0 -v 0 -ar 44100 -ac 2 -f s16be -"; diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/search/DocumentFactory.java b/airsonic-main/src/main/java/org/airsonic/player/service/search/DocumentFactory.java index 6c2923e3..cdf7963b 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/search/DocumentFactory.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/search/DocumentFactory.java @@ -85,8 +85,6 @@ public class DocumentFactory { } - ; - private BiConsumer<@NonNull Document, @NonNull Integer> fieldId = (doc, value) -> { doc.add(new StoredField(FieldNames.ID, Integer.toString(value), TYPE_ID)); }; @@ -129,19 +127,19 @@ public class DocumentFactory { public final Term createPrimarykey(Integer id) { return new Term(FieldNames.ID, Integer.toString(id)); - }; + } public final Term createPrimarykey(Album album) { return createPrimarykey(album.getId()); - }; + } public final Term createPrimarykey(Artist artist) { return createPrimarykey(artist.getId()); - }; + } public final Term createPrimarykey(MediaFile mediaFile) { return createPrimarykey(mediaFile.getId()); - }; + } /** * Create a document. diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/search/QueryFactory.java b/airsonic-main/src/main/java/org/airsonic/player/service/search/QueryFactory.java index caacb2ce..b5155868 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/search/QueryFactory.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/search/QueryFactory.java @@ -141,8 +141,7 @@ public class QueryFactory { } return mainQuery.build(); - - }; + } /* * XXX 3.x -> 8.x : @@ -178,7 +177,6 @@ public class QueryFactory { mainQuery.add(folderQuery, Occur.MUST); return mainQuery.build(); - } /** @@ -213,7 +211,6 @@ public class QueryFactory { query.add(toFolderQuery.apply(false, criteria.getMusicFolders()), Occur.MUST); return query.build(); - } /** @@ -255,7 +252,6 @@ public class QueryFactory { } return mainQuery.build(); - } /** @@ -283,5 +279,4 @@ public class QueryFactory { .add(toFolderQuery.apply(true, musicFolders), Occur.SHOULD) .build(); } - }