diff --git a/airsonic-main/src/main/java/org/airsonic/player/Application.java b/airsonic-main/src/main/java/org/airsonic/player/Application.java
index 206a102e..fc9f45e2 100644
--- a/airsonic-main/src/main/java/org/airsonic/player/Application.java
+++ b/airsonic-main/src/main/java/org/airsonic/player/Application.java
@@ -36,7 +36,7 @@ import java.lang.reflect.Method;
         MultipartAutoConfiguration.class, // TODO: update to use spring boot builtin multipart support
         LiquibaseAutoConfiguration.class})
 @Configuration
-@ImportResource(value = {"classpath:/applicationContext-service.xml",
+@ImportResource({"classpath:/applicationContext-service.xml",
         "classpath:/applicationContext-cache.xml",
         "classpath:/applicationContext-sonos.xml",
         "classpath:/servlet.xml"})
diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/CoverArtController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/CoverArtController.java
index 167f2b7d..db03bab6 100644
--- a/airsonic-main/src/main/java/org/airsonic/player/controller/CoverArtController.java
+++ b/airsonic-main/src/main/java/org/airsonic/player/controller/CoverArtController.java
@@ -59,7 +59,7 @@ import java.util.concurrent.Semaphore;
  * @author Sindre Mehus
  */
 @Controller
-@RequestMapping(value = {"/coverArt", "/ext/coverArt"})
+@RequestMapping({"/coverArt", "/ext/coverArt"})
 public class CoverArtController implements LastModified {
 
     public static final String ALBUM_COVERART_PREFIX = "al-";
diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/ExternalPlayerController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/ExternalPlayerController.java
index 090b1e4b..0d731ff8 100644
--- a/airsonic-main/src/main/java/org/airsonic/player/controller/ExternalPlayerController.java
+++ b/airsonic-main/src/main/java/org/airsonic/player/controller/ExternalPlayerController.java
@@ -48,7 +48,7 @@ import java.util.stream.Collectors;
  * @author Sindre Mehus
  */
 @Controller
-@RequestMapping(value = {"/ext/share/**"})
+@RequestMapping("/ext/share/**")
 public class ExternalPlayerController {
 
     private static final Logger LOG = LoggerFactory.getLogger(ExternalPlayerController.class);
diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/HLSController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/HLSController.java
index 5fee4bb7..add23b51 100644
--- a/airsonic-main/src/main/java/org/airsonic/player/controller/HLSController.java
+++ b/airsonic-main/src/main/java/org/airsonic/player/controller/HLSController.java
@@ -50,8 +50,8 @@ import java.util.regex.Pattern;
  *
  * @author Sindre Mehus
  */
-@Controller(value = "hlsController")
-@RequestMapping(value = {"/hls/**", "/ext/hls/**"})
+@Controller("hlsController")
+@RequestMapping({"/hls/**", "/ext/hls/**"})
 public class HLSController {
 
     private static final int SEGMENT_DURATION = 10;
diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/RandomPlayQueueController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/RandomPlayQueueController.java
index 995c78be..3a591efb 100644
--- a/airsonic-main/src/main/java/org/airsonic/player/controller/RandomPlayQueueController.java
+++ b/airsonic-main/src/main/java/org/airsonic/player/controller/RandomPlayQueueController.java
@@ -62,7 +62,7 @@ public class RandomPlayQueueController {
             ModelMap model,
             HttpServletRequest request,
             HttpServletResponse response,
-            @RequestParam(value = "size") Integer size,
+            @RequestParam("size") Integer size,
             @RequestParam(value = "genre", required = false) String genre,
             @RequestParam(value = "year", required = false) String year,
             @RequestParam(value = "songRating", required = false) String songRating,
diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/StreamController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/StreamController.java
index 4c07a433..93b984db 100644
--- a/airsonic-main/src/main/java/org/airsonic/player/controller/StreamController.java
+++ b/airsonic-main/src/main/java/org/airsonic/player/controller/StreamController.java
@@ -58,7 +58,7 @@ import java.util.regex.Pattern;
  * @author Sindre Mehus
  */
 @Controller
-@RequestMapping(value = {"/stream/**", "/ext/stream/**"})
+@RequestMapping({"/stream/**", "/ext/stream/**"})
 public class StreamController {
 
     private static final Logger LOG = LoggerFactory.getLogger(StreamController.class);
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 9b7969ec..723d41d9 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
@@ -149,7 +149,7 @@ public class SubsonicRESTController {
         error(request, response, ErrorCode.MISSING_PARAMETER, "Required param (" + exception.getParameterName() + ") is missing");
     }
 
-    @RequestMapping(value = "/ping")
+    @RequestMapping("/ping")
     public void ping(HttpServletRequest request, HttpServletResponse response) throws Exception {
         Response res = createResponse();
         jaxbWriter.writeResponse(request, response, res);
@@ -159,7 +159,7 @@ public class SubsonicRESTController {
     /**
      * CAUTION : this method is required by mobile applications and must not be removed.
      */
-    @RequestMapping(value = "/getLicense")
+    @RequestMapping("/getLicense")
     public void getLicense(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
         License license = new License();
@@ -178,7 +178,7 @@ public class SubsonicRESTController {
     }
 
 
-    @RequestMapping(value = "/getMusicFolders")
+    @RequestMapping("/getMusicFolders")
     public void getMusicFolders(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
 
@@ -195,7 +195,7 @@ public class SubsonicRESTController {
         jaxbWriter.writeResponse(request, response, res);
     }
 
-    @RequestMapping(value = "/getIndexes")
+    @RequestMapping("/getIndexes")
     public void getIndexes(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
         Response res = createResponse();
@@ -265,7 +265,7 @@ public class SubsonicRESTController {
         jaxbWriter.writeResponse(request, response, res);
     }
 
-    @RequestMapping(value = "/getGenres")
+    @RequestMapping("/getGenres")
     public void getGenres(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
         org.subsonic.restapi.Genres genres = new org.subsonic.restapi.Genres();
@@ -282,7 +282,7 @@ public class SubsonicRESTController {
         jaxbWriter.writeResponse(request, response, res);
     }
 
-    @RequestMapping(value = "/getSongsByGenre")
+    @RequestMapping("/getSongsByGenre")
     public void getSongsByGenre(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
         Player player = playerService.getPlayer(request, response);
@@ -305,7 +305,7 @@ public class SubsonicRESTController {
         jaxbWriter.writeResponse(request, response, res);
     }
 
-    @RequestMapping(value = "/getArtists")
+    @RequestMapping("/getArtists")
     public void getArtists(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
         String username = securityService.getCurrentUsername(request);
@@ -330,7 +330,7 @@ public class SubsonicRESTController {
         jaxbWriter.writeResponse(request, response, res);
     }
 
-    @RequestMapping(value = "/getSimilarSongs")
+    @RequestMapping("/getSimilarSongs")
     public void getSimilarSongs(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
         String username = securityService.getCurrentUsername(request);
@@ -357,7 +357,7 @@ public class SubsonicRESTController {
         jaxbWriter.writeResponse(request, response, res);
     }
 
-    @RequestMapping(value = "/getSimilarSongs2")
+    @RequestMapping("/getSimilarSongs2")
     public void getSimilarSongs2(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
         String username = securityService.getCurrentUsername(request);
@@ -385,7 +385,7 @@ public class SubsonicRESTController {
         jaxbWriter.writeResponse(request, response, res);
     }
 
-    @RequestMapping(value = "/getTopSongs")
+    @RequestMapping("/getTopSongs")
     public void getTopSongs(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
         String username = securityService.getCurrentUsername(request);
@@ -407,7 +407,7 @@ public class SubsonicRESTController {
         jaxbWriter.writeResponse(request, response, res);
     }
 
-    @RequestMapping(value = "/getArtistInfo")
+    @RequestMapping("/getArtistInfo")
     public void getArtistInfo(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
         String username = securityService.getCurrentUsername(request);
@@ -443,7 +443,7 @@ public class SubsonicRESTController {
         jaxbWriter.writeResponse(request, response, res);
     }
 
-    @RequestMapping(value = "/getArtistInfo2")
+    @RequestMapping("/getArtistInfo2")
     public void getArtistInfo2(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
         String username = securityService.getCurrentUsername(request);
@@ -500,7 +500,7 @@ public class SubsonicRESTController {
         return result;
     }
 
-    @RequestMapping(value = "/getArtist")
+    @RequestMapping("/getArtist")
     public void getArtist(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
 
@@ -563,7 +563,7 @@ public class SubsonicRESTController {
         return jaxbPlaylist;
     }
 
-    @RequestMapping(value = "/getAlbum")
+    @RequestMapping("/getAlbum")
     public void getAlbum(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
         Player player = playerService.getPlayer(request, response);
@@ -586,7 +586,7 @@ public class SubsonicRESTController {
         jaxbWriter.writeResponse(request, response, res);
     }
 
-    @RequestMapping(value = "/getSong")
+    @RequestMapping("/getSong")
     public void getSong(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
         Player player = playerService.getPlayer(request, response);
@@ -608,7 +608,7 @@ public class SubsonicRESTController {
         jaxbWriter.writeResponse(request, response, res);
     }
 
-    @RequestMapping(value = "/getMusicDirectory")
+    @RequestMapping("/getMusicDirectory")
     public void getMusicDirectory(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
         Player player = playerService.getPlayer(request, response);
@@ -653,7 +653,7 @@ public class SubsonicRESTController {
         jaxbWriter.writeResponse(request, response, res);
     }
 
-    @RequestMapping(value = "/search")
+    @RequestMapping("/search")
     public void search(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
         Player player = playerService.getPlayer(request, response);
@@ -697,7 +697,7 @@ public class SubsonicRESTController {
         jaxbWriter.writeResponse(request, response, res);
     }
 
-    @RequestMapping(value = "/search2")
+    @RequestMapping("/search2")
     public void search2(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
         Player player = playerService.getPlayer(request, response);
@@ -736,7 +736,7 @@ public class SubsonicRESTController {
         jaxbWriter.writeResponse(request, response, res);
     }
 
-    @RequestMapping(value = "/search3")
+    @RequestMapping("/search3")
     public void search3(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
         Player player = playerService.getPlayer(request, response);
@@ -775,7 +775,7 @@ public class SubsonicRESTController {
         jaxbWriter.writeResponse(request, response, res);
     }
 
-    @RequestMapping(value = "/getPlaylists")
+    @RequestMapping("/getPlaylists")
     public void getPlaylists(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
 
@@ -801,7 +801,7 @@ public class SubsonicRESTController {
         jaxbWriter.writeResponse(request, response, res);
     }
 
-    @RequestMapping(value = "/getPlaylist")
+    @RequestMapping("/getPlaylist")
     public void getPlaylist(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
         Player player = playerService.getPlayer(request, response);
@@ -830,7 +830,7 @@ public class SubsonicRESTController {
         jaxbWriter.writeResponse(request, response, res);
     }
 
-    @RequestMapping(value = "/jukeboxControl")
+    @RequestMapping("/jukeboxControl")
     public void jukeboxControl(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request, true);
 
@@ -928,7 +928,7 @@ public class SubsonicRESTController {
         jaxbWriter.writeResponse(request, response, res);
     }
 
-    @RequestMapping(value = "/createPlaylist")
+    @RequestMapping("/createPlaylist")
     public void createPlaylist(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request, true);
         String username = securityService.getCurrentUsername(request);
@@ -973,7 +973,7 @@ public class SubsonicRESTController {
         writeEmptyResponse(request, response);
     }
 
-    @RequestMapping(value = "/updatePlaylist")
+    @RequestMapping("/updatePlaylist")
     public void updatePlaylist(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request, true);
         String username = securityService.getCurrentUsername(request);
@@ -1041,7 +1041,7 @@ public class SubsonicRESTController {
         writeEmptyResponse(request, response);
     }
 
-    @RequestMapping(value = "/deletePlaylist")
+    @RequestMapping("/deletePlaylist")
     public void deletePlaylist(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request, true);
         String username = securityService.getCurrentUsername(request);
@@ -1061,7 +1061,7 @@ public class SubsonicRESTController {
         writeEmptyResponse(request, response);
     }
 
-    @RequestMapping(value = "/getAlbumList")
+    @RequestMapping("/getAlbumList")
     public void getAlbumList(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
         Player player = playerService.getPlayer(request, response);
@@ -1112,7 +1112,7 @@ public class SubsonicRESTController {
         jaxbWriter.writeResponse(request, response, res);
     }
 
-    @RequestMapping(value = "/getAlbumList2")
+    @RequestMapping("/getAlbumList2")
     public void getAlbumList2(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
 
@@ -1156,7 +1156,7 @@ public class SubsonicRESTController {
         jaxbWriter.writeResponse(request, response, res);
     }
 
-    @RequestMapping(value = "/getRandomSongs")
+    @RequestMapping("/getRandomSongs")
     public void getRandomSongs(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
         Player player = playerService.getPlayer(request, response);
@@ -1180,7 +1180,7 @@ public class SubsonicRESTController {
         jaxbWriter.writeResponse(request, response, res);
     }
 
-    @RequestMapping(value = "/getVideos")
+    @RequestMapping("/getVideos")
     public void getVideos(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
         Player player = playerService.getPlayer(request, response);
@@ -1199,7 +1199,7 @@ public class SubsonicRESTController {
         jaxbWriter.writeResponse(request, response, res);
     }
 
-    @RequestMapping(value = "/getNowPlaying")
+    @RequestMapping("/getNowPlaying")
     public void getNowPlaying(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
         NowPlaying result = new NowPlaying();
@@ -1348,7 +1348,7 @@ public class SubsonicRESTController {
         return null;
     }
 
-    @RequestMapping(value = "/download")
+    @RequestMapping("/download")
     public void download(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
         org.airsonic.player.domain.User user = securityService.getCurrentUser(request);
@@ -1372,7 +1372,7 @@ public class SubsonicRESTController {
         downloadController.handleRequest(request, response);
     }
 
-    @RequestMapping(value = "/stream")
+    @RequestMapping("/stream")
     public void stream(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
         org.airsonic.player.domain.User user = securityService.getCurrentUser(request);
@@ -1384,7 +1384,7 @@ public class SubsonicRESTController {
         streamController.handleRequest(request, response);
     }
 
-    @RequestMapping(value = "/hls")
+    @RequestMapping("/hls")
     public void hls(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
         org.airsonic.player.domain.User user = securityService.getCurrentUser(request);
@@ -1405,7 +1405,7 @@ public class SubsonicRESTController {
         hlsController.handleRequest(request, response);
     }
 
-    @RequestMapping(value = "/scrobble")
+    @RequestMapping("/scrobble")
     public void scrobble(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
 
@@ -1438,12 +1438,12 @@ public class SubsonicRESTController {
         writeEmptyResponse(request, response);
     }
 
-    @RequestMapping(value = "/star")
+    @RequestMapping("/star")
     public void star(HttpServletRequest request, HttpServletResponse response) throws Exception {
         starOrUnstar(request, response, true);
     }
 
-    @RequestMapping(value = "/unstar")
+    @RequestMapping("/unstar")
     public void unstar(HttpServletRequest request, HttpServletResponse response) throws Exception {
         starOrUnstar(request, response, false);
     }
@@ -1492,7 +1492,7 @@ public class SubsonicRESTController {
         writeEmptyResponse(request, response);
     }
 
-    @RequestMapping(value = "/getStarred")
+    @RequestMapping("/getStarred")
     public void getStarred(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
         Player player = playerService.getPlayer(request, response);
@@ -1515,7 +1515,7 @@ public class SubsonicRESTController {
         jaxbWriter.writeResponse(request, response, res);
     }
 
-    @RequestMapping(value = "/getStarred2")
+    @RequestMapping("/getStarred2")
     public void getStarred2(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
         Player player = playerService.getPlayer(request, response);
@@ -1538,7 +1538,7 @@ public class SubsonicRESTController {
         jaxbWriter.writeResponse(request, response, res);
     }
 
-    @RequestMapping(value = "/getPodcasts")
+    @RequestMapping("/getPodcasts")
     public void getPodcasts(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
         Player player = playerService.getPlayer(request, response);
@@ -1576,7 +1576,7 @@ public class SubsonicRESTController {
         jaxbWriter.writeResponse(request, response, res);
     }
 
-    @RequestMapping(value = "/getNewestPodcasts")
+    @RequestMapping("/getNewestPodcasts")
     public void getNewestPodcasts(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
         Player player = playerService.getPlayer(request, response);
@@ -1613,7 +1613,7 @@ public class SubsonicRESTController {
         return e;
     }
 
-    @RequestMapping(value = "/refreshPodcasts")
+    @RequestMapping("/refreshPodcasts")
     public void refreshPodcasts(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
         org.airsonic.player.domain.User user = securityService.getCurrentUser(request);
@@ -1625,7 +1625,7 @@ public class SubsonicRESTController {
         writeEmptyResponse(request, response);
     }
 
-    @RequestMapping(value = "/createPodcastChannel")
+    @RequestMapping("/createPodcastChannel")
     public void createPodcastChannel(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
         org.airsonic.player.domain.User user = securityService.getCurrentUser(request);
@@ -1639,7 +1639,7 @@ public class SubsonicRESTController {
         writeEmptyResponse(request, response);
     }
 
-    @RequestMapping(value = "/deletePodcastChannel")
+    @RequestMapping("/deletePodcastChannel")
     public void deletePodcastChannel(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
         org.airsonic.player.domain.User user = securityService.getCurrentUser(request);
@@ -1653,7 +1653,7 @@ public class SubsonicRESTController {
         writeEmptyResponse(request, response);
     }
 
-    @RequestMapping(value = "/deletePodcastEpisode")
+    @RequestMapping("/deletePodcastEpisode")
     public void deletePodcastEpisode(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
         org.airsonic.player.domain.User user = securityService.getCurrentUser(request);
@@ -1667,7 +1667,7 @@ public class SubsonicRESTController {
         writeEmptyResponse(request, response);
     }
 
-    @RequestMapping(value = "/downloadPodcastEpisode")
+    @RequestMapping("/downloadPodcastEpisode")
     public void downloadPodcastEpisode(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
         org.airsonic.player.domain.User user = securityService.getCurrentUser(request);
@@ -1687,7 +1687,7 @@ public class SubsonicRESTController {
         writeEmptyResponse(request, response);
     }
 
-    @RequestMapping(value = "/getInternetRadioStations")
+    @RequestMapping("/getInternetRadioStations")
     public void getInternetRadioStations(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
 
@@ -1705,7 +1705,7 @@ public class SubsonicRESTController {
         jaxbWriter.writeResponse(request, response, res);
     }
 
-    @RequestMapping(value = "/getBookmarks")
+    @RequestMapping("/getBookmarks")
     public void getBookmarks(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
         Player player = playerService.getPlayer(request, response);
@@ -1730,7 +1730,7 @@ public class SubsonicRESTController {
         jaxbWriter.writeResponse(request, response, res);
     }
 
-    @RequestMapping(value = "/createBookmark")
+    @RequestMapping("/createBookmark")
     public void createBookmark(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
         String username = securityService.getCurrentUsername(request);
@@ -1744,7 +1744,7 @@ public class SubsonicRESTController {
         writeEmptyResponse(request, response);
     }
 
-    @RequestMapping(value = "/deleteBookmark")
+    @RequestMapping("/deleteBookmark")
     public void deleteBookmark(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
 
@@ -1755,7 +1755,7 @@ public class SubsonicRESTController {
         writeEmptyResponse(request, response);
     }
 
-    @RequestMapping(value = "/getPlayQueue")
+    @RequestMapping("/getPlayQueue")
     public void getPlayQueue(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
         String username = securityService.getCurrentUsername(request);
@@ -1786,7 +1786,7 @@ public class SubsonicRESTController {
         jaxbWriter.writeResponse(request, response, res);
     }
 
-    @RequestMapping(value = "/savePlayQueue")
+    @RequestMapping("/savePlayQueue")
     public void savePlayQueue(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
         String username = securityService.getCurrentUsername(request);
@@ -1806,7 +1806,7 @@ public class SubsonicRESTController {
         writeEmptyResponse(request, response);
     }
 
-    @RequestMapping(value = "/getShares")
+    @RequestMapping("/getShares")
     public void getShares(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
         Player player = playerService.getPlayer(request, response);
@@ -1828,7 +1828,7 @@ public class SubsonicRESTController {
         jaxbWriter.writeResponse(request, response, res);
     }
 
-    @RequestMapping(value = "/createShare")
+    @RequestMapping("/createShare")
     public void createShare(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
         Player player = playerService.getPlayer(request, response);
@@ -1868,7 +1868,7 @@ public class SubsonicRESTController {
         jaxbWriter.writeResponse(request, response, res);
     }
 
-    @RequestMapping(value = "/deleteShare")
+    @RequestMapping("/deleteShare")
     public void deleteShare(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
         org.airsonic.player.domain.User user = securityService.getCurrentUser(request);
@@ -1888,7 +1888,7 @@ public class SubsonicRESTController {
         writeEmptyResponse(request, response);
     }
 
-    @RequestMapping(value = "/updateShare")
+    @RequestMapping("/updateShare")
     public void updateShare(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
         org.airsonic.player.domain.User user = securityService.getCurrentUser(request);
@@ -1927,19 +1927,19 @@ public class SubsonicRESTController {
         return result;
     }
 
-    @RequestMapping(value = "/getCoverArt")
+    @RequestMapping("/getCoverArt")
     public void getCoverArt(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
         coverArtController.handleRequest(request, response);
     }
 
-    @RequestMapping(value = "/getAvatar")
+    @RequestMapping("/getAvatar")
     public void getAvatar(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
         avatarController.handleRequest(request, response);
     }
 
-    @RequestMapping(value = "/changePassword")
+    @RequestMapping("/changePassword")
     public void changePassword(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
 
@@ -1963,7 +1963,7 @@ public class SubsonicRESTController {
         writeEmptyResponse(request, response);
     }
 
-    @RequestMapping(value = "/getUser")
+    @RequestMapping("/getUser")
     public void getUser(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
 
@@ -1986,7 +1986,7 @@ public class SubsonicRESTController {
         jaxbWriter.writeResponse(request, response, res);
     }
 
-    @RequestMapping(value = "/getUsers")
+    @RequestMapping("/getUsers")
     public void getUsers(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
 
@@ -2041,7 +2041,7 @@ public class SubsonicRESTController {
         return result;
     }
 
-    @RequestMapping(value = "/createUser")
+    @RequestMapping("/createUser")
     public void createUser(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
         org.airsonic.player.domain.User user = securityService.getCurrentUser(request);
@@ -2077,7 +2077,7 @@ public class SubsonicRESTController {
         writeEmptyResponse(request, response);
     }
 
-    @RequestMapping(value = "/updateUser")
+    @RequestMapping("/updateUser")
     public void updateUser(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
         org.airsonic.player.domain.User user = securityService.getCurrentUser(request);
@@ -2135,7 +2135,7 @@ public class SubsonicRESTController {
         return request.getParameter(name) != null;
     }
 
-    @RequestMapping(value = "/deleteUser")
+    @RequestMapping("/deleteUser")
     public void deleteUser(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
         org.airsonic.player.domain.User user = securityService.getCurrentUser(request);
@@ -2155,17 +2155,17 @@ public class SubsonicRESTController {
         writeEmptyResponse(request, response);
     }
 
-    @RequestMapping(value = "/getChatMessages")
+    @RequestMapping("/getChatMessages")
     public ResponseEntity<String> getChatMessages(HttpServletRequest request, HttpServletResponse response) {
         return ResponseEntity.status(HttpStatus.SC_GONE).body(NO_LONGER_SUPPORTED);
     }
 
-    @RequestMapping(value = "/addChatMessage")
+    @RequestMapping("/addChatMessage")
     public ResponseEntity<String> addChatMessage(HttpServletRequest request, HttpServletResponse response) {
         return ResponseEntity.status(HttpStatus.SC_GONE).body(NO_LONGER_SUPPORTED);
     }
 
-    @RequestMapping(value = "/getLyrics")
+    @RequestMapping("/getLyrics")
     public void getLyrics(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
         String artist = request.getParameter("artist");
@@ -2182,7 +2182,7 @@ public class SubsonicRESTController {
         jaxbWriter.writeResponse(request, response, res);
     }
 
-    @RequestMapping(value = "/setRating")
+    @RequestMapping("/setRating")
     public void setRating(HttpServletRequest request, HttpServletResponse response) throws Exception {
         request = wrapRequest(request);
         Integer rating = getRequiredIntParameter(request, "rating");
@@ -2255,24 +2255,24 @@ public class SubsonicRESTController {
         return result;
     }
 
-    @RequestMapping(value = "/getVideoInfo")
+    @RequestMapping("/getVideoInfo")
     public ResponseEntity<String> getVideoInfo() throws Exception {
         return ResponseEntity.status(HttpStatus.SC_NOT_IMPLEMENTED).body(NOT_YET_IMPLEMENTED);
     }
 
-    @RequestMapping(value = "/getCaptions")
+    @RequestMapping("/getCaptions")
     public ResponseEntity<String> getCaptions() {
         return ResponseEntity.status(HttpStatus.SC_NOT_IMPLEMENTED).body(NOT_YET_IMPLEMENTED);
     }
 
-    @RequestMapping(value = "/startScan")
+    @RequestMapping("/startScan")
     public void startScan(HttpServletRequest request, HttpServletResponse response) {
         request = wrapRequest(request);
         mediaScannerService.scanLibrary();
         getScanStatus(request, response);
     }
 
-    @RequestMapping(value = "/getScanStatus")
+    @RequestMapping("/getScanStatus")
     public void getScanStatus(HttpServletRequest request, HttpServletResponse response) {
         request = wrapRequest(request);
         ScanStatus scanStatus = new ScanStatus();
diff --git a/airsonic-main/src/test/java/org/airsonic/player/service/JukeboxServiceUnitTest.java b/airsonic-main/src/test/java/org/airsonic/player/service/JukeboxServiceUnitTest.java
index 4388df7c..43d5a528 100644
--- a/airsonic-main/src/test/java/org/airsonic/player/service/JukeboxServiceUnitTest.java
+++ b/airsonic-main/src/test/java/org/airsonic/player/service/JukeboxServiceUnitTest.java
@@ -12,7 +12,7 @@ import static org.mockito.Mockito.verify;
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Mockito.when;
 
-@RunWith(value = MockitoJUnitRunner.class)
+@RunWith(MockitoJUnitRunner.class)
 public class JukeboxServiceUnitTest {
 
     private JukeboxService jukeboxService;