Added SingleSpaceSeparator checkstyle

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 song = root.getChildText("LyricSong", ns);
-        String artist =  root.getChildText("LyricArtist", ns);
+        String artist = root.getChildText("LyricArtist", ns);
 
         return new LyricsInfo(lyric, artist, song);
     }

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;

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;

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);

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;

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;

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;
 

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();

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);

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;

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;

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;

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;

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

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 {

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;

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;

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;

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);
     }
 

airsonic-main/src/main/java/org/airsonic/player/domain/MediaFileComparator.java

@@ -74,7 +74,7 @@ public class MediaFileComparator implements Comparator<MediaFile> {
         return a.getPath().compareToIgnoreCase(b.getPath());
     }
 
-    private <T extends Comparable<T>>  int nullSafeCompare(T a, T b, boolean nullIsSmaller) {
+    private <T extends Comparable<T>> int nullSafeCompare(T a, T b, boolean nullIsSmaller) {
         if (a == null && b == null) {
             return 0;
         }

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
         }
     }

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());

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) ->

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;
 

airsonic-main/src/main/java/org/airsonic/player/service/upnp/AlbumUpnpProcessor.java

@@ -117,7 +117,7 @@ public class AlbumUpnpProcessor extends UpnpContentProcessor <Album, MediaFile>
             List<Album> 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 {

airsonic-main/src/main/java/org/airsonic/player/service/upnp/ArtistUpnpProcessor.java

@@ -73,7 +73,7 @@ public class ArtistUpnpProcessor extends UpnpContentProcessor <Artist, Album> {
         return getArtistDao().getArtist(Integer.parseInt(id));
     }
 
-    public  List<Album> getChildren(Artist artist) {
+    public List<Album> getChildren(Artist artist) {
         List<MusicFolder> allFolders = getDispatcher().getSettingsService().getAllMusicFolders();
         List<Album> allAlbums = getAlbumProcessor().getAlbumDao().getAlbumsForArtist(artist.getName(), allFolders);
         if (allAlbums.size() > 1) {

airsonic-main/src/main/java/org/airsonic/player/service/upnp/GenreUpnpProcessor.java

@@ -93,7 +93,7 @@ public class GenreUpnpProcessor extends UpnpContentProcessor <Genre, MediaFile>
         return null;
     }
 
-    public  List<MediaFile> getChildren(Genre item) {
+    public List<MediaFile> getChildren(Genre item) {
         List<MusicFolder> allFolders = getDispatcher().getSettingsService().getAllMusicFolders();
         return getDispatcher().getMediaFileProcessor().getMediaFileDao().getSongsByGenre(item.getName(), 0, Integer.MAX_VALUE, allFolders);
     }

airsonic-main/src/main/java/org/airsonic/player/service/upnp/UpnpContentProcessor.java

@@ -125,7 +125,7 @@ public abstract class UpnpContentProcessor<T extends Object, U extends Object> {
                                      SortCriterion[] orderBy) {
         DIDLContent didl = new DIDLContent();
 
-        Class clazz =  (Class) ((ParameterizedType) getClass().getGenericSuperclass()).getActualTypeArguments()[0];
+        Class clazz = (Class) ((ParameterizedType) getClass().getGenericSuperclass()).getActualTypeArguments()[0];
 
         try {
             List<MusicFolder> allFolders = getDispatchingContentDirectory().getSettingsService().getAllMusicFolders();

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

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"};

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");

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<MusicFolder> SINGLE_FOLDERS = Arrays.asList(MUSIC_FOLDER1);
-    private static final List<MusicFolder> MULTI_FOLDERS  = Arrays.asList(MUSIC_FOLDER1, MUSIC_FOLDER2);
+    private static final List<MusicFolder> MULTI_FOLDERS = Arrays.asList(MUSIC_FOLDER1, MUSIC_FOLDER2);
 
 
     /*

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() {

checkstyle.xml

@@ -57,6 +57,7 @@
         <module name="RequireThis"/>
         <module name="SimplifyBooleanExpression"/>
         <module name="SimplifyBooleanReturn"/>
+        <module name="SingleSpaceSeparator"/>
         <module name="StringLiteralEquality"/>
         <module name="SuperClone"/>
         <module name="SuperFinalize"/>