From 7578ee9537d4ba139f8615e9709587af985dbe19 Mon Sep 17 00:00:00 2001 From: jvoisin Date: Wed, 7 Aug 2019 20:13:29 +0000 Subject: [PATCH] Enable checkstyle's Indentation module --- .../airsonic/player/TomcatApplication.java | 62 +++++++++---------- .../player/controller/HelpController.java | 2 +- .../controller/ImportPlaylistController.java | 6 +- .../player/controller/MainController.java | 2 +- .../player/controller/RecoverController.java | 4 +- .../player/controller/SettingsController.java | 4 +- .../player/controller/UploadController.java | 2 +- .../controller/UserSettingsController.java | 2 +- .../org/airsonic/player/dao/AbstractDao.java | 4 +- .../org/airsonic/player/dao/RatingDao.java | 8 +-- .../airsonic/player/domain/SearchResult.java | 4 +- .../player/security/GlobalSecurityConfig.java | 6 +- .../security/JWTAuthenticationProvider.java | 4 +- .../JWTRequestParameterProcessingFilter.java | 10 +-- .../player/service/PodcastService.java | 6 +- .../service/search/SearchServiceImpl.java | 6 +- .../upnp/DispatchingContentDirectory.java | 28 ++++----- .../org/airsonic/player/util/FileUtil.java | 10 +-- checkstyle.xml | 1 + 19 files changed, 82 insertions(+), 89 deletions(-) diff --git a/airsonic-main/src/main/java/org/airsonic/player/TomcatApplication.java b/airsonic-main/src/main/java/org/airsonic/player/TomcatApplication.java index d62dea83..49e9ce48 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/TomcatApplication.java +++ b/airsonic-main/src/main/java/org/airsonic/player/TomcatApplication.java @@ -11,36 +11,36 @@ public class TomcatApplication { public static void configure(TomcatEmbeddedServletContainerFactory tomcatFactory) { - tomcatFactory.addContextCustomizers((TomcatContextCustomizer) context -> { - - StandardJarScanFilter standardJarScanFilter = new StandardJarScanFilter(); - standardJarScanFilter.setTldScan("dwr-*.jar,jstl-*.jar,spring-security-taglibs-*.jar,spring-web-*.jar,spring-webmvc-*.jar,string-*.jar,taglibs-standard-impl-*.jar,tomcat-annotations-api-*.jar,tomcat-embed-jasper-*.jar"); - standardJarScanFilter.setTldSkip("*"); - context.getJarScanner().setJarScanFilter(standardJarScanFilter); - - boolean development = (System.getProperty("airsonic.development") != null); - - // Increase the size and time before eviction of the Tomcat - // cache so that resources aren't uncompressed too often. - // See https://github.com/jhipster/generator-jhipster/issues/3995 - - StandardRoot resources = new StandardRoot(); - if (development) { - resources.setCachingAllowed(false); - } else { - resources.setCacheMaxSize(100000); - resources.setCacheObjectMaxSize(4000); - resources.setCacheTtl(24 * 3600 * 1000); // 1 day, in milliseconds - } - context.setResources(resources); - - // Put Jasper in production mode so that JSP aren't recompiled - // on each request. - // See http://stackoverflow.com/questions/29653326/spring-boot-application-slow-because-of-jsp-compilation - Container jsp = context.findChild("jsp"); - if (jsp instanceof Wrapper) { - ((Wrapper) jsp).addInitParameter("development", Boolean.toString(development)); - } - }); + tomcatFactory.addContextCustomizers((TomcatContextCustomizer) context -> { + + StandardJarScanFilter standardJarScanFilter = new StandardJarScanFilter(); + standardJarScanFilter.setTldScan("dwr-*.jar,jstl-*.jar,spring-security-taglibs-*.jar,spring-web-*.jar,spring-webmvc-*.jar,string-*.jar,taglibs-standard-impl-*.jar,tomcat-annotations-api-*.jar,tomcat-embed-jasper-*.jar"); + standardJarScanFilter.setTldSkip("*"); + context.getJarScanner().setJarScanFilter(standardJarScanFilter); + + boolean development = (System.getProperty("airsonic.development") != null); + + // Increase the size and time before eviction of the Tomcat + // cache so that resources aren't uncompressed too often. + // See https://github.com/jhipster/generator-jhipster/issues/3995 + + StandardRoot resources = new StandardRoot(); + if (development) { + resources.setCachingAllowed(false); + } else { + resources.setCacheMaxSize(100000); + resources.setCacheObjectMaxSize(4000); + resources.setCacheTtl(24 * 3600 * 1000); // 1 day, in milliseconds + } + context.setResources(resources); + + // Put Jasper in production mode so that JSP aren't recompiled + // on each request. + // See http://stackoverflow.com/questions/29653326/spring-boot-application-slow-because-of-jsp-compilation + Container jsp = context.findChild("jsp"); + if (jsp instanceof Wrapper) { + ((Wrapper) jsp).addInitParameter("development", Boolean.toString(development)); + } + }); } } diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/HelpController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/HelpController.java index b93ec186..64324a67 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/HelpController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/HelpController.java @@ -103,7 +103,7 @@ public class HelpController { String current; while((current = reader.readLine()) != null) { if (lines.size() >= LOG_LINES_TO_SHOW) { - break; + break; } lines.add(0, current); } diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/ImportPlaylistController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/ImportPlaylistController.java index 40cf78eb..8e4e0ba7 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/ImportPlaylistController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/ImportPlaylistController.java @@ -57,8 +57,8 @@ public class ImportPlaylistController { @PostMapping protected String handlePost(RedirectAttributes redirectAttributes, - HttpServletRequest request - ) throws Exception { + HttpServletRequest request + ) throws Exception { Map map = new HashMap(); try { @@ -79,7 +79,7 @@ public class ImportPlaylistController { String format = StringUtils.lowerCase(FilenameUtils.getExtension(item.getName())); String username = securityService.getCurrentUsername(request); Playlist playlist = playlistService.importPlaylist(username, playlistName, fileName, - item.getInputStream(), null); + item.getInputStream(), null); map.put("playlist", playlist); } } diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/MainController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/MainController.java index ebde83a1..3a56a751 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/MainController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/MainController.java @@ -171,7 +171,7 @@ public class MainController { } return new ModelAndView(view, "model", map); -} + } private boolean trimToSize(Boolean showAll, List list, int userPaginationPreference) { boolean trimmed = false; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/RecoverController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/RecoverController.java index ecba6702..573d96d9 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/RecoverController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/RecoverController.java @@ -75,8 +75,8 @@ public class RecoverController { } else { StringBuilder sb = new StringBuilder(PASSWORD_LENGTH); for(int i=0; i args = new HashMap<>(); - args.put("type", MediaFile.MediaType.ALBUM.name()); - args.put("folders", MusicFolder.toPathList(musicFolders)); - args.put("count", count); - args.put("offset", offset); + args.put("type", MediaFile.MediaType.ALBUM.name()); + args.put("folders", MusicFolder.toPathList(musicFolders)); + args.put("count", count); + args.put("offset", offset); String sql = "select user_rating.path from user_rating, media_file " + "where user_rating.path=media_file.path and media_file.present and media_file.type = :type and media_file.folder in (:folders) " + diff --git a/airsonic-main/src/main/java/org/airsonic/player/domain/SearchResult.java b/airsonic-main/src/main/java/org/airsonic/player/domain/SearchResult.java index 52bd5fc0..b18cc011 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/domain/SearchResult.java +++ b/airsonic-main/src/main/java/org/airsonic/player/domain/SearchResult.java @@ -59,11 +59,11 @@ public class SearchResult { this.offset = offset; } - public int getTotalHits() { + public int getTotalHits() { return totalHits; } public void setTotalHits(int totalHits) { this.totalHits = totalHits; } -} \ No newline at end of file +} diff --git a/airsonic-main/src/main/java/org/airsonic/player/security/GlobalSecurityConfig.java b/airsonic-main/src/main/java/org/airsonic/player/security/GlobalSecurityConfig.java index c5297384..05adde3d 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/security/GlobalSecurityConfig.java +++ b/airsonic-main/src/main/java/org/airsonic/player/security/GlobalSecurityConfig.java @@ -74,9 +74,9 @@ public class GlobalSecurityConfig extends GlobalAuthenticationConfigurerAdapter } private static String generateRememberMeKey() { - byte[] array = new byte[32]; - new SecureRandom().nextBytes(array); - return new String(array); + byte[] array = new byte[32]; + new SecureRandom().nextBytes(array); + return new String(array); } @Configuration diff --git a/airsonic-main/src/main/java/org/airsonic/player/security/JWTAuthenticationProvider.java b/airsonic-main/src/main/java/org/airsonic/player/security/JWTAuthenticationProvider.java index 6d144b07..7fbd89b0 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/security/JWTAuthenticationProvider.java +++ b/airsonic-main/src/main/java/org/airsonic/player/security/JWTAuthenticationProvider.java @@ -46,9 +46,7 @@ public class JWTAuthenticationProvider implements AuthenticationProvider { // TODO:AD This is super unfortunate, but not sure there is a better way when using JSP if(StringUtils.contains(authentication.getRequestedPath(), "/WEB-INF/jsp/")) { logger.warn("BYPASSING AUTH FOR WEB-INF page"); - } else - - if(!roughlyEqual(path.asString(), authentication.getRequestedPath())) { + } else if(!roughlyEqual(path.asString(), authentication.getRequestedPath())) { throw new InsufficientAuthenticationException("Credentials not valid for path " + authentication .getRequestedPath() + ". They are valid for " + path.asString()); } diff --git a/airsonic-main/src/main/java/org/airsonic/player/security/JWTRequestParameterProcessingFilter.java b/airsonic-main/src/main/java/org/airsonic/player/security/JWTRequestParameterProcessingFilter.java index 76959432..2d23552e 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/security/JWTRequestParameterProcessingFilter.java +++ b/airsonic-main/src/main/java/org/airsonic/player/security/JWTRequestParameterProcessingFilter.java @@ -31,11 +31,11 @@ public class JWTRequestParameterProcessingFilter implements Filter { } public Authentication attemptAuthentication(HttpServletRequest request, HttpServletResponse response) throws AuthenticationException, IOException, ServletException { - Optional token = findToken(request); - if(token.isPresent()) { - return authenticationManager.authenticate(token.get()); - } - throw new AuthenticationServiceException("Invalid auth method"); + Optional token = findToken(request); + if(token.isPresent()) { + return authenticationManager.authenticate(token.get()); + } + throw new AuthenticationServiceException("Invalid auth method"); } private static Optional findToken(HttpServletRequest request) { diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/PodcastService.java b/airsonic-main/src/main/java/org/airsonic/player/service/PodcastService.java index ba9c21ed..2a687240 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/PodcastService.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/PodcastService.java @@ -74,10 +74,10 @@ public class PodcastService { private static final Logger LOG = LoggerFactory.getLogger(PodcastService.class); private static final DateFormat[] RSS_DATE_FORMATS = {new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss Z", Locale.US), - new SimpleDateFormat("dd MMM yyyy HH:mm:ss Z", Locale.US)}; + new SimpleDateFormat("dd MMM yyyy HH:mm:ss Z", Locale.US)}; private static final Namespace[] ITUNES_NAMESPACES = {Namespace.getNamespace("http://www.itunes.com/DTDs/Podcast-1.0.dtd"), - Namespace.getNamespace("http://www.itunes.com/dtds/podcast-1.0.dtd")}; + Namespace.getNamespace("http://www.itunes.com/dtds/podcast-1.0.dtd")}; private final ExecutorService refreshExecutor; private final ExecutorService downloadExecutor; @@ -704,7 +704,7 @@ public class PodcastService { File channelDir = new File(podcastDir, StringUtil.fileSystemSafe(channel.getTitle())); if (!podcastDir.canWrite()) { - throw new RuntimeException("The podcasts directory " + podcastDir + " isn't writeable."); + throw new RuntimeException("The podcasts directory " + podcastDir + " isn't writeable."); } if (!channelDir.exists()) { diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/search/SearchServiceImpl.java b/airsonic-main/src/main/java/org/airsonic/player/service/search/SearchServiceImpl.java index adbef492..36725ce2 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/search/SearchServiceImpl.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/search/SearchServiceImpl.java @@ -168,7 +168,7 @@ public class SearchServiceImpl implements SearchService { Query query = queryFactory.getRandomSongs(criteria); return createRandomDocsList(criteria.getCount(), searcher, query, - (dist, id) -> util.addIgnoreNull(dist, SONG, id)); + (dist, id) -> util.addIgnoreNull(dist, SONG, id)); } catch (IOException e) { LOG.error("Failed to search or random songs.", e); @@ -191,7 +191,7 @@ public class SearchServiceImpl implements SearchService { Query query = queryFactory.getRandomAlbums(musicFolders); return createRandomDocsList(count, searcher, query, - (dist, id) -> util.addIgnoreNull(dist, ALBUM, id)); + (dist, id) -> util.addIgnoreNull(dist, ALBUM, id)); } catch (IOException e) { LOG.error("Failed to search for random albums.", e); @@ -214,7 +214,7 @@ public class SearchServiceImpl implements SearchService { Query query = queryFactory.getRandomAlbumsId3(musicFolders); return createRandomDocsList(count, searcher, query, - (dist, id) -> util.addIgnoreNull(dist, ALBUM_ID3, id)); + (dist, id) -> util.addIgnoreNull(dist, ALBUM_ID3, id)); } catch (IOException e) { LOG.error("Failed to search for random albums.", e); diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/upnp/DispatchingContentDirectory.java b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/DispatchingContentDirectory.java index 350f4cc6..1e0a0c62 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/upnp/DispatchingContentDirectory.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/DispatchingContentDirectory.java @@ -153,20 +153,20 @@ public class DispatchingContentDirectory extends CustomContentDirectory { private UpnpContentProcessor findProcessor(String type) { switch(type) { - case CONTAINER_ID_ROOT: - return getRootProcessor(); - case CONTAINER_ID_PLAYLIST_PREFIX: - return getPlaylistProcessor(); - case CONTAINER_ID_FOLDER_PREFIX: - return getMediaFileProcessor(); - case CONTAINER_ID_ALBUM_PREFIX: - return getAlbumProcessor(); - case CONTAINER_ID_RECENT_PREFIX: - return getRecentAlbumProcessor(); - case CONTAINER_ID_ARTIST_PREFIX: - return getArtistProcessor(); - case CONTAINER_ID_GENRE_PREFIX: - return getGenreProcessor(); + case CONTAINER_ID_ROOT: + return getRootProcessor(); + case CONTAINER_ID_PLAYLIST_PREFIX: + return getPlaylistProcessor(); + case CONTAINER_ID_FOLDER_PREFIX: + return getMediaFileProcessor(); + case CONTAINER_ID_ALBUM_PREFIX: + return getAlbumProcessor(); + case CONTAINER_ID_RECENT_PREFIX: + return getRecentAlbumProcessor(); + case CONTAINER_ID_ARTIST_PREFIX: + return getArtistProcessor(); + case CONTAINER_ID_GENRE_PREFIX: + return getGenreProcessor(); } return null; } diff --git a/airsonic-main/src/main/java/org/airsonic/player/util/FileUtil.java b/airsonic-main/src/main/java/org/airsonic/player/util/FileUtil.java index 62413f19..8370ed37 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/util/FileUtil.java +++ b/airsonic-main/src/main/java/org/airsonic/player/util/FileUtil.java @@ -140,13 +140,7 @@ public final class FileUtil { } private static T timed(FileTask task) { -// long t0 = System.nanoTime(); -// try { - return task.execute(); -// } finally { -// long t1 = System.nanoTime(); -// LOG.debug((t1 - t0) / 1000L + " microsec, " + task); -// } + return task.execute(); } private abstract static class FileTask { @@ -166,4 +160,4 @@ public final class FileUtil { return name + ", " + file; } } -} \ No newline at end of file +} diff --git a/checkstyle.xml b/checkstyle.xml index 264757eb..ad0f9155 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -24,6 +24,7 @@ +