From 510314a9d861b6ad524d20e836d4b13b4beff72c Mon Sep 17 00:00:00 2001 From: Evan Harris Date: Fri, 6 Dec 2019 03:14:19 -0600 Subject: [PATCH] Added SingleSpaceSeparator checkstyle --- .../src/main/java/org/airsonic/player/ajax/LyricsService.java | 4 ++-- .../airsonic/player/controller/AvatarUploadController.java | 2 +- .../airsonic/player/controller/ChangeCoverArtController.java | 2 +- .../org/airsonic/player/controller/CoverArtController.java | 2 +- .../org/airsonic/player/controller/EditTagsController.java | 2 +- .../airsonic/player/controller/GeneralSettingsController.java | 2 +- .../java/org/airsonic/player/controller/HomeController.java | 2 +- .../java/org/airsonic/player/controller/LeftController.java | 2 +- .../java/org/airsonic/player/controller/M3UController.java | 4 ++-- .../java/org/airsonic/player/controller/MainController.java | 2 +- .../java/org/airsonic/player/controller/MoreController.java | 2 +- .../player/controller/PersonalSettingsController.java | 2 +- .../airsonic/player/controller/PlayerSettingsController.java | 2 +- .../org/airsonic/player/controller/PodcastController.java | 2 +- .../java/org/airsonic/player/controller/ProxyController.java | 2 +- .../java/org/airsonic/player/controller/RightController.java | 2 +- .../org/airsonic/player/controller/SettingsController.java | 2 +- .../airsonic/player/controller/ShareManagementController.java | 2 +- .../src/main/java/org/airsonic/player/dao/AbstractDao.java | 2 +- .../java/org/airsonic/player/domain/MediaFileComparator.java | 2 +- .../main/java/org/airsonic/player/monitor/MetricsManager.java | 4 ++-- .../main/java/org/airsonic/player/service/NetworkService.java | 2 +- .../org/airsonic/player/service/search/DocumentFactory.java | 2 +- .../org/airsonic/player/service/search/SearchServiceImpl.java | 4 ++-- .../org/airsonic/player/service/upnp/AlbumUpnpProcessor.java | 2 +- .../org/airsonic/player/service/upnp/ArtistUpnpProcessor.java | 2 +- .../org/airsonic/player/service/upnp/GenreUpnpProcessor.java | 2 +- .../airsonic/player/service/upnp/UpnpContentProcessor.java | 2 +- .../player/spring/RegisterPrecompiledJSPInitializer.java | 2 +- .../test/java/org/airsonic/player/MissingTranslations.java | 2 +- .../test/java/org/airsonic/player/domain/VersionTestCase.java | 2 +- .../airsonic/player/service/search/QueryFactoryTestCase.java | 2 +- .../player/validator/PasswordSettingsValidatorTestCase.java | 2 +- checkstyle.xml | 1 + 34 files changed, 38 insertions(+), 37 deletions(-) diff --git a/airsonic-main/src/main/java/org/airsonic/player/ajax/LyricsService.java b/airsonic-main/src/main/java/org/airsonic/player/ajax/LyricsService.java index e4f2293b..d6956339 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/ajax/LyricsService.java +++ b/airsonic-main/src/main/java/org/airsonic/player/ajax/LyricsService.java @@ -97,8 +97,8 @@ public class LyricsService { Namespace ns = root.getNamespace(); String lyric = StringUtils.trimToNull(root.getChildText("Lyric", ns)); - String song = root.getChildText("LyricSong", ns); - String artist = root.getChildText("LyricArtist", ns); + String song = root.getChildText("LyricSong", ns); + String artist = root.getChildText("LyricArtist", ns); return new LyricsInfo(lyric, artist, song); } diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/AvatarUploadController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/AvatarUploadController.java index 15d8dd91..6bb58001 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/AvatarUploadController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/AvatarUploadController.java @@ -56,7 +56,7 @@ import java.util.Map; */ @Controller @RequestMapping("/avatarUpload") -public class AvatarUploadController { +public class AvatarUploadController { private static final Logger LOG = LoggerFactory.getLogger(AvatarUploadController.class); private static final int MAX_AVATAR_SIZE = 64; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/ChangeCoverArtController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/ChangeCoverArtController.java index b53b1d49..cadf162a 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/ChangeCoverArtController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/ChangeCoverArtController.java @@ -42,7 +42,7 @@ import java.util.Map; */ @Controller @RequestMapping("/changeCoverArt") -public class ChangeCoverArtController { +public class ChangeCoverArtController { @Autowired private MediaFileService mediaFileService; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/CoverArtController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/CoverArtController.java index f01678f1..f6633fa1 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/CoverArtController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/CoverArtController.java @@ -300,7 +300,7 @@ public class CoverArtController implements LastModified { throw new RuntimeException(e); } } else { - is = new FileInputStream(file); + is = new FileInputStream(file); mimeType = StringUtil.getMimeType(FilenameUtils.getExtension(file.getName())); } return Pair.of(is, mimeType); diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/EditTagsController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/EditTagsController.java index 37cc8b96..4f925f60 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/EditTagsController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/EditTagsController.java @@ -47,7 +47,7 @@ import java.util.Map; */ @Controller @RequestMapping("/editTags") -public class EditTagsController { +public class EditTagsController { @Autowired private MetaDataParserFactory metaDataParserFactory; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/GeneralSettingsController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/GeneralSettingsController.java index 052f96cb..accf26c1 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/GeneralSettingsController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/GeneralSettingsController.java @@ -40,7 +40,7 @@ import java.util.Locale; */ @Controller @RequestMapping("/generalSettings") -public class GeneralSettingsController { +public class GeneralSettingsController { @Autowired private SettingsService settingsService; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/HomeController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/HomeController.java index ba983a3c..18383c87 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/HomeController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/HomeController.java @@ -42,7 +42,7 @@ import static org.springframework.web.bind.ServletRequestUtils.getStringParamete */ @Controller @RequestMapping("/home") -public class HomeController { +public class HomeController { private static final int LIST_SIZE = 40; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/LeftController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/LeftController.java index e58fbadd..c1e3f9b0 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/LeftController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/LeftController.java @@ -45,7 +45,7 @@ import java.util.*; */ @Controller @RequestMapping("/left") -public class LeftController { +public class LeftController { // Update this time if you want to force a refresh in clients. private static final Calendar LAST_COMPATIBILITY_TIME = Calendar.getInstance(); diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/M3UController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/M3UController.java index a65ced49..21a6e5a8 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/M3UController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/M3UController.java @@ -46,7 +46,7 @@ import java.util.List; */ @Controller @RequestMapping("/play.m3u") -public class M3UController { +public class M3UController { @Autowired private PlayerService playerService; @@ -89,7 +89,7 @@ public class M3UController { } out.println("#EXTINF:" + duration + "," + mediaFile.getArtist() + " - " + mediaFile.getTitle()); - String urlNoAuth = url + "player=" + player.getId() + "&id=" + mediaFile.getId() + "&suffix=." + + String urlNoAuth = url + "player=" + player.getId() + "&id=" + mediaFile.getId() + "&suffix=." + transcodingService.getSuffix(player, mediaFile, null); String urlWithAuth = jwtSecurityService.addJWTToken(urlNoAuth); out.println(urlWithAuth); 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 45e27f81..ebaceecf 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 @@ -44,7 +44,7 @@ import java.util.stream.Collectors; */ @Controller @RequestMapping("/main") -public class MainController { +public class MainController { @Autowired private SecurityService securityService; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/MoreController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/MoreController.java index c5663a02..1eade2aa 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/MoreController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/MoreController.java @@ -48,7 +48,7 @@ import java.util.Map; */ @Controller @RequestMapping("/more") -public class MoreController { +public class MoreController { @Autowired private SettingsService settingsService; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/PersonalSettingsController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/PersonalSettingsController.java index 382aa31f..22ecbdd6 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/PersonalSettingsController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/PersonalSettingsController.java @@ -45,7 +45,7 @@ import java.util.Locale; */ @Controller @RequestMapping("/personalSettings") -public class PersonalSettingsController { +public class PersonalSettingsController { @Autowired private SettingsService settingsService; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/PlayerSettingsController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/PlayerSettingsController.java index 26e1a803..852749cb 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/PlayerSettingsController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/PlayerSettingsController.java @@ -49,7 +49,7 @@ import java.util.List; */ @Controller @RequestMapping("/playerSettings") -public class PlayerSettingsController { +public class PlayerSettingsController { @Autowired private PlayerService playerService; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/PodcastController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/PodcastController.java index 813c5e52..99c2ae63 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/PodcastController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/PodcastController.java @@ -45,7 +45,7 @@ import java.util.*; */ @Controller @RequestMapping("/podcast") -public class PodcastController { +public class PodcastController { private static final DateFormat RSS_DATE_FORMAT = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss Z", Locale.US); @Autowired diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/ProxyController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/ProxyController.java index 817a4f91..48756610 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/ProxyController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/ProxyController.java @@ -46,7 +46,7 @@ import static org.springframework.http.HttpStatus.OK; */ @Controller @RequestMapping("/proxy") -public class ProxyController { +public class ProxyController { @GetMapping public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response) throws Exception { diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/RightController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/RightController.java index 7b68ac15..d2f08800 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/RightController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/RightController.java @@ -41,7 +41,7 @@ import java.util.Map; */ @Controller @RequestMapping("/right") -public class RightController { +public class RightController { @Autowired private SettingsService settingsService; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/SettingsController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/SettingsController.java index 80a102e5..a77e6a11 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/SettingsController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/SettingsController.java @@ -37,7 +37,7 @@ import javax.servlet.http.HttpServletRequest; */ @Controller @RequestMapping("/settings") -public class SettingsController { +public class SettingsController { @Autowired private SecurityService securityService; diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/ShareManagementController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/ShareManagementController.java index a37dd4eb..31b083e7 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/controller/ShareManagementController.java +++ b/airsonic-main/src/main/java/org/airsonic/player/controller/ShareManagementController.java @@ -44,7 +44,7 @@ import java.util.*; */ @Controller @RequestMapping("/createShare") -public class ShareManagementController { +public class ShareManagementController { @Autowired private MediaFileService mediaFileService; diff --git a/airsonic-main/src/main/java/org/airsonic/player/dao/AbstractDao.java b/airsonic-main/src/main/java/org/airsonic/player/dao/AbstractDao.java index 559daf80..25dfe8f1 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/dao/AbstractDao.java +++ b/airsonic-main/src/main/java/org/airsonic/player/dao/AbstractDao.java @@ -60,7 +60,7 @@ public class AbstractDao { } protected String questionMarks(String columns) { - int numberOfColumns = StringUtils.countMatches(columns, ",") + 1; + int numberOfColumns = StringUtils.countMatches(columns, ",") + 1; return StringUtils.repeat("?", ", ", numberOfColumns); } diff --git a/airsonic-main/src/main/java/org/airsonic/player/domain/MediaFileComparator.java b/airsonic-main/src/main/java/org/airsonic/player/domain/MediaFileComparator.java index a6e203c9..f6d20e68 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/domain/MediaFileComparator.java +++ b/airsonic-main/src/main/java/org/airsonic/player/domain/MediaFileComparator.java @@ -74,7 +74,7 @@ public class MediaFileComparator implements Comparator { return a.getPath().compareToIgnoreCase(b.getPath()); } - private > int nullSafeCompare(T a, T b, boolean nullIsSmaller) { + private > int nullSafeCompare(T a, T b, boolean nullIsSmaller) { if (a == null && b == null) { return 0; } diff --git a/airsonic-main/src/main/java/org/airsonic/player/monitor/MetricsManager.java b/airsonic-main/src/main/java/org/airsonic/player/monitor/MetricsManager.java index c88e7a84..46cd1431 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/monitor/MetricsManager.java +++ b/airsonic-main/src/main/java/org/airsonic/player/monitor/MetricsManager.java @@ -99,7 +99,7 @@ public class MetricsManager { public Timer timer(Class clazz, String name) { com.codahale.metrics.Timer t = metrics.timer(MetricRegistry.name(clazz,name)); - com.codahale.metrics.Timer.Context tContext = t.time(); + com.codahale.metrics.Timer.Context tContext = t.time(); return new Timer(tContext); } @@ -143,7 +143,7 @@ public class MetricsManager { } @Override - public void close() { + public void close() { // Does nothing } } diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/NetworkService.java b/airsonic-main/src/main/java/org/airsonic/player/service/NetworkService.java index ed4d4ac8..ea37bed4 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/NetworkService.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/NetworkService.java @@ -53,7 +53,7 @@ public class NetworkService { } String baseUrl = uri.toString() + "/"; - LOG.debug("Calculated base url to " + baseUrl); + LOG.debug("Calculated base url to " + baseUrl); return baseUrl; } catch (MalformedURLException | URISyntaxException e) { throw new RuntimeException("Could not calculate base url: " + e.getMessage()); diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/search/DocumentFactory.java b/airsonic-main/src/main/java/org/airsonic/player/service/search/DocumentFactory.java index 8a353fdb..a842fd94 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/search/DocumentFactory.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/search/DocumentFactory.java @@ -97,7 +97,7 @@ public class DocumentFactory { doc.add(new StoredField(field, value, TYPE_KEY)); }; - private BiConsumer<@NonNull Document, @NonNull String> fieldMediatype = (doc, value) -> + private BiConsumer<@NonNull Document, @NonNull String> fieldMediatype = (doc, value) -> fieldKey.accept(doc, FieldNames.MEDIA_TYPE, value); private BiConsumer<@NonNull Document, @NonNull String> fieldFolderPath = (doc, value) -> 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 9c5c0e57..40056b37 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 @@ -44,9 +44,9 @@ public class SearchServiceImpl implements SearchService { private static final Logger LOG = LoggerFactory.getLogger(SearchServiceImpl.class); @Autowired - private QueryFactory queryFactory; + private QueryFactory queryFactory; @Autowired - private IndexManager indexManager; + private IndexManager indexManager; @Autowired private SearchServiceUtilities util; diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/upnp/AlbumUpnpProcessor.java b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/AlbumUpnpProcessor.java index 6a0d3198..31b44e41 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/upnp/AlbumUpnpProcessor.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/AlbumUpnpProcessor.java @@ -117,7 +117,7 @@ public class AlbumUpnpProcessor extends UpnpContentProcessor List albumList = null; if (album.getComment().startsWith(ALL_BY_ARTIST)) { ArtistUpnpProcessor ap = getDispatcher().getArtistProcessor(); - albumList = ap.getChildren(ap.getItemById(album.getComment().replaceAll(ALL_BY_ARTIST + "_", ""))); + albumList = ap.getChildren(ap.getItemById(album.getComment().replaceAll(ALL_BY_ARTIST + "_", ""))); } else if (album.getComment().equalsIgnoreCase(ALL_RECENT)) { albumList = getDispatcher().getRecentAlbumProcessor().getAllItems(); } else { diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/upnp/ArtistUpnpProcessor.java b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/ArtistUpnpProcessor.java index 8fc64bea..fd4b856c 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/upnp/ArtistUpnpProcessor.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/ArtistUpnpProcessor.java @@ -73,7 +73,7 @@ public class ArtistUpnpProcessor extends UpnpContentProcessor { return getArtistDao().getArtist(Integer.parseInt(id)); } - public List getChildren(Artist artist) { + public List getChildren(Artist artist) { List allFolders = getDispatcher().getSettingsService().getAllMusicFolders(); List allAlbums = getAlbumProcessor().getAlbumDao().getAlbumsForArtist(artist.getName(), allFolders); if (allAlbums.size() > 1) { diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/upnp/GenreUpnpProcessor.java b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/GenreUpnpProcessor.java index 40eec9fa..bed176bb 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/upnp/GenreUpnpProcessor.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/GenreUpnpProcessor.java @@ -93,7 +93,7 @@ public class GenreUpnpProcessor extends UpnpContentProcessor return null; } - public List getChildren(Genre item) { + public List getChildren(Genre item) { List allFolders = getDispatcher().getSettingsService().getAllMusicFolders(); return getDispatcher().getMediaFileProcessor().getMediaFileDao().getSongsByGenre(item.getName(), 0, Integer.MAX_VALUE, allFolders); } diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/upnp/UpnpContentProcessor.java b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/UpnpContentProcessor.java index a7220089..1699ff7b 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/upnp/UpnpContentProcessor.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/UpnpContentProcessor.java @@ -125,7 +125,7 @@ public abstract class UpnpContentProcessor { SortCriterion[] orderBy) { DIDLContent didl = new DIDLContent(); - Class clazz = (Class) ((ParameterizedType) getClass().getGenericSuperclass()).getActualTypeArguments()[0]; + Class clazz = (Class) ((ParameterizedType) getClass().getGenericSuperclass()).getActualTypeArguments()[0]; try { List allFolders = getDispatchingContentDirectory().getSettingsService().getAllMusicFolders(); diff --git a/airsonic-main/src/main/java/org/airsonic/player/spring/RegisterPrecompiledJSPInitializer.java b/airsonic-main/src/main/java/org/airsonic/player/spring/RegisterPrecompiledJSPInitializer.java index ec93db79..3407c30c 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/spring/RegisterPrecompiledJSPInitializer.java +++ b/airsonic-main/src/main/java/org/airsonic/player/spring/RegisterPrecompiledJSPInitializer.java @@ -38,7 +38,7 @@ public class RegisterPrecompiledJSPInitializer implements ServletContextInitiali private static void registerPrecompiledJSPs(ServletContext servletContext) { WebApp webApp = parseXmlFragment(); - for (ServletDef def : webApp.getServletDefs()) { + for (ServletDef def : webApp.getServletDefs()) { LOG.trace("Registering precompiled JSP: {} -> {}", def.getName(), def.getSclass()); ServletRegistration.Dynamic reg = servletContext.addServlet(def.getName(), def.getSclass()); // Need to set loadOnStartup somewhere between 0 and 128. 0 is highest priority. 99 should be fine diff --git a/airsonic-main/src/test/java/org/airsonic/player/MissingTranslations.java b/airsonic-main/src/test/java/org/airsonic/player/MissingTranslations.java index 2b423a38..db7b29dc 100644 --- a/airsonic-main/src/test/java/org/airsonic/player/MissingTranslations.java +++ b/airsonic-main/src/test/java/org/airsonic/player/MissingTranslations.java @@ -6,7 +6,7 @@ import java.util.Properties; import java.util.SortedMap; import java.util.TreeMap; -public class MissingTranslations { +public class MissingTranslations { public static void main(String[] args) throws IOException { String[] locales = {"da", "de", "es", "pt", "fi", "fr", "is", "it", "ja_JP", "mk", "nl", "no", "pl", "ru", "sl", "sv", "zh_CN", "zh_TW"}; diff --git a/airsonic-main/src/test/java/org/airsonic/player/domain/VersionTestCase.java b/airsonic-main/src/test/java/org/airsonic/player/domain/VersionTestCase.java index db7fc7bd..6baf5d74 100644 --- a/airsonic-main/src/test/java/org/airsonic/player/domain/VersionTestCase.java +++ b/airsonic-main/src/test/java/org/airsonic/player/domain/VersionTestCase.java @@ -31,7 +31,7 @@ public class VersionTestCase extends TestCase { /** * Tests that equals(), hashCode(), toString() and compareTo() works. */ - public void testVersion() { + public void testVersion() { doTestVersion("0.0", "0.1"); doTestVersion("1.5", "2.3"); doTestVersion("2.3", "2.34"); diff --git a/airsonic-main/src/test/java/org/airsonic/player/service/search/QueryFactoryTestCase.java b/airsonic-main/src/test/java/org/airsonic/player/service/search/QueryFactoryTestCase.java index f48e0b95..cae42a98 100644 --- a/airsonic-main/src/test/java/org/airsonic/player/service/search/QueryFactoryTestCase.java +++ b/airsonic-main/src/test/java/org/airsonic/player/service/search/QueryFactoryTestCase.java @@ -69,7 +69,7 @@ public class QueryFactoryTestCase { new MusicFolder(FID2, new File(PATH2), "music2", true, new java.util.Date()); private static final List SINGLE_FOLDERS = Arrays.asList(MUSIC_FOLDER1); - private static final List MULTI_FOLDERS = Arrays.asList(MUSIC_FOLDER1, MUSIC_FOLDER2); + private static final List MULTI_FOLDERS = Arrays.asList(MUSIC_FOLDER1, MUSIC_FOLDER2); /* diff --git a/airsonic-main/src/test/java/org/airsonic/player/validator/PasswordSettingsValidatorTestCase.java b/airsonic-main/src/test/java/org/airsonic/player/validator/PasswordSettingsValidatorTestCase.java index bc1f3879..dc6bfa61 100644 --- a/airsonic-main/src/test/java/org/airsonic/player/validator/PasswordSettingsValidatorTestCase.java +++ b/airsonic-main/src/test/java/org/airsonic/player/validator/PasswordSettingsValidatorTestCase.java @@ -21,7 +21,7 @@ public class PasswordSettingsValidatorTestCase extends TestCase { PasswordSettingsValidator psv = new PasswordSettingsValidator(); Errors errors = new BeanPropertyBindingResult(psc, "psv"); psv.validate(psc, errors); - return errors; + return errors; } public void testValidateEmptyPassword() { diff --git a/checkstyle.xml b/checkstyle.xml index ab522f8d..d22d8162 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -57,6 +57,7 @@ +