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

Move path computation away from protocol handling

Browse Source
This commit is contained in:
René Pfeuffer
2018-09-12 11:47:53 +02:00
parent ef28350ce3
commit f5d5d3a6dc
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scm-core/src/main/java/sonia/scm/api/v2/resources/ScmPathInfo.java
View File

@@ -4,4 +4,8 @@ import java.net.URI;
public interface ScmPathInfo {
URI getApiRestUri();
default URI getRootUri() {
return getApiRestUri().resolve("../..");
}
}

2
scm-core/src/main/java/sonia/scm/repository/spi/InitializingHttpScmProtocolWrapper.java
View File

@@ -53,7 +53,7 @@ public abstract class InitializingHttpScmProtocolWrapper {
try {
ScmPathInfoStore scmPathInfoStore = uriInfoStore.get();
if (scmPathInfoStore != null && scmPathInfoStore.get() != null) {
return of(scmPathInfoStore.get().getApiRestUri().resolve("../..").toASCIIString());
return of(scmPathInfoStore.get().getRootUri().toASCIIString());
}
} catch (Exception e) {
logger.debug("could not get ScmPathInfoStore from context", e);