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

Add servlet decorators for hg and svn

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

12
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/ScmProviderHttpServletProvider.java → scm-core/src/main/java/sonia/scm/repository/spi/ScmProviderHttpServletProvider.java
View File

@@ -1,8 +1,6 @@
package sonia.scm.web;
package sonia.scm.repository.spi;
import com.google.inject.Inject;
import sonia.scm.repository.spi.ScmProviderHttpServlet;
import sonia.scm.repository.spi.ScmProviderHttpServletDecoratorFactory;
import sonia.scm.util.Decorators;
import javax.inject.Provider;
@@ -15,9 +13,15 @@ public abstract class ScmProviderHttpServletProvider implements Provider<ScmProv
@Inject(optional = true)
private Set<ScmProviderHttpServletDecoratorFactory> decoratorFactories;
private final String type;
protected ScmProviderHttpServletProvider(String type) {
this.type = type;
}
@Override
public ScmProviderHttpServlet get() {
return Decorators.decorate(getRootServlet(), decoratorFactories.stream().filter(d -> d.handlesScmType("git")).collect(toList()));
return Decorators.decorate(getRootServlet(), decoratorFactories.stream().filter(d -> d.handlesScmType(type)).collect(toList()));
}
protected abstract ScmProviderHttpServlet getRootServlet();

12
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/ScmGitServletProvider.java
View File

@@ -1,16 +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 ScmGitServletProvider extends ScmProviderHttpServletProvider {
@Inject
private Provider<ScmGitServlet> scmGitServlet;
private Provider<ScmGitServlet> servletProvider;
public ScmGitServletProvider() {
super("git");
}
@Override
protected ScmGitServlet getRootServlet() {
return scmGitServlet.get();
protected ScmProviderHttpServlet getRootServlet() {
return servletProvider.get();
}
}

14
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/Hg.java Normal file
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 {
}

22
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgCGIServletProvider.java Normal file
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();
}
}

3
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgScmProtocolProviderWrapper.java
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);
}

3
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgServletModule.java
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);
}

14
scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/web/Svn.java Normal file
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 Svn {
}

22
scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/web/SvnDAVServletProvider.java Normal file
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 SvnDAVServletProvider extends ScmProviderHttpServletProvider {
@Inject
private Provider<SvnDAVServlet> servletProvider;
public SvnDAVServletProvider() {
super("svn");
}
@Override
protected ScmProviderHttpServlet getRootServlet() {
return servletProvider.get();
}
}

2
scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/web/SvnScmProtocolProviderWrapper.java
View File

@@ -26,7 +26,7 @@ public class SvnScmProtocolProviderWrapper extends InitializingHttpScmProtocolWr
}
@Inject
public SvnScmProtocolProviderWrapper(Provider<SvnDAVServlet> servletProvider, Provider<SvnPermissionFilter> permissionFilter, Provider<ScmPathInfoStore> uriInfoStore, ScmConfiguration scmConfiguration) {
public SvnScmProtocolProviderWrapper(@Svn Provider<ScmProviderHttpServlet> servletProvider, Provider<SvnPermissionFilter> permissionFilter, Provider<ScmPathInfoStore> uriInfoStore, ScmConfiguration scmConfiguration) {
super(servletProvider, permissionFilter, uriInfoStore, scmConfiguration);
}

3
scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/web/SvnServletModule.java
View File

@@ -38,6 +38,7 @@ import org.mapstruct.factory.Mappers;
import sonia.scm.api.v2.resources.SvnConfigDtoToSvnConfigMapper;
import sonia.scm.api.v2.resources.SvnConfigToSvnConfigDtoMapper;
import sonia.scm.plugin.Extension;
import sonia.scm.repository.spi.ScmProviderHttpServlet;
/**
*
@@ -50,5 +51,7 @@ public class SvnServletModule extends ServletModule {
protected void configureServlets() {
bind(SvnConfigDtoToSvnConfigMapper.class).to(Mappers.getMapper(SvnConfigDtoToSvnConfigMapper.class).getClass());
bind(SvnConfigToSvnConfigDtoMapper.class).to(Mappers.getMapper(SvnConfigToSvnConfigDtoMapper.class).getClass());
bind(ScmProviderHttpServlet.class).annotatedWith(Svn.class).toProvider(SvnDAVServletProvider.class);
}
}