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

use pattern and matcher instead of string matches, to improve performance

Browse Source
This commit is contained in:
Sebastian Sdorra
2017-06-01 16:27:20 +02:00
parent d9486ba8ba
commit 2a8cfc00d8
1 changed files with 17 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,6 +57,7 @@ import sonia.scm.web.lfs.servlet.LfsServletFactory;
//~--- JDK imports ------------------------------------------------------------ //~--- JDK imports ------------------------------------------------------------
import java.io.IOException; import java.io.IOException;
import java.util.regex.Pattern;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
@@ -73,15 +74,15 @@ public class ScmGitServlet extends GitServlet
{ {
/** Field description */ /** Field description */
public static final String REGEX_GITHTTPBACKEND = public static final Pattern REGEX_GITHTTPBACKEND = Pattern.compile(
"(?x)^/git/(.*/(HEAD|info/refs|objects/(info/[^/]+|[0-9a-f]{2}/[0-9a-f]{38}|pack/pack-[0-9a-f]{40}\\.(pack|idx))|git-(upload|receive)-pack))$"; "(?x)^/git/(.*/(HEAD|info/refs|objects/(info/[^/]+|[0-9a-f]{2}/[0-9a-f]{38}|pack/pack-[0-9a-f]{40}\\.(pack|idx))|git-(upload|receive)-pack))$"
);
/** Field description */ /** Field description */
private static final long serialVersionUID = -7712897339207470674L; private static final long serialVersionUID = -7712897339207470674L;
/** the logger for ScmGitServlet */ /** the logger for ScmGitServlet */
private static final Logger logger = private static final Logger logger = getLogger(ScmGitServlet.class);
getLogger(ScmGitServlet.class);
//~--- constructors --------------------------------------------------------- //~--- constructors ---------------------------------------------------------
@@ -165,26 +166,27 @@ public class ScmGitServlet extends GitServlet
* </ul> * </ul>
*/ */
private void handleRequest(HttpServletRequest request, HttpServletResponse response, Repository repository) throws ServletException, IOException { private void handleRequest(HttpServletRequest request, HttpServletResponse response, Repository repository) throws ServletException, IOException {
logger.trace("--- Repository is: {}", repository.getName()); logger.trace("handle git repository at {}", repository.getName());
if (isLfsBatchApiRequest(request, repository.getName())) { if (isLfsBatchApiRequest(request, repository.getName())) {
logger.trace("--- detected LFS Batch API Request"); logger.trace("handle lfs batch api request");
handleGitLfsRequest(request, response, repository); handleGitLfsRequest(request, response, repository);
} else if (isLfsFileTransferRequest(request, repository.getName())) { } else if (isLfsFileTransferRequest(request, repository.getName())) {
logger.trace("--- detected LFS File Transfer Request"); logger.trace("handle lfs file transfer request");
handleGitLfsRequest(request, response, repository); handleGitLfsRequest(request, response, repository);
} else if (isRegularGitAPIRequest(request)) { } else if (isRegularGitAPIRequest(request)) {
logger.trace("--- seems to be regular Git HTTP backend request: {}", request.getRequestURI()); logger.trace("handle regular git request");
// continue with the regular git Backend // continue with the regular git Backend
handleRegularGitRequest(request, response, repository); handleRegularGitRequest(request, response, repository);
} else { } else {
renderHtmlRepositryOverview(request, response); logger.trace("handle browser request");
handleBrowserRequest(request, response, repository);
} }
} }
private boolean isRegularGitAPIRequest(HttpServletRequest request) { private boolean isRegularGitAPIRequest(HttpServletRequest request) {
return HttpUtil.getStrippedURI(request).matches(REGEX_GITHTTPBACKEND); return REGEX_GITHTTPBACKEND.matcher(HttpUtil.getStrippedURI(request)).matches();
} }
private void handleGitLfsRequest(HttpServletRequest request, HttpServletResponse response, Repository repository) throws ServletException, IOException { private void handleGitLfsRequest(HttpServletRequest request, HttpServletResponse response, Repository repository) throws ServletException, IOException {
@@ -214,29 +216,12 @@ public class ScmGitServlet extends GitServlet
* @throws IOException * @throws IOException
* @throws ServletException * @throws ServletException
*/ */
private void renderHtmlRepositryOverview(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { private void handleBrowserRequest(HttpServletRequest request, HttpServletResponse response, Repository repository) throws ServletException, IOException {
try {
sonia.scm.repository.Repository scmRepository = repositoryProvider.get(); repositoryViewer.handleRequest(request, response, repository);
} catch (RepositoryException | IOException ex) {
if (scmRepository != null)
{
try
{
repositoryViewer.handleRequest(request, response, scmRepository);
}
catch (RepositoryException ex)
{
throw new ServletException("could not create repository view", ex); throw new ServletException("could not create repository view", ex);
} }
catch (IOException ex)
{
throw new ServletException("could not create repository view", ex);
}
}
else
{
response.sendError(HttpServletResponse.SC_NOT_FOUND);
}
} }
/** /**