Add servlet decorators for hg and svn

This commit is contained in:
René Pfeuffer
2018-09-14 09:36:56 +02:00
parent 6ab5f58fe9
commit 7de9f69061
10 changed files with 98 additions and 9 deletions

View File

@@ -0,0 +1,14 @@
package sonia.scm.web;
import com.google.inject.BindingAnnotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
@BindingAnnotation
@Target({ ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER })
@Retention(RetentionPolicy.RUNTIME)
@interface Hg {
}

View File

@@ -0,0 +1,22 @@
package sonia.scm.web;
import com.google.inject.Inject;
import sonia.scm.repository.spi.ScmProviderHttpServlet;
import sonia.scm.repository.spi.ScmProviderHttpServletProvider;
import javax.inject.Provider;
public class HgCGIServletProvider extends ScmProviderHttpServletProvider {
@Inject
private Provider<HgCGIServlet> servletProvider;
public HgCGIServletProvider() {
super("hg");
}
@Override
protected ScmProviderHttpServlet getRootServlet() {
return servletProvider.get();
}
}

View File

@@ -4,6 +4,7 @@ import sonia.scm.api.v2.resources.ScmPathInfoStore;
import sonia.scm.config.ScmConfiguration;
import sonia.scm.plugin.Extension;
import sonia.scm.repository.spi.InitializingHttpScmProtocolWrapper;
import sonia.scm.repository.spi.ScmProviderHttpServlet;
import javax.inject.Inject;
import javax.inject.Provider;
@@ -13,7 +14,7 @@ import javax.inject.Singleton;
@Extension
public class HgScmProtocolProviderWrapper extends InitializingHttpScmProtocolWrapper {
@Inject
public HgScmProtocolProviderWrapper(Provider<HgCGIServlet> servletProvider, Provider<HgPermissionFilter> permissionFilter, Provider<ScmPathInfoStore> uriInfoStore, ScmConfiguration scmConfiguration) {
public HgScmProtocolProviderWrapper(@Hg Provider<ScmProviderHttpServlet> servletProvider, Provider<HgPermissionFilter> permissionFilter, Provider<ScmPathInfoStore> uriInfoStore, ScmConfiguration scmConfiguration) {
super(servletProvider, permissionFilter, uriInfoStore, scmConfiguration);
}

View File

@@ -46,6 +46,7 @@ import sonia.scm.plugin.Extension;
import sonia.scm.repository.HgContext;
import sonia.scm.repository.HgContextProvider;
import sonia.scm.repository.HgHookManager;
import sonia.scm.repository.spi.ScmProviderHttpServlet;
/**
*
@@ -79,6 +80,8 @@ public class HgServletModule extends ServletModule
bind(HgConfigPackagesToDtoMapper.class).to(Mappers.getMapper(HgConfigPackagesToDtoMapper.class).getClass());
bind(HgConfigInstallationsToDtoMapper.class);
bind(ScmProviderHttpServlet.class).annotatedWith(Hg.class).toProvider(HgCGIServletProvider.class);
// bind servlets
serve(MAPPING_HOOK).with(HgHookCallbackServlet.class);
}