Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix formatting 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1197180 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2011-11-03 15:19:00 +00:00
parent c362beb078
commit d3fe5410c7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSearchService.java
View File

@ -49,7 +49,6 @@ import org.springframework.stereotype.Service;
import javax.inject.Inject; import javax.inject.Inject;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@ -141,18 +140,18 @@ public class DefaultSearchService
} }
} }
public GroupIdList getAllGroupIds(List<String> selectedRepos) public GroupIdList getAllGroupIds( List<String> selectedRepos )
throws ArchivaRestServiceException throws ArchivaRestServiceException
{ {
List<String> observableRepos = getObservableRepos(); List<String> observableRepos = getObservableRepos();
List<String> repos = ListUtils.intersection( observableRepos, selectedRepos ); List<String> repos = ListUtils.intersection( observableRepos, selectedRepos );
if (repos == null || repos.isEmpty()) if ( repos == null || repos.isEmpty() )
{ {
return new GroupIdList( Collections.<String>emptyList() ); return new GroupIdList( Collections.<String>emptyList() );
} }
try try
{ {
return new GroupIdList( new ArrayList<String>( repositorySearch.getAllGroupIds( getPrincipal(), repos ) ) ); return new GroupIdList( new ArrayList<String>( repositorySearch.getAllGroupIds( getPrincipal(), repos ) ) );
} }
catch ( RepositorySearchException e ) catch ( RepositorySearchException e )
{ {
@ -293,7 +292,8 @@ public class DefaultSearchService
protected String getBaseUrl( HttpServletRequest req ) protected String getBaseUrl( HttpServletRequest req )
{ {
return req.getScheme() + "://" + req.getServerName() return req.getScheme() + "://" + req.getServerName() + ( req.getServerPort() == 80
+ ( req.getServerPort() == 80 ? "" : ":" + req.getServerPort() ) + req.getContextPath(); ? ""
: ":" + req.getServerPort() ) + req.getContextPath();
} }
} }