improve ChangesetViewer api

This commit is contained in:
Sebastian Sdorra
2011-04-03 11:16:40 +02:00
parent ae758e2a33
commit f2b876a2c1
4 changed files with 51 additions and 22 deletions

View File

@@ -69,6 +69,9 @@ public interface RepositoryHandler
* *
* @param repository * @param repository
* @return null if ChangesetViewer is not supported * @return null if ChangesetViewer is not supported
*
* @throws RepositoryException
*/ */
public ChangesetViewer getChangesetViewer(Repository repository); public ChangesetViewer getChangesetViewer(Repository repository)
throws RepositoryException;
} }

View File

@@ -63,6 +63,19 @@ public interface RepositoryManager
*/ */
public Repository get(String type, String name); public Repository get(String type, String name);
/**
* Method description
*
*
*
* @param repository
* @return null if ChangesetViewer is not supported
*
* @throws RepositoryException
*/
public ChangesetViewer getChangesetViewer(Repository repository)
throws RepositoryException;
/** /**
* Method description * Method description
* *

View File

@@ -120,6 +120,8 @@ public class RepositoryResource
* @param max * @param max
* *
* @return * @return
*
* @throws RepositoryException
*/ */
@GET @GET
@Path("{id}/changesets") @Path("{id}/changesets")
@@ -127,19 +129,15 @@ public class RepositoryResource
public Response getChangesets(@PathParam("id") String id, public Response getChangesets(@PathParam("id") String id,
@QueryParam("changeset") String startId, @QueryParam("changeset") String startId,
@DefaultValue("25") @QueryParam("max") int max) @DefaultValue("25") @QueryParam("max") int max)
throws RepositoryException
{ {
Response response = null; Response response = null;
Repository repository = repositoryManager.get(id); Repository repository = repositoryManager.get(id);
if (repository != null) if (repository != null)
{
RepositoryHandler handler =
repositoryManager.getHandler(repository.getType());
if (handler != null)
{ {
ChangesetViewer changesetViewer = ChangesetViewer changesetViewer =
handler.getChangesetViewer(repository); repositoryManager.getChangesetViewer(repository);
if (changesetViewer != null) if (changesetViewer != null)
{ {
@@ -154,8 +152,7 @@ public class RepositoryResource
changesets = changesetViewer.getLastChangesets(max); changesets = changesetViewer.getLastChangesets(max);
} }
response = response = Response.ok(new GenericEntity<List<Changeset>>(changesets) {}
Response.ok(new GenericEntity<List<Changeset>>(changesets) {}
).build(); ).build();
} }
else else
@@ -167,11 +164,6 @@ public class RepositoryResource
{ {
response = Response.status(Response.Status.NOT_FOUND).build(); response = Response.status(Response.Status.NOT_FOUND).build();
} }
}
else
{
response = Response.status(Response.Status.NOT_FOUND).build();
}
return response; return response;
} }

View File

@@ -47,6 +47,7 @@ import sonia.scm.HandlerEvent;
import sonia.scm.SCMContextProvider; import sonia.scm.SCMContextProvider;
import sonia.scm.Type; import sonia.scm.Type;
import sonia.scm.repository.AbstractRepositoryManager; import sonia.scm.repository.AbstractRepositoryManager;
import sonia.scm.repository.ChangesetViewer;
import sonia.scm.repository.PermissionType; import sonia.scm.repository.PermissionType;
import sonia.scm.repository.PermissionUtil; import sonia.scm.repository.PermissionUtil;
import sonia.scm.repository.Repository; import sonia.scm.repository.Repository;
@@ -393,6 +394,26 @@ public class XmlRepositoryManager extends AbstractRepositoryManager
return repositories; return repositories;
} }
/**
* Method description
*
*
* @param repository
*
* @return
*
* @throws RepositoryException
*/
@Override
public ChangesetViewer getChangesetViewer(Repository repository)
throws RepositoryException
{
AssertUtil.assertIsNotNull(repository);
isReader(repository);
return getHandler(repository).getChangesetViewer(repository);
}
/** /**
* Method description * Method description
* *