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

Remove use useless arrays creation

Browse Source
master
jvoisin 5 years ago committed by GitHub
parent 4679bac08d
commit e085d77635
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 32 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 63
      airsonic-main/src/main/java/org/airsonic/player/dao/UserDao.java

63
airsonic-main/src/main/java/org/airsonic/player/dao/UserDao.java
Unescape View File

@ -164,9 +164,9 @@ public class UserDao extends AbstractDao {
public void updateUser(User user) {
String sql = "update " + getUserTable() + " set password=?, email=?, ldap_authenticated=?, bytes_streamed=?, bytes_downloaded=?, bytes_uploaded=? " +
"where username=?";
getJdbcTemplate().update(sql, new Object[]{encrypt(user.getPassword()), user.getEmail(), user.isLdapAuthenticated(),
getJdbcTemplate().update(sql, encrypt(user.getPassword()), user.getEmail(), user.isLdapAuthenticated(),
user.getBytesStreamed(), user.getBytesDownloaded(), user.getBytesUploaded(),
user.getUsername()});
user.getUsername());
writeRoles(user);
}
@ -204,29 +204,28 @@ public class UserDao extends AbstractDao {
* @param settings The user-specific settings.
*/
public void updateUserSettings(UserSettings settings) {
getJdbcTemplate().update("delete from user_settings where username=?", new Object[]{settings.getUsername()});
getJdbcTemplate().update("delete from user_settings where username=?", settings.getUsername());
String sql = "insert into user_settings (" + USER_SETTINGS_COLUMNS + ") values (" + questionMarks(USER_SETTINGS_COLUMNS) + ')';
String locale = settings.getLocale() == null ? null : settings.getLocale().toString();
UserSettings.Visibility main = settings.getMainVisibility();
UserSettings.Visibility playlist = settings.getPlaylistVisibility();
getJdbcTemplate().update(sql, new Object[]{settings.getUsername(), locale, settings.getThemeId(),
settings.isFinalVersionNotificationEnabled(), settings.isBetaVersionNotificationEnabled(),
settings.isSongNotificationEnabled(), main.isTrackNumberVisible(),
main.isArtistVisible(), main.isAlbumVisible(), main.isGenreVisible(), main.isYearVisible(),
main.isBitRateVisible(), main.isDurationVisible(), main.isFormatVisible(), main.isFileSizeVisible(),
playlist.isTrackNumberVisible(), playlist.isArtistVisible(), playlist.isAlbumVisible(),
playlist.isGenreVisible(), playlist.isYearVisible(), playlist.isBitRateVisible(), playlist.isDurationVisible(),
playlist.isFormatVisible(), playlist.isFileSizeVisible(),
settings.isLastFmEnabled(), settings.getLastFmUsername(), encrypt(settings.getLastFmPassword()),
settings.getTranscodeScheme().name(), settings.isShowNowPlayingEnabled(),
settings.getSelectedMusicFolderId(), settings.isPartyModeEnabled(), settings.isNowPlayingAllowed(),
settings.getAvatarScheme().name(), settings.getSystemAvatarId(), settings.getChanged(),
settings.isShowArtistInfoEnabled(), settings.isAutoHidePlayQueue(),
settings.isViewAsList(), settings.getDefaultAlbumList().getId(), settings.isQueueFollowingSongs(),
settings.isShowSideBar(), settings.getListReloadDelay(), settings.isKeyboardShortcutsEnabled(),
settings.getPaginationSize()
});
getJdbcTemplate().update(sql, settings.getUsername(), locale, settings.getThemeId(),
settings.isFinalVersionNotificationEnabled(), settings.isBetaVersionNotificationEnabled(),
settings.isSongNotificationEnabled(), main.isTrackNumberVisible(),
main.isArtistVisible(), main.isAlbumVisible(), main.isGenreVisible(), main.isYearVisible(),
main.isBitRateVisible(), main.isDurationVisible(), main.isFormatVisible(), main.isFileSizeVisible(),
playlist.isTrackNumberVisible(), playlist.isArtistVisible(), playlist.isAlbumVisible(),
playlist.isGenreVisible(), playlist.isYearVisible(), playlist.isBitRateVisible(), playlist.isDurationVisible(),
playlist.isFormatVisible(), playlist.isFileSizeVisible(),
settings.isLastFmEnabled(), settings.getLastFmUsername(), encrypt(settings.getLastFmPassword()),
settings.getTranscodeScheme().name(), settings.isShowNowPlayingEnabled(),
settings.getSelectedMusicFolderId(), settings.isPartyModeEnabled(), settings.isNowPlayingAllowed(),
settings.getAvatarScheme().name(), settings.getSystemAvatarId(), settings.getChanged(),
settings.isShowArtistInfoEnabled(), settings.isAutoHidePlayQueue(),
settings.isViewAsList(), settings.getDefaultAlbumList().getId(), settings.isQueueFollowingSongs(),
settings.isShowSideBar(), settings.getListReloadDelay(), settings.isKeyboardShortcutsEnabled(),
settings.getPaginationSize());
}
private static String encrypt(String s) {
@ -288,40 +287,40 @@ public class UserDao extends AbstractDao {
private void writeRoles(User user) {
String sql = "delete from user_role where username=?";
getJdbcTemplate().update(sql, new Object[]{user.getUsername()});
getJdbcTemplate().update(sql, user.getUsername());
sql = "insert into user_role (username, role_id) values(?, ?)";
if (user.isAdminRole()) {
getJdbcTemplate().update(sql, new Object[]{user.getUsername(), ROLE_ID_ADMIN});
getJdbcTemplate().update(sql, user.getUsername(), ROLE_ID_ADMIN);
}
if (user.isDownloadRole()) {
getJdbcTemplate().update(sql, new Object[]{user.getUsername(), ROLE_ID_DOWNLOAD});
getJdbcTemplate().update(sql, user.getUsername(), ROLE_ID_DOWNLOAD);
}
if (user.isUploadRole()) {
getJdbcTemplate().update(sql, new Object[]{user.getUsername(), ROLE_ID_UPLOAD});
getJdbcTemplate().update(sql, user.getUsername(), ROLE_ID_UPLOAD);
}
if (user.isPlaylistRole()) {
getJdbcTemplate().update(sql, new Object[]{user.getUsername(), ROLE_ID_PLAYLIST});
getJdbcTemplate().update(sql, user.getUsername(), ROLE_ID_PLAYLIST);
}
if (user.isCoverArtRole()) {
getJdbcTemplate().update(sql, new Object[]{user.getUsername(), ROLE_ID_COVER_ART});
getJdbcTemplate().update(sql, user.getUsername(), ROLE_ID_COVER_ART);
}
if (user.isCommentRole()) {
getJdbcTemplate().update(sql, new Object[]{user.getUsername(), ROLE_ID_COMMENT});
getJdbcTemplate().update(sql, user.getUsername(), ROLE_ID_COMMENT);
}
if (user.isPodcastRole()) {
getJdbcTemplate().update(sql, new Object[]{user.getUsername(), ROLE_ID_PODCAST});
getJdbcTemplate().update(sql, user.getUsername(), ROLE_ID_PODCAST);
}
if (user.isStreamRole()) {
getJdbcTemplate().update(sql, new Object[]{user.getUsername(), ROLE_ID_STREAM});
getJdbcTemplate().update(sql, user.getUsername(), ROLE_ID_STREAM);
}
if (user.isJukeboxRole()) {
getJdbcTemplate().update(sql, new Object[]{user.getUsername(), ROLE_ID_JUKEBOX});
getJdbcTemplate().update(sql, user.getUsername(), ROLE_ID_JUKEBOX);
}
if (user.isSettingsRole()) {
getJdbcTemplate().update(sql, new Object[]{user.getUsername(), ROLE_ID_SETTINGS});
getJdbcTemplate().update(sql, user.getUsername(), ROLE_ID_SETTINGS);
}
if (user.isShareRole()) {
getJdbcTemplate().update(sql, new Object[]{user.getUsername(), ROLE_ID_SHARE});
getJdbcTemplate().update(sql, user.getUsername(), ROLE_ID_SHARE);
}
}

Write Preview
Loading…
Cancel
Save