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

improve changeset preprocessor api

Browse Source
This commit is contained in:
Sebastian Sdorra
2011-08-15 15:07:35 +02:00
parent c3b8fc8e72
commit 12299bacae
4 changed files with 31 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,8 +48,8 @@ import sonia.scm.repository.BrowserResult;
import sonia.scm.repository.Changeset;
import sonia.scm.repository.ChangesetPagingResult;
import sonia.scm.repository.ChangesetPreProcessor;
import sonia.scm.repository.ChangesetPreProcessorFactory;
import sonia.scm.repository.ChangesetViewerUtil;
import sonia.scm.repository.ExtendedChangesetPreProcessor;
import sonia.scm.repository.PathNotFoundException;
import sonia.scm.repository.Permission;
import sonia.scm.repository.PermissionType;
@@ -114,7 +114,7 @@ public class RepositoryResource
* @param repositoryManager
* @param securityContextProvider
* @param changesetPreProcessorSet
* @param extChangesetPreProcessorSet
* @param changesetPreProcessorFactorySet
* @param changesetViewerUtil
* @param repositoryBrowserUtil
*/
@@ -123,7 +123,7 @@ public class RepositoryResource
ScmConfiguration configuration, RepositoryManager repositoryManager,
Provider<WebSecurityContext> securityContextProvider,
Set<ChangesetPreProcessor> changesetPreProcessorSet,
Set<ExtendedChangesetPreProcessor> extChangesetPreProcessorSet,
Set<ChangesetPreProcessorFactory> changesetPreProcessorFactorySet,
ChangesetViewerUtil changesetViewerUtil,
RepositoryBrowserUtil repositoryBrowserUtil)
{
@@ -132,7 +132,7 @@ public class RepositoryResource
this.repositoryManager = repositoryManager;
this.securityContextProvider = securityContextProvider;
this.changesetPreProcessorSet = changesetPreProcessorSet;
this.extChangesetPreProcessorSet = extChangesetPreProcessorSet;
this.changesetPreProcessorFactorySet = changesetPreProcessorFactorySet;
this.changesetViewerUtil = changesetViewerUtil;
this.repositoryBrowserUtil = repositoryBrowserUtil;
setDisableCache(false);
@@ -220,7 +220,7 @@ public class RepositoryResource
if (Util.isNotEmpty(changesets.getChangesets()))
{
callPreProcessors(changesets);
callExtendedPreProcessors(id, changesets);
callPreProcessorFactories(id, changesets);
}
response = Response.ok(changesets).build();
@@ -401,20 +401,23 @@ public class RepositoryResource
* @param id
* @param changesets
*/
private void callExtendedPreProcessors(String id,
private void callPreProcessorFactories(String id,
ChangesetPagingResult changesets)
{
if (Util.isNotEmpty(extChangesetPreProcessorSet))
if (Util.isNotEmpty(changesetPreProcessorFactorySet))
{
Repository repository = repositoryManager.get(id);
if (repository != null)
{
for (Changeset c : changesets.getChangesets())
for (ChangesetPreProcessorFactory factory :
changesetPreProcessorFactorySet)
{
for (ExtendedChangesetPreProcessor ecpp : extChangesetPreProcessorSet)
ChangesetPreProcessor cpp = factory.createPreProcessor(repository);
for (Changeset c : changesets.getChangesets())
{
ecpp.process(repository, c);
cpp.process(c);
}
}
}
@@ -571,6 +574,9 @@ public class RepositoryResource
//~--- fields ---------------------------------------------------------------
/** Field description */
private Set<ChangesetPreProcessorFactory> changesetPreProcessorFactorySet;
/** Field description */
private Set<ChangesetPreProcessor> changesetPreProcessorSet;
@@ -580,9 +586,6 @@ public class RepositoryResource
/** Field description */
private ScmConfiguration configuration;
/** Field description */
private Set<ExtendedChangesetPreProcessor> extChangesetPreProcessorSet;
/** Field description */
private RepositoryBrowserUtil repositoryBrowserUtil;