From 153ad19b6bd1268190093c386928a2c4c0547d47 Mon Sep 17 00:00:00 2001 From: Evan Harris Date: Wed, 7 Aug 2019 17:46:10 -0500 Subject: [PATCH] Enable several more checkstyle modules * Enable checkstyle ParenPadCheck * Enable checkstyle EmptyLineSeparator * Enable checkstyle TypecastParenPad --- .../java/org/airsonic/player/ajax/TransferService.java | 1 + .../org/airsonic/player/controller/ControllerUtils.java | 2 +- .../main/java/org/airsonic/player/i18n/LocaleResolver.java | 1 + .../java/org/airsonic/player/service/PlayerService.java | 2 +- .../java/org/airsonic/player/service/SettingsService.java | 2 +- .../player/service/metadata/DefaultMetaDataParser.java | 1 + .../src/main/java/org/airsonic/player/util/StringUtil.java | 2 +- checkstyle.xml | 7 +++++++ 8 files changed, 14 insertions(+), 4 deletions(-) diff --git a/airsonic-main/src/main/java/org/airsonic/player/ajax/TransferService.java b/airsonic-main/src/main/java/org/airsonic/player/ajax/TransferService.java index 08468d6d..464fbfa0 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/ajax/TransferService.java +++ b/airsonic-main/src/main/java/org/airsonic/player/ajax/TransferService.java @@ -25,6 +25,7 @@ import org.directwebremoting.WebContextFactory; import org.springframework.stereotype.Service; import javax.servlet.http.HttpSession; + /** * Provides AJAX-enabled services for retrieving the status of ongoing transfers. * This class is used by the DWR framework (http://getahead.ltd.uk/dwr/). diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/ControllerUtils.java b/airsonic-main/src/main/java/org/airsonic/player/controller/ControllerUtils.java index 87252700..d66b5734 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/ControllerUtils.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/ControllerUtils.java @@ -15,7 +15,7 @@ public class ControllerUtils { String path = (String) request.getAttribute( HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE); - String bestMatchPattern = (String ) request.getAttribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE); + String bestMatchPattern = (String) request.getAttribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE); AntPathMatcher apm = new AntPathMatcher(); diff --git a/airsonic-main/src/main/java/org/airsonic/player/i18n/LocaleResolver.java b/airsonic-main/src/main/java/org/airsonic/player/i18n/LocaleResolver.java index 4d36a8e8..70e4bdb6 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/i18n/LocaleResolver.java +++ b/airsonic-main/src/main/java/org/airsonic/player/i18n/LocaleResolver.java @@ -32,6 +32,7 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Locale; import java.util.Set; + /** * Locale resolver implementation which returns the locale selected in the settings. * diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/PlayerService.java b/airsonic-main/src/main/java/org/airsonic/player/service/PlayerService.java index 395fadbc..eeebe359 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/PlayerService.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/PlayerService.java @@ -341,7 +341,7 @@ public class PlayerService { // Create player if necessary. Player player = new Player(); - if (request != null ) { + if (request != null) { player.setIpAddress(request.getRemoteAddr()); } player.setUsername(User.USERNAME_GUEST); diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/SettingsService.java b/airsonic-main/src/main/java/org/airsonic/player/service/SettingsService.java index 8ede464d..87c03128 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/SettingsService.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/SettingsService.java @@ -252,7 +252,7 @@ public class SettingsService { private void removeObsoleteProperties() { - OBSOLETE_KEYS.forEach( oKey -> { + OBSOLETE_KEYS.forEach(oKey -> { if(configurationService.containsKey(oKey)) { LOG.info("Removing obsolete property [" + oKey + ']'); configurationService.clearProperty(oKey); diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/metadata/DefaultMetaDataParser.java b/airsonic-main/src/main/java/org/airsonic/player/service/metadata/DefaultMetaDataParser.java index 8538661e..cafe3fe3 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/metadata/DefaultMetaDataParser.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/metadata/DefaultMetaDataParser.java @@ -40,6 +40,7 @@ public class DefaultMetaDataParser extends MetaDataParser { public DefaultMetaDataParser(SettingsService settingsService) { this.settingsService = settingsService; } + /** * Parses meta data for the given file. * diff --git a/airsonic-main/src/main/java/org/airsonic/player/util/StringUtil.java b/airsonic-main/src/main/java/org/airsonic/player/util/StringUtil.java index b6caa4fd..a33d7f7f 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/util/StringUtil.java +++ b/airsonic-main/src/main/java/org/airsonic/player/util/StringUtil.java @@ -201,7 +201,7 @@ public final class StringUtil { // More than 1 TB? if (byteCount >= 1024L * 1024 * 1024 * 1024) { NumberFormat teraByteFormat = new DecimalFormat("0.00 TB", new DecimalFormatSymbols(locale)); - return teraByteFormat.format( byteCount / ((double) 1024 * 1024 * 1024 * 1024)); + return teraByteFormat.format(byteCount / ((double) 1024 * 1024 * 1024 * 1024)); } // More than 1 GB? diff --git a/checkstyle.xml b/checkstyle.xml index ad0f9155..656ca557 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -21,13 +21,20 @@ + + + + + +