Use constants for repository types

This commit is contained in:
René Pfeuffer
2018-09-14 10:31:16 +02:00
parent e88639ab81
commit 4d60ebd54e
12 changed files with 21 additions and 18 deletions

View File

@@ -46,8 +46,6 @@ import sonia.scm.repository.Repository;
@Extension
public class GitRepositoryServiceResolver implements RepositoryServiceResolver {
public static final String TYPE = "git";
private final GitRepositoryHandler handler;
@Inject
@@ -59,7 +57,7 @@ public class GitRepositoryServiceResolver implements RepositoryServiceResolver {
public GitRepositoryServiceProvider resolve(Repository repository) {
GitRepositoryServiceProvider provider = null;
if (TYPE.equalsIgnoreCase(repository.getType())) {
if (GitRepositoryHandler.TYPE_NAME.equalsIgnoreCase(repository.getType())) {
provider = new GitRepositoryServiceProvider(handler, repository);
}

View File

@@ -2,6 +2,7 @@ package sonia.scm.web;
import sonia.scm.config.ScmConfiguration;
import sonia.scm.plugin.Extension;
import sonia.scm.repository.GitRepositoryHandler;
import sonia.scm.repository.spi.ScmProviderHttpServlet;
import sonia.scm.repository.spi.ScmProviderHttpServletDecoratorFactory;
@@ -19,7 +20,7 @@ public class GitPermissionFilterFactory implements ScmProviderHttpServletDecorat
@Override
public boolean handlesScmType(String type) {
return "git".equals(type);
return GitRepositoryHandler.TYPE_NAME.equals(type);
}
@Override

View File

@@ -3,6 +3,7 @@ package sonia.scm.web;
import sonia.scm.api.v2.resources.ScmPathInfoStore;
import sonia.scm.config.ScmConfiguration;
import sonia.scm.plugin.Extension;
import sonia.scm.repository.GitRepositoryHandler;
import sonia.scm.repository.spi.InitializingHttpScmProtocolWrapper;
import sonia.scm.repository.spi.ScmProviderHttpServlet;
@@ -20,6 +21,6 @@ public class GitScmProtocolProviderWrapper extends InitializingHttpScmProtocolWr
@Override
public String getType() {
return "git";
return GitRepositoryHandler.TYPE_NAME;
}
}

View File

@@ -1,6 +1,7 @@
package sonia.scm.web;
import com.google.inject.Inject;
import sonia.scm.repository.GitRepositoryHandler;
import sonia.scm.repository.spi.ScmProviderHttpServlet;
import sonia.scm.repository.spi.ScmProviderHttpServletProvider;
@@ -12,7 +13,7 @@ public class ScmGitServletProvider extends ScmProviderHttpServletProvider {
private Provider<ScmGitServlet> servletProvider;
public ScmGitServletProvider() {
super("git");
super(GitRepositoryHandler.TYPE_NAME);
}
@Override

View File

@@ -47,8 +47,6 @@ import sonia.scm.repository.Repository;
public class HgRepositoryServiceResolver implements RepositoryServiceResolver
{
private static final String TYPE = "hg";
private HgRepositoryHandler handler;
private HgHookManager hookManager;
@@ -64,7 +62,7 @@ public class HgRepositoryServiceResolver implements RepositoryServiceResolver
public HgRepositoryServiceProvider resolve(Repository repository) {
HgRepositoryServiceProvider provider = null;
if (TYPE.equalsIgnoreCase(repository.getType())) {
if (HgRepositoryHandler.TYPE_NAME.equalsIgnoreCase(repository.getType())) {
provider = new HgRepositoryServiceProvider(handler, hookManager, repository);
}

View File

@@ -1,6 +1,7 @@
package sonia.scm.web;
import com.google.inject.Inject;
import sonia.scm.repository.HgRepositoryHandler;
import sonia.scm.repository.spi.ScmProviderHttpServlet;
import sonia.scm.repository.spi.ScmProviderHttpServletProvider;
@@ -12,7 +13,7 @@ public class HgCGIServletProvider extends ScmProviderHttpServletProvider {
private Provider<HgCGIServlet> servletProvider;
public HgCGIServletProvider() {
super("hg");
super(HgRepositoryHandler.TYPE_NAME);
}
@Override

View File

@@ -2,6 +2,7 @@ package sonia.scm.web;
import sonia.scm.config.ScmConfiguration;
import sonia.scm.plugin.Extension;
import sonia.scm.repository.HgRepositoryHandler;
import sonia.scm.repository.spi.ScmProviderHttpServlet;
import sonia.scm.repository.spi.ScmProviderHttpServletDecoratorFactory;
@@ -19,7 +20,7 @@ public class HgPermissionFilterFactory implements ScmProviderHttpServletDecorato
@Override
public boolean handlesScmType(String type) {
return "hg".equals(type);
return HgRepositoryHandler.TYPE_NAME.equals(type);
}
@Override

View File

@@ -3,6 +3,7 @@ package sonia.scm.web;
import sonia.scm.api.v2.resources.ScmPathInfoStore;
import sonia.scm.config.ScmConfiguration;
import sonia.scm.plugin.Extension;
import sonia.scm.repository.HgRepositoryHandler;
import sonia.scm.repository.spi.InitializingHttpScmProtocolWrapper;
import sonia.scm.repository.spi.ScmProviderHttpServlet;
@@ -20,6 +21,6 @@ public class HgScmProtocolProviderWrapper extends InitializingHttpScmProtocolWra
@Override
public String getType() {
return "hg";
return HgRepositoryHandler.TYPE_NAME;
}
}

View File

@@ -40,8 +40,6 @@ import sonia.scm.repository.SvnRepositoryHandler;
@Extension
public class SvnRepositoryServiceResolver implements RepositoryServiceResolver {
public static final String TYPE = "svn";
private SvnRepositoryHandler handler;
@Inject
@@ -53,7 +51,7 @@ public class SvnRepositoryServiceResolver implements RepositoryServiceResolver {
public SvnRepositoryServiceProvider resolve(Repository repository) {
SvnRepositoryServiceProvider provider = null;
if (TYPE.equalsIgnoreCase(repository.getType())) {
if (SvnRepositoryHandler.TYPE_NAME.equalsIgnoreCase(repository.getType())) {
provider = new SvnRepositoryServiceProvider(handler, repository);
}

View File

@@ -1,6 +1,7 @@
package sonia.scm.web;
import com.google.inject.Inject;
import sonia.scm.repository.SvnRepositoryHandler;
import sonia.scm.repository.spi.ScmProviderHttpServlet;
import sonia.scm.repository.spi.ScmProviderHttpServletProvider;
@@ -12,7 +13,7 @@ public class SvnDAVServletProvider extends ScmProviderHttpServletProvider {
private Provider<SvnDAVServlet> servletProvider;
public SvnDAVServletProvider() {
super("svn");
super(SvnRepositoryHandler.TYPE_NAME);
}
@Override

View File

@@ -2,6 +2,7 @@ package sonia.scm.web;
import sonia.scm.config.ScmConfiguration;
import sonia.scm.plugin.Extension;
import sonia.scm.repository.SvnRepositoryHandler;
import sonia.scm.repository.spi.ScmProviderHttpServlet;
import sonia.scm.repository.spi.ScmProviderHttpServletDecoratorFactory;
@@ -19,7 +20,7 @@ public class SvnPermissionFilterFactory implements ScmProviderHttpServletDecorat
@Override
public boolean handlesScmType(String type) {
return "svn".equals(type);
return SvnRepositoryHandler.TYPE_NAME.equals(type);
}
@Override

View File

@@ -3,6 +3,7 @@ package sonia.scm.web;
import sonia.scm.api.v2.resources.ScmPathInfoStore;
import sonia.scm.config.ScmConfiguration;
import sonia.scm.plugin.Extension;
import sonia.scm.repository.SvnRepositoryHandler;
import sonia.scm.repository.spi.InitializingHttpScmProtocolWrapper;
import sonia.scm.repository.spi.ScmProviderHttpServlet;
@@ -22,7 +23,7 @@ public class SvnScmProtocolProviderWrapper extends InitializingHttpScmProtocolWr
@Override
public String getType() {
return "svn";
return SvnRepositoryHandler.TYPE_NAME;
}
@Inject