MightyPork/airsonic-custom
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed unused variables, imports, empty statements (#1361)

Browse Source 
Also some unnecessary whitespace.
This commit is contained in:
Evan Harris
2019-11-03 14:35:53 +01:00
committed by Jonas L
parent 821d8d6b8c
commit a79b56fe5a
7 changed files with 5 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
airsonic-main/src/main/java/org/airsonic/player/ajax/PlayQueueService.java
-7
View File
@@ -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<MusicFolder> 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<PlayQueueInfo.Entry> entries;
airsonic-main/src/main/java/org/airsonic/player/controller/ImportPlaylistController.java
-1
View File
@@ -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);
airsonic-main/src/main/java/org/airsonic/player/controller/InternetRadioSettingsController.java
-1
View File
@@ -64,7 +64,6 @@ public class InternetRadioSettingsController {
public String doPost(HttpServletRequest request, RedirectAttributes redirectAttributes) {
String error = handleParameters(request);
Map<String, Object> map = new HashMap<>();
if (error == null) {
redirectAttributes.addFlashAttribute("settings_toast", true);
redirectAttributes.addFlashAttribute("settings_reload", true);
airsonic-main/src/main/java/org/airsonic/player/io/ShoutCastOutputStream.java
-4
View File
@@ -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.
*/
airsonic-main/src/main/java/org/airsonic/player/service/SettingsService.java
-1
View File
@@ -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 -";
airsonic-main/src/main/java/org/airsonic/player/service/search/DocumentFactory.java
+4 -6
View File
@@ -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.
airsonic-main/src/main/java/org/airsonic/player/service/search/QueryFactory.java
+1 -6
View File
@@ -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();
}
}