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

Generalize servlet decorator structure

Browse Source
This commit is contained in:
René Pfeuffer
2018-09-14 09:15:46 +02:00
parent a075962a66
commit 6ab5f58fe9
5 changed files with 70 additions and 16 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/ScmGitServletProvider.java
View File

@@ -1,22 +1,16 @@
package sonia.scm.web;
import com.google.inject.Inject;
import sonia.scm.repository.spi.ScmProviderHttpServlet;
import sonia.scm.repository.spi.ScmProviderHttpServletFactory;
import sonia.scm.util.Decorators;
import javax.inject.Provider;
import java.util.Set;
public class ScmGitServletProvider implements Provider<ScmProviderHttpServlet> {
public class ScmGitServletProvider extends ScmProviderHttpServletProvider {
@Inject
private Provider<ScmGitServlet> scmGitServlet;
@Inject(optional = true)
private Set<ScmProviderHttpServletFactory> decoratorFactories;
@Override
public ScmProviderHttpServlet get() {
return Decorators.decorate(scmGitServlet.get(), decoratorFactories);
protected ScmGitServlet getRootServlet() {
return scmGitServlet.get();
}
}

24
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/ScmProviderHttpServletProvider.java Normal file
View File

@@ -0,0 +1,24 @@
package sonia.scm.web;
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;
import java.util.Set;
import static java.util.stream.Collectors.toList;
public abstract class ScmProviderHttpServletProvider implements Provider<ScmProviderHttpServlet> {
@Inject(optional = true)
private Set<ScmProviderHttpServletDecoratorFactory> decoratorFactories;
@Override
public ScmProviderHttpServlet get() {
return Decorators.decorate(getRootServlet(), decoratorFactories.stream().filter(d -> d.handlesScmType("git")).collect(toList()));
}
protected abstract ScmProviderHttpServlet getRootServlet();
}