From 1f1a22fca53927a6daa85448c7b5a076a94b0d4e Mon Sep 17 00:00:00 2001 From: jvoisin Date: Mon, 10 Jun 2019 20:15:32 +0000 Subject: [PATCH] Remove the deprecated getAlphabetialAlbums method --- .../player/controller/SubsonicRESTController.java | 4 ++-- .../java/org/airsonic/player/dao/AlbumDao.java | 14 -------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/SubsonicRESTController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/SubsonicRESTController.java index 0bb22639..fb1773f5 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/SubsonicRESTController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/SubsonicRESTController.java @@ -1138,9 +1138,9 @@ public class SubsonicRESTController { } else if ("newest".equals(type)) { albums = albumDao.getNewestAlbums(offset, size, musicFolders); } else if ("alphabeticalByArtist".equals(type)) { - albums = albumDao.getAlphabetialAlbums(offset, size, true, musicFolders); + albums = albumDao.getAlphabeticalAlbums(offset, size, true, false, musicFolders); } else if ("alphabeticalByName".equals(type)) { - albums = albumDao.getAlphabetialAlbums(offset, size, false, musicFolders); + albums = albumDao.getAlphabeticalAlbums(offset, size, false, false, musicFolders); } else if ("byGenre".equals(type)) { albums = albumDao.getAlbumsByGenre(offset, size, getRequiredStringParameter(request, "genre"), musicFolders); } else if ("byYear".equals(type)) { diff --git a/airsonic-main/src/main/java/org/airsonic/player/dao/AlbumDao.java b/airsonic-main/src/main/java/org/airsonic/player/dao/AlbumDao.java index 71b73cc0..8ea89923 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/dao/AlbumDao.java +++ b/airsonic-main/src/main/java/org/airsonic/player/dao/AlbumDao.java @@ -147,20 +147,6 @@ public class AlbumDao extends AbstractDao { album.setId(id); } - /** - * Returns albums in alphabetical order. - * - * @param offset Number of albums to skip. - * @param count Maximum number of albums to return. - * @param byArtist Whether to sort by artist name - * @param musicFolders Only return albums from these folders. - * @return Albums in alphabetical order. - */ - @Deprecated - public List getAlphabetialAlbums(final int offset, final int count, boolean byArtist, final List musicFolders) { - return getAlphabeticalAlbums(offset, count, byArtist, false, musicFolders); - } - /** * Returns albums in alphabetical order. *