From 6e8ae8971c626d8def7ea09a8a93b4903cbd7ff8 Mon Sep 17 00:00:00 2001
From: Evan Harris <eharris@puremagic.com>
Date: Sun, 11 Aug 2019 20:24:10 -0500
Subject: [PATCH] Enable checkstyle OverloadMethodsDeclarationOrder

---
 .../org/airsonic/player/dao/AlbumDao.java     |  8 ++--
 .../player/service/LastFmService.java         | 45 +++++++++----------
 .../player/service/MediaFileService.java      | 18 ++++----
 checkstyle.xml                                |  1 +
 4 files changed, 36 insertions(+), 36 deletions(-)

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 8ea89923..1eefb278 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
@@ -47,6 +47,10 @@ public class AlbumDao extends AbstractDao {
 
     private final RowMapper rowMapper = new AlbumMapper();
 
+    public Album getAlbum(int id) {
+        return queryOne("select " + QUERY_COLUMNS + " from album where id=?", rowMapper, id);
+    }
+
     /**
      * Returns the album with the given artist and album name.
      *
@@ -90,10 +94,6 @@ public class AlbumDao extends AbstractDao {
         return null;
     }
 
-    public Album getAlbum(int id) {
-        return queryOne("select " + QUERY_COLUMNS + " from album where id=?", rowMapper, id);
-    }
-
     public List<Album> getAlbumsForArtist(final String artist, final List<MusicFolder> musicFolders) {
         if (musicFolders.isEmpty()) {
             return Collections.emptyList();
diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/LastFmService.java b/airsonic-main/src/main/java/org/airsonic/player/service/LastFmService.java
index dbca7636..7a0cb8c9 100644
--- a/airsonic-main/src/main/java/org/airsonic/player/service/LastFmService.java
+++ b/airsonic-main/src/main/java/org/airsonic/player/service/LastFmService.java
@@ -236,6 +236,28 @@ public class LastFmService {
         return getArtistBio(getCanonicalArtistName(artist.getName()), locale);
     }
 
+    private ArtistBio getArtistBio(String artistName, Locale locale) {
+        try {
+            if (artistName == null) {
+                return null;
+            }
+
+            Artist info = Artist.getInfo(artistName, locale, null /* username */, LAST_FM_KEY);
+            if (info == null) {
+                return null;
+            }
+            return new ArtistBio(processWikiText(info.getWikiSummary()),
+                                 info.getMbid(),
+                                 info.getUrl(),
+                                 info.getImageURL(ImageSize.MEDIUM),
+                                 info.getImageURL(ImageSize.LARGE),
+                                 info.getImageURL(ImageSize.MEGA));
+        } catch (Throwable x) {
+            LOG.warn("Failed to find artist bio for " + artistName, x);
+            return null;
+        }
+    }
+
     /**
      * Returns top songs for the given artist, using last.fm REST API.
      *
@@ -368,29 +390,6 @@ public class LastFmService {
         return imageUrl == null ? null : new LastFmCoverArt(imageUrl, album.getArtist(), album.getName());
     }
 
-
-    private ArtistBio getArtistBio(String artistName, Locale locale) {
-        try {
-            if (artistName == null) {
-                return null;
-            }
-
-            Artist info = Artist.getInfo(artistName, locale, null /* username */, LAST_FM_KEY);
-            if (info == null) {
-                return null;
-            }
-            return new ArtistBio(processWikiText(info.getWikiSummary()),
-                                 info.getMbid(),
-                                 info.getUrl(),
-                                 info.getImageURL(ImageSize.MEDIUM),
-                                 info.getImageURL(ImageSize.LARGE),
-                                 info.getImageURL(ImageSize.MEGA));
-        } catch (Throwable x) {
-            LOG.warn("Failed to find artist bio for " + artistName, x);
-            return null;
-        }
-    }
-
     private String getCanonicalArtistName(String artistName) {
         try {
             if (artistName == null) {
diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/MediaFileService.java b/airsonic-main/src/main/java/org/airsonic/player/service/MediaFileService.java
index 5aa06d30..0030e8da 100644
--- a/airsonic-main/src/main/java/org/airsonic/player/service/MediaFileService.java
+++ b/airsonic-main/src/main/java/org/airsonic/player/service/MediaFileService.java
@@ -118,15 +118,6 @@ public class MediaFileService {
         return result;
     }
 
-    private MediaFile checkLastModified(MediaFile mediaFile, boolean useFastCache) {
-        if (useFastCache || (mediaFile.getVersion() >= MediaFileDao.VERSION && mediaFile.getChanged().getTime() >= FileUtil.lastModified(mediaFile.getFile()))) {
-            return mediaFile;
-        }
-        mediaFile = createMediaFile(mediaFile.getFile());
-        mediaFileDao.createOrUpdateMediaFile(mediaFile);
-        return mediaFile;
-    }
-
     /**
      * Returns a media file instance for the given path name. If possible, a cached value is returned.
      *
@@ -159,6 +150,15 @@ public class MediaFileService {
         return getMediaFile(mediaFile.getParentPath());
     }
 
+    private MediaFile checkLastModified(MediaFile mediaFile, boolean useFastCache) {
+        if (useFastCache || (mediaFile.getVersion() >= MediaFileDao.VERSION && mediaFile.getChanged().getTime() >= FileUtil.lastModified(mediaFile.getFile()))) {
+            return mediaFile;
+        }
+        mediaFile = createMediaFile(mediaFile.getFile());
+        mediaFileDao.createOrUpdateMediaFile(mediaFile);
+        return mediaFile;
+    }
+
     /**
      * Returns all media files that are children of a given media file.
      *
diff --git a/checkstyle.xml b/checkstyle.xml
index 1ad9b0db..f7540363 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -40,6 +40,7 @@
         </module>
         <module name="OneStatementPerLine"/>
         <module name="PackageDeclaration"/>
+        <module name="OverloadMethodsDeclarationOrder"/>
         <module name="ParenPadCheck"/>
         <module name="RedundantImport"/>
         <module name="RequireThis"/>