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

added caching for changesetviewer

Browse Source
This commit is contained in:
Sebastian Sdorra
2011-07-24 14:14:20 +02:00
parent 500fc68252
commit aaea181784
6 changed files with 437 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryResource.java
View File

@@ -42,12 +42,14 @@ import com.google.inject.Singleton;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sonia.scm.NotSupportedFeatuerException;
import sonia.scm.config.ScmConfiguration;
import sonia.scm.repository.BrowserResult;
import sonia.scm.repository.Changeset;
import sonia.scm.repository.ChangesetPagingResult;
import sonia.scm.repository.ChangesetPreProcessor;
import sonia.scm.repository.ChangesetViewer;
import sonia.scm.repository.ChangesetViewerUtil;
import sonia.scm.repository.FileObject;
import sonia.scm.repository.FileObjectNameComparator;
import sonia.scm.repository.PathNotFoundException;
@@ -59,6 +61,7 @@ import sonia.scm.repository.RepositoryBrowser;
import sonia.scm.repository.RepositoryException;
import sonia.scm.repository.RepositoryHandler;
import sonia.scm.repository.RepositoryManager;
import sonia.scm.repository.RepositoryNotFoundException;
import sonia.scm.repository.RevisionNotFoundException;
import sonia.scm.util.HttpUtil;
import sonia.scm.util.Util;
@@ -114,18 +117,21 @@ public class RepositoryResource
* @param repositoryManager
* @param securityContextProvider
* @param changesetPreProcessorSet
* @param changesetViewerUtil
*/
@Inject
public RepositoryResource(
ScmConfiguration configuration, RepositoryManager repositoryManager,
Provider<WebSecurityContext> securityContextProvider,
Set<ChangesetPreProcessor> changesetPreProcessorSet)
Set<ChangesetPreProcessor> changesetPreProcessorSet,
ChangesetViewerUtil changesetViewerUtil)
{
super(repositoryManager);
this.configuration = configuration;
this.repositoryManager = repositoryManager;
this.securityContextProvider = securityContextProvider;
this.changesetPreProcessorSet = changesetPreProcessorSet;
this.changesetViewerUtil = changesetViewerUtil;
setDisableCache(false);
}
@@ -213,37 +219,30 @@ public class RepositoryResource
@QueryParam("limit") int limit) throws RepositoryException
{
Response response = null;
Repository repository = repositoryManager.get(id);
if (repository != null)
try
{
ChangesetViewer changesetViewer =
repositoryManager.getChangesetViewer(repository);
ChangesetPagingResult changesets = changesetViewerUtil.getChangesets(id,
start, limit);
if (changesetViewer != null)
if (changesets != null)
{
ChangesetPagingResult changesets = changesetViewer.getChangesets(start,
limit);
if (changesets != null)
{
callPreProcessors(changesets);
response = Response.ok(changesets).build();
}
else
{
response = Response.ok().build();
}
callPreProcessors(changesets);
response = Response.ok(changesets).build();
}
else
{
response = Response.status(Response.Status.NOT_FOUND).build();
response = Response.ok().build();
}
}
else
catch (RepositoryNotFoundException ex)
{
response = Response.status(Response.Status.NOT_FOUND).build();
}
catch (NotSupportedFeatuerException ex)
{
response = Response.status(Response.Status.BAD_REQUEST).build();
}
return response;
}
@@ -566,6 +565,9 @@ public class RepositoryResource
/** Field description */
private Set<ChangesetPreProcessor> changesetPreProcessorSet;
/** Field description */
private ChangesetViewerUtil changesetViewerUtil;
/** Field description */
private ScmConfiguration configuration;