From d4aff1dca52934b6c8306271cf942933aed456ea Mon Sep 17 00:00:00 2001 From: Evan Harris Date: Tue, 3 Sep 2019 04:35:50 -0500 Subject: [PATCH] Added checkstyle to prohibit windows line endings Suggestion taken from jvoisin in #1121. --- .../player/service/SearchService.java | 150 +++++++++--------- checkstyle.xml | 6 + 2 files changed, 81 insertions(+), 75 deletions(-) diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/SearchService.java b/airsonic-main/src/main/java/org/airsonic/player/service/SearchService.java index 5ebcceb5..bfbd7b32 100644 --- a/airsonic-main/src/main/java/org/airsonic/player/service/SearchService.java +++ b/airsonic-main/src/main/java/org/airsonic/player/service/SearchService.java @@ -1,75 +1,75 @@ -/* - This file is part of Airsonic. - - Airsonic is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - Airsonic is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Airsonic. If not, see . - - Copyright 2016 (C) Airsonic Authors - Based upon Subsonic, Copyright 2009 (C) Sindre Mehus - */ - -package org.airsonic.player.service; - -import org.airsonic.player.domain.Album; -import org.airsonic.player.domain.MediaFile; -import org.airsonic.player.domain.MusicFolder; -import org.airsonic.player.domain.ParamSearchResult; -import org.airsonic.player.domain.RandomSearchCriteria; -import org.airsonic.player.domain.SearchCriteria; -import org.airsonic.player.domain.SearchResult; -import org.airsonic.player.service.search.IndexType; - -import java.util.List; - -/** - * Performs Lucene-based searching. - * - * @author Sindre Mehus - * @version $Id$ - * @see MediaScannerService - */ -public interface SearchService { - - SearchResult search(SearchCriteria criteria, List musicFolders, - IndexType indexType); - - /** - * Returns a number of random songs. - * - * @param criteria Search criteria. - * @return List of random songs. - */ - List getRandomSongs(RandomSearchCriteria criteria); - - /** - * Returns a number of random albums. - * - * @param count Number of albums to return. - * @param musicFolders Only return albums from these folders. - * @return List of random albums. - */ - List getRandomAlbums(int count, List musicFolders); - - /** - * Returns a number of random albums, using ID3 tag. - * - * @param count Number of albums to return. - * @param musicFolders Only return albums from these folders. - * @return List of random albums. - */ - List getRandomAlbumsId3(int count, List musicFolders); - - ParamSearchResult searchByName( - String name, int offset, int count, List folderList, Class clazz); - -} +/* + This file is part of Airsonic. + + Airsonic is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Airsonic is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Airsonic. If not, see . + + Copyright 2016 (C) Airsonic Authors + Based upon Subsonic, Copyright 2009 (C) Sindre Mehus + */ + +package org.airsonic.player.service; + +import org.airsonic.player.domain.Album; +import org.airsonic.player.domain.MediaFile; +import org.airsonic.player.domain.MusicFolder; +import org.airsonic.player.domain.ParamSearchResult; +import org.airsonic.player.domain.RandomSearchCriteria; +import org.airsonic.player.domain.SearchCriteria; +import org.airsonic.player.domain.SearchResult; +import org.airsonic.player.service.search.IndexType; + +import java.util.List; + +/** + * Performs Lucene-based searching. + * + * @author Sindre Mehus + * @version $Id$ + * @see MediaScannerService + */ +public interface SearchService { + + SearchResult search(SearchCriteria criteria, List musicFolders, + IndexType indexType); + + /** + * Returns a number of random songs. + * + * @param criteria Search criteria. + * @return List of random songs. + */ + List getRandomSongs(RandomSearchCriteria criteria); + + /** + * Returns a number of random albums. + * + * @param count Number of albums to return. + * @param musicFolders Only return albums from these folders. + * @return List of random albums. + */ + List getRandomAlbums(int count, List musicFolders); + + /** + * Returns a number of random albums, using ID3 tag. + * + * @param count Number of albums to return. + * @param musicFolders Only return albums from these folders. + * @return List of random albums. + */ + List getRandomAlbumsId3(int count, List musicFolders); + + ParamSearchResult searchByName( + String name, int offset, int count, List folderList, Class clazz); + +} diff --git a/checkstyle.xml b/checkstyle.xml index f7540363..0eafb727 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -12,6 +12,12 @@ + + + + + +