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

Remove hooks for internal repository id

Browse Source
This commit is contained in:
René Pfeuffer
2018-11-23 16:12:35 +01:00
parent 1a9c3a1a6c
commit c8fc673ce0
10 changed files with 44 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgHookChangesetProvider.java
View File

@@ -62,11 +62,11 @@ public class HgHookChangesetProvider implements HookChangesetProvider
//~--- constructors ---------------------------------------------------------
public HgHookChangesetProvider(HgRepositoryHandler handler,
String id, HgHookManager hookManager, String startRev,
RepositoryHookType type)
sonia.scm.repository.Repository repository, HgHookManager hookManager, String startRev,
RepositoryHookType type)
{
this.handler = handler;
this.id = id;
this.repository = repository;
this.hookManager = hookManager;
this.startRev = startRev;
this.type = type;
@@ -123,9 +123,7 @@ public class HgHookChangesetProvider implements HookChangesetProvider
*/
private Repository open()
{
sonia.scm.repository.Repository repo = new sonia.scm.repository.Repository();
repo.setId(id);
File repositoryDirectory = handler.getDirectory(repo);
File repositoryDirectory = handler.getDirectory(repository);
// use HG_PENDING only for pre receive hooks
boolean pending = type == RepositoryHookType.PRE_RECEIVE;
@@ -144,7 +142,7 @@ public class HgHookChangesetProvider implements HookChangesetProvider
private HgHookManager hookManager;
/** Field description */
private String id;
private sonia.scm.repository.Repository repository;
/** Field description */
private HookChangesetResponse response;

9
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgHookContextProvider.java
View File

@@ -35,6 +35,7 @@ package sonia.scm.repository.spi;
import sonia.scm.repository.HgHookManager;
import sonia.scm.repository.HgRepositoryHandler;
import sonia.scm.repository.Repository;
import sonia.scm.repository.RepositoryHookType;
import sonia.scm.repository.api.HgHookBranchProvider;
import sonia.scm.repository.api.HgHookMessageProvider;
@@ -67,16 +68,16 @@ public class HgHookContextProvider extends HookContextProvider
* Constructs a new instance.
*
* @param handler mercurial repository handler
* @param namespaceAndName namespace and name of changed repository
* @param repository the changed repository
* @param hookManager mercurial hook manager
* @param startRev start revision
* @param type type of hook
*/
public HgHookContextProvider(HgRepositoryHandler handler,
String id, HgHookManager hookManager, String startRev,
RepositoryHookType type)
Repository repository, HgHookManager hookManager, String startRev,
RepositoryHookType type)
{
this.hookChangesetProvider = new HgHookChangesetProvider(handler, id, hookManager, startRev, type);
this.hookChangesetProvider = new HgHookChangesetProvider(handler, repository, hookManager, startRev, type);
}
//~--- get methods ----------------------------------------------------------

23
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgHookCallbackServlet.java
View File

@@ -48,6 +48,7 @@ import sonia.scm.NotFoundException;
import sonia.scm.repository.HgContext;
import sonia.scm.repository.HgHookManager;
import sonia.scm.repository.HgRepositoryHandler;
import sonia.scm.repository.Repository;
import sonia.scm.repository.RepositoryDAO;
import sonia.scm.repository.RepositoryHookType;
import sonia.scm.repository.api.HgHookMessage;
@@ -170,7 +171,7 @@ public class HgHookCallbackServlet extends HttpServlet
if (m.matches())
{
String id = getRepositoryId(request);
Repository repository = getRepositoryId(request);
String type = m.group(1);
String challenge = request.getParameter(PARAM_CHALLENGE);
@@ -187,7 +188,7 @@ public class HgHookCallbackServlet extends HttpServlet
authenticate(request, credentials);
}
hookCallback(response, id, type, challenge, node);
hookCallback(response, repository, type, challenge, node);
}
else if (logger.isDebugEnabled())
{
@@ -246,7 +247,7 @@ public class HgHookCallbackServlet extends HttpServlet
}
}
private void fireHook(HttpServletResponse response, String id,
private void fireHook(HttpServletResponse response, Repository repository,
String node, RepositoryHookType type)
throws IOException
{
@@ -259,10 +260,10 @@ public class HgHookCallbackServlet extends HttpServlet
contextProvider.get().setPending(true);
}
context = new HgHookContextProvider(handler, id, hookManager,
context = new HgHookContextProvider(handler, repository, hookManager,
node, type);
hookEventFacade.handle(id).fireHookEvent(type, context);
hookEventFacade.handle(repository).fireHookEvent(type, context);
printMessages(response, context);
}
@@ -280,7 +281,7 @@ public class HgHookCallbackServlet extends HttpServlet
}
}
private void hookCallback(HttpServletResponse response, String id, String typeName, String challenge, String node) throws IOException {
private void hookCallback(HttpServletResponse response, Repository repository, String typeName, String challenge, String node) throws IOException {
if (hookManager.isAcceptAble(challenge))
{
RepositoryHookType type = null;
@@ -296,7 +297,7 @@ public class HgHookCallbackServlet extends HttpServlet
if (type != null)
{
fireHook(response, id, node, type);
fireHook(response, repository, node, type);
}
else
{
@@ -450,20 +451,20 @@ public class HgHookCallbackServlet extends HttpServlet
* @return
*/
@SuppressWarnings("squid:S2083") // we do nothing with the path given, so this should be no issue
private String getRepositoryId(HttpServletRequest request)
private Repository getRepositoryId(HttpServletRequest request)
{
String id = null;
Repository repository = null;
String path = request.getParameter(PARAM_REPOSITORYPATH);
if (Util.isNotEmpty(path)) {
id = repositoryDAO.getIdForDirectory(new File(path));
repository = repositoryDAO.getRepositoryForDirectory(new File(path));
}
else if (logger.isWarnEnabled())
{
logger.warn("no repository path parameter found");
}
return id;
return repository;
}
//~--- fields ---------------------------------------------------------------