From 43ab59807a87ea09ab8ca07079d00dd08fc1fdd7 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sat, 11 Jan 2020 11:11:20 +0100
Subject: [PATCH] Make a couple of inner classes static

This might marginally improve the memory consumption,
but the main goal here is to make the code separation
between inner and outer class explicit.
---
 .../src/main/java/org/airsonic/player/dao/UserDao.java        | 2 +-
 .../org/airsonic/player/service/InternetRadioService.java     | 2 +-
 .../airsonic/player/service/PlaylistServiceTestImport.java    | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/airsonic-main/src/main/java/org/airsonic/player/dao/UserDao.java b/airsonic-main/src/main/java/org/airsonic/player/dao/UserDao.java
index a7ca1b7b..407294a1 100644
--- a/airsonic-main/src/main/java/org/airsonic/player/dao/UserDao.java
+++ b/airsonic-main/src/main/java/org/airsonic/player/dao/UserDao.java
@@ -326,7 +326,7 @@ public class UserDao extends AbstractDao {
         }
     }
 
-    private class UserRowMapper implements RowMapper<User> {
+    private static class UserRowMapper implements RowMapper<User> {
         public User mapRow(ResultSet rs, int rowNum) throws SQLException {
             return new User(rs.getString(1),
                     decrypt(rs.getString(2)),
diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/InternetRadioService.java b/airsonic-main/src/main/java/org/airsonic/player/service/InternetRadioService.java
index 147075c3..04b6aa8e 100644
--- a/airsonic-main/src/main/java/org/airsonic/player/service/InternetRadioService.java
+++ b/airsonic-main/src/main/java/org/airsonic/player/service/InternetRadioService.java
@@ -42,7 +42,7 @@ public class InternetRadioService {
     /**
      * Generic exception class for playlists.
      */
-    private class PlaylistException extends Exception {
+    private static class PlaylistException extends Exception {
         public PlaylistException(String message) {
             super(message);
         }
diff --git a/airsonic-main/src/test/java/org/airsonic/player/service/PlaylistServiceTestImport.java b/airsonic-main/src/test/java/org/airsonic/player/service/PlaylistServiceTestImport.java
index e98eb5b8..7c076595 100644
--- a/airsonic-main/src/test/java/org/airsonic/player/service/PlaylistServiceTestImport.java
+++ b/airsonic-main/src/test/java/org/airsonic/player/service/PlaylistServiceTestImport.java
@@ -182,7 +182,7 @@ public class PlaylistServiceTestImport {
         assertEquals(3, mediaFiles.size());
     }
 
-    private class PersistPlayList implements Answer {
+    private static class PersistPlayList implements Answer {
         private final int id;
         public PersistPlayList(int id) {
             this.id = id;
@@ -196,7 +196,7 @@ public class PlaylistServiceTestImport {
         }
     }
 
-    private class MediaFileHasEverything implements Answer {
+    private static class MediaFileHasEverything implements Answer {
 
         @Override
         public Object answer(InvocationOnMock invocationOnMock) {