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

Incorporate peer review

Browse Source
This commit is contained in:
René Pfeuffer
2018-09-17 17:49:08 +02:00
parent 37ce4fbabe
commit babea160c3
12 changed files with 58 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scm-webapp/src/main/java/sonia/scm/web/protocol/HttpProtocolServlet.java
View File

@@ -38,15 +38,13 @@ public class HttpProtocolServlet extends HttpServlet {
private final PushStateDispatcher dispatcher;
private final UserAgentParser userAgentParser;
private final NamespaceAndNameFromPathExtractor namespaceAndNameFromPathExtractor;
@Inject
public HttpProtocolServlet(RepositoryServiceFactory serviceFactory, Provider<HttpServletRequest> requestProvider, PushStateDispatcher dispatcher, UserAgentParser userAgentParser, NamespaceAndNameFromPathExtractor namespaceAndNameFromPathExtractor) {
public HttpProtocolServlet(RepositoryServiceFactory serviceFactory, Provider<HttpServletRequest> requestProvider, PushStateDispatcher dispatcher, UserAgentParser userAgentParser) {
this.serviceFactory = serviceFactory;
this.requestProvider = requestProvider;
this.dispatcher = dispatcher;
this.userAgentParser = userAgentParser;
this.namespaceAndNameFromPathExtractor = namespaceAndNameFromPathExtractor;
}
@Override
@@ -58,7 +56,7 @@ public class HttpProtocolServlet extends HttpServlet {
} else {
String pathInfo = request.getPathInfo();
Optional<NamespaceAndName> namespaceAndName = namespaceAndNameFromPathExtractor.fromUri(pathInfo);
Optional<NamespaceAndName> namespaceAndName = NamespaceAndNameFromPathExtractor.fromUri(pathInfo);
if (namespaceAndName.isPresent()) {
service(request, response, namespaceAndName.get());
} else {

7
scm-webapp/src/main/java/sonia/scm/web/protocol/NamespaceAndNameFromPathExtractor.java
View File

@@ -8,8 +8,11 @@ import java.util.Optional;
import static java.util.Optional.empty;
import static java.util.Optional.of;
class NamespaceAndNameFromPathExtractor {
Optional<NamespaceAndName> fromUri(String uri) {
final class NamespaceAndNameFromPathExtractor {
private NamespaceAndNameFromPathExtractor() {}
static Optional<NamespaceAndName> fromUri(String uri) {
if (uri.startsWith(HttpUtil.SEPARATOR_PATH)) {
uri = uri.substring(1);
}