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

Replace model object exception with generic ones and migrate guice

Browse Source
This commit is contained in:
René Pfeuffer
2018-08-21 07:53:33 +02:00
parent bb9a0657a5
commit a0f74e3329
227 changed files with 1380 additions and 3549 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitRepositoryViewer.java
View File

@@ -40,17 +40,14 @@ import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
import com.google.common.io.Closeables;
import com.google.inject.Inject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sonia.scm.repository.Branch;
import sonia.scm.repository.Branches;
import sonia.scm.repository.Changeset;
import sonia.scm.repository.ChangesetPagingResult;
import sonia.scm.repository.Person;
import sonia.scm.repository.Repository;
import sonia.scm.repository.RepositoryException;
import sonia.scm.repository.api.RepositoryService;
import sonia.scm.repository.api.RepositoryServiceFactory;
import sonia.scm.template.Template;
@@ -60,16 +57,14 @@ import sonia.scm.util.HttpUtil;
import sonia.scm.util.IOUtil;
import sonia.scm.util.Util;
//~--- JDK imports ------------------------------------------------------------
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.Writer;
import java.util.Date;
import java.util.Iterator;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
//~--- JDK imports ------------------------------------------------------------
/**
*
@@ -113,21 +108,9 @@ public class GitRepositoryViewer
//~--- methods --------------------------------------------------------------
/**
* Method description
*
*
*
* @param request
* @param response
* @param repository
*
* @throws IOException
* @throws RepositoryException
*/
public void handleRequest(HttpServletRequest request,
HttpServletResponse response, Repository repository)
throws RepositoryException, IOException
throws IOException
{
String baseUrl = HttpUtil.getCompleteUrl(request);
@@ -171,7 +154,7 @@ public class GitRepositoryViewer
* @throws RepositoryException
*/
private BranchesModel createBranchesModel(Repository repository)
throws RepositoryException, IOException
throws IOException
{
BranchesModel model = null;
RepositoryService service = null;

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

@@ -42,7 +42,6 @@ import org.eclipse.jgit.http.server.GitServlet;
import org.eclipse.jgit.lfs.lib.Constants;
import org.slf4j.Logger;
import sonia.scm.repository.Repository;
import sonia.scm.repository.RepositoryException;
import sonia.scm.repository.RepositoryProvider;
import sonia.scm.repository.RepositoryRequestListenerUtil;
import sonia.scm.util.HttpUtil;
@@ -214,7 +213,7 @@ public class ScmGitServlet extends GitServlet
private void handleBrowserRequest(HttpServletRequest request, HttpServletResponse response, Repository repository) throws ServletException, IOException {
try {
repositoryViewer.handleRequest(request, response, repository);
} catch (RepositoryException | IOException ex) {
} catch (IOException ex) {
throw new ServletException("could not create repository view", ex);
}
}