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

Inject repository from service provider

Browse Source
This commit is contained in:
René Pfeuffer
2018-09-10 14:00:13 +02:00
parent 8c675f5dd8
commit ce518ad784
13 changed files with 66 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgRepositoryServiceProvider.java
View File

@@ -81,16 +81,6 @@ public class HgRepositoryServiceProvider extends RepositoryServiceProvider
//~--- constructors ---------------------------------------------------------
/**
* Constructs ...
*
*
*
* @param handler
* @param hookManager
* @param repository
* @param httpScmProtocol
*/
HgRepositoryServiceProvider(HgRepositoryHandler handler,
HgHookManager hookManager, Repository repository, HttpScmProtocol httpScmProtocol)
{

8
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgRepositoryServiceResolver.java
View File

@@ -65,11 +65,11 @@ public class HgRepositoryServiceResolver implements RepositoryServiceResolver
*/
@Inject
public HgRepositoryServiceResolver(HgRepositoryHandler handler,
HgHookManager hookManager, HgScmProtocolProviderWrapper httpScmProtocol)
HgHookManager hookManager, HgScmProtocolProviderWrapper providerWrapper)
{
this.handler = handler;
this.hookManager = hookManager;
this.httpScmProtocol = httpScmProtocol;
this.providerWrapper = providerWrapper;
}
//~--- methods --------------------------------------------------------------
@@ -90,7 +90,7 @@ public class HgRepositoryServiceResolver implements RepositoryServiceResolver
if (TYPE.equalsIgnoreCase(repository.getType()))
{
provider = new HgRepositoryServiceProvider(handler, hookManager,
repository, httpScmProtocol);
repository, providerWrapper.get(repository));
}
return provider;
@@ -104,5 +104,5 @@ public class HgRepositoryServiceResolver implements RepositoryServiceResolver
/** Field description */
private HgHookManager hookManager;
private final HttpScmProtocol httpScmProtocol;
private final HgScmProtocolProviderWrapper providerWrapper;
}

5
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgCGIServlet.java
View File

@@ -51,7 +51,6 @@ import sonia.scm.repository.HgRepositoryHandler;
import sonia.scm.repository.Repository;
import sonia.scm.repository.RepositoryProvider;
import sonia.scm.repository.RepositoryRequestListenerUtil;
import sonia.scm.repository.spi.HttpScmProtocol;
import sonia.scm.security.CipherUtil;
import sonia.scm.util.AssertUtil;
import sonia.scm.util.HttpUtil;
@@ -77,7 +76,7 @@ import java.util.Enumeration;
* @author Sebastian Sdorra
*/
@Singleton
public class HgCGIServlet extends HttpServlet implements HttpScmProtocol
public class HgCGIServlet extends HttpServlet
{
/** Field description */
@@ -347,7 +346,7 @@ public class HgCGIServlet extends HttpServlet implements HttpScmProtocol
return python;
}
@Override
// @Override
public void serve(HttpServletRequest request, HttpServletResponse response, ServletConfig config) {
service(request, response);
}