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

Fix integration tests by delegating to existing servlets

Browse Source
This commit is contained in:
René Pfeuffer
2018-09-04 20:29:17 +02:00
parent 3f772b3688
commit c4b34752b4
16 changed files with 90 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitRepositoryServiceProvider.java
View File

@@ -40,6 +40,7 @@ import sonia.scm.repository.GitRepositoryHandler;
import sonia.scm.repository.Repository;
import sonia.scm.repository.api.Command;
import sonia.scm.repository.api.ScmProtocol;
import sonia.scm.web.ScmGitServlet;
import java.io.IOException;
import java.util.Collections;
@@ -250,8 +251,7 @@ public class GitRepositoryServiceProvider extends RepositoryServiceProvider
@Override
public Set<ScmProtocol> getSupportedProtocols() {
// TODO #9246
return Collections.emptySet();
return Collections.singleton(new ScmGitServlet(null, null, null, null, null, null));
}
//~--- fields ---------------------------------------------------------------

16
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/ScmGitServlet.java
View File

@@ -44,6 +44,7 @@ import org.slf4j.Logger;
import sonia.scm.repository.Repository;
import sonia.scm.repository.RepositoryProvider;
import sonia.scm.repository.RepositoryRequestListenerUtil;
import sonia.scm.repository.spi.HttpScmProtocol;
import sonia.scm.util.HttpUtil;
import sonia.scm.web.lfs.servlet.LfsServletFactory;
@@ -51,7 +52,9 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.core.UriInfo;
import java.io.IOException;
import java.net.URI;
import java.util.regex.Pattern;
import static org.eclipse.jgit.lfs.lib.Constants.CONTENT_TYPE_GIT_LFS_JSON;
@@ -64,7 +67,7 @@ import static org.slf4j.LoggerFactory.getLogger;
* @author Sebastian Sdorra
*/
@Singleton
public class ScmGitServlet extends GitServlet
public class ScmGitServlet extends GitServlet implements HttpScmProtocol
{
/** Field description */
@@ -284,6 +287,16 @@ public class ScmGitServlet extends GitServlet
return false;
}
@Override
public void serve(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
service(request, response);
}
@Override
public String getUrl(Repository repository, UriInfo uriInfo) {
return uriInfo.getBaseUri().resolve(URI.create("../../git/" + repository.getNamespace() + "/" + repository.getName())).toASCIIString();
}
//~--- fields ---------------------------------------------------------------
@@ -299,5 +312,4 @@ public class ScmGitServlet extends GitServlet
private final GitRepositoryViewer repositoryViewer;
private final LfsServletFactory lfsServletFactory;
}