Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-10 15:35:49 +01:00
Code Issues Packages Projects Releases Activity

improve importRepositories method

Browse Source
This commit is contained in:
Sebastian Sdorra
2012-01-15 15:22:41 +01:00
parent 96ebd201f0
commit 92fc75711a
1 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryImportResource.java
View File

@@ -44,6 +44,7 @@ import org.slf4j.LoggerFactory;
import sonia.scm.NotSupportedFeatuerException; import sonia.scm.NotSupportedFeatuerException;
import sonia.scm.Type; import sonia.scm.Type;
import sonia.scm.repository.Repository;
import sonia.scm.repository.RepositoryHandler; import sonia.scm.repository.RepositoryHandler;
import sonia.scm.repository.RepositoryManager; import sonia.scm.repository.RepositoryManager;
import sonia.scm.util.SecurityUtil; import sonia.scm.util.SecurityUtil;
@@ -111,19 +112,38 @@ public class RepositoryImportResource
@POST @POST
@Path("{type}") @Path("{type}")
@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
public GenericEntity<List<String>> importRepositories( public GenericEntity<List<Repository>> importRepositories(
@PathParam("type") String type) @PathParam("type") String type)
{ {
SecurityUtil.assertIsAdmin(securityContextProvider); SecurityUtil.assertIsAdmin(securityContextProvider);
List<String> repositories = null; List<Repository> repositories = new ArrayList<Repository>();
RepositoryHandler handler = manager.getHandler(type); RepositoryHandler handler = manager.getHandler(type);
if (handler != null) if (handler != null)
{ {
try try
{ {
repositories = handler.getImportHandler().importRepositories(manager); List<String> repositoryNames =
handler.getImportHandler().importRepositories(manager);
if (repositoryNames != null)
{
for (String repositoryName : repositoryNames)
{
Repository repository = manager.get(type, repositoryName);
if (repository != null)
{
repositories.add(repository);
}
else if (logger.isWarnEnabled())
{
logger.warn("could not find imported repository {}",
repositoryName);
}
}
}
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -135,12 +155,7 @@ public class RepositoryImportResource
logger.warn("could not find handler for type {}", type); logger.warn("could not find handler for type {}", type);
} }
if (repositories == null) return new GenericEntity<List<Repository>>(repositories) {}
{
repositories = new ArrayList<String>();
}
return new GenericEntity<List<String>>(repositories) {}
; ;
} }