Merge remote-tracking branch 'origin/pr/1465'

master
Andrew DeMaria 5 years ago
commit 64fad6a4c5
No known key found for this signature in database
GPG Key ID: 0A3F5E91F8364EDF
  1. 2
      airsonic-main/src/main/java/org/airsonic/player/dao/UserDao.java
  2. 2
      airsonic-main/src/main/java/org/airsonic/player/service/InternetRadioService.java
  3. 4
      airsonic-main/src/test/java/org/airsonic/player/service/PlaylistServiceTestImport.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 { public User mapRow(ResultSet rs, int rowNum) throws SQLException {
return new User(rs.getString(1), return new User(rs.getString(1),
decrypt(rs.getString(2)), decrypt(rs.getString(2)),

@ -42,7 +42,7 @@ public class InternetRadioService {
/** /**
* Generic exception class for playlists. * Generic exception class for playlists.
*/ */
private class PlaylistException extends Exception { private static class PlaylistException extends Exception {
public PlaylistException(String message) { public PlaylistException(String message) {
super(message); super(message);
} }

@ -182,7 +182,7 @@ public class PlaylistServiceTestImport {
assertEquals(3, mediaFiles.size()); assertEquals(3, mediaFiles.size());
} }
private class PersistPlayList implements Answer { private static class PersistPlayList implements Answer {
private final int id; private final int id;
public PersistPlayList(int id) { public PersistPlayList(int id) {
this.id = id; this.id = id;
@ -196,7 +196,7 @@ public class PlaylistServiceTestImport {
} }
} }
private class MediaFileHasEverything implements Answer { private static class MediaFileHasEverything implements Answer {
@Override @Override
public Object answer(InvocationOnMock invocationOnMock) { public Object answer(InvocationOnMock invocationOnMock) {

Loading…
Cancel
Save