From d3fe5410c76033a49085ed2eb0bb58b9db4cfd12 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Thu, 3 Nov 2011 15:19:00 +0000 Subject: [PATCH] fix formatting git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1197180 13f79535-47bb-0310-9956-ffa450edef68 --- .../archiva/rest/services/DefaultSearchService.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSearchService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSearchService.java index cc7b60690..d71f26a4d 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSearchService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSearchService.java @@ -49,7 +49,6 @@ import org.springframework.stereotype.Service; import javax.inject.Inject; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; -import java.util.Collection; import java.util.Collections; import java.util.List; @@ -141,18 +140,18 @@ public class DefaultSearchService } } - public GroupIdList getAllGroupIds(List selectedRepos) + public GroupIdList getAllGroupIds( List selectedRepos ) throws ArchivaRestServiceException { List observableRepos = getObservableRepos(); List repos = ListUtils.intersection( observableRepos, selectedRepos ); - if (repos == null || repos.isEmpty()) + if ( repos == null || repos.isEmpty() ) { return new GroupIdList( Collections.emptyList() ); } try { - return new GroupIdList( new ArrayList( repositorySearch.getAllGroupIds( getPrincipal(), repos ) ) ); + return new GroupIdList( new ArrayList( repositorySearch.getAllGroupIds( getPrincipal(), repos ) ) ); } catch ( RepositorySearchException e ) { @@ -293,7 +292,8 @@ public class DefaultSearchService protected String getBaseUrl( HttpServletRequest req ) { - return req.getScheme() + "://" + req.getServerName() - + ( req.getServerPort() == 80 ? "" : ":" + req.getServerPort() ) + req.getContextPath(); + return req.getScheme() + "://" + req.getServerName() + ( req.getServerPort() == 80 + ? "" + : ":" + req.getServerPort() ) + req.getContextPath(); } } -- 2.39.5