From f5d5d3a6dc680749744281d0a48a181524bd56fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Wed, 12 Sep 2018 11:47:53 +0200 Subject: [PATCH] Move path computation away from protocol handling --- .../src/main/java/sonia/scm/api/v2/resources/ScmPathInfo.java | 4 ++++ .../repository/spi/InitializingHttpScmProtocolWrapper.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/scm-core/src/main/java/sonia/scm/api/v2/resources/ScmPathInfo.java b/scm-core/src/main/java/sonia/scm/api/v2/resources/ScmPathInfo.java index 0afb379eed..34fa5004fc 100644 --- a/scm-core/src/main/java/sonia/scm/api/v2/resources/ScmPathInfo.java +++ b/scm-core/src/main/java/sonia/scm/api/v2/resources/ScmPathInfo.java @@ -4,4 +4,8 @@ import java.net.URI; public interface ScmPathInfo { URI getApiRestUri(); + + default URI getRootUri() { + return getApiRestUri().resolve("../.."); + } } diff --git a/scm-core/src/main/java/sonia/scm/repository/spi/InitializingHttpScmProtocolWrapper.java b/scm-core/src/main/java/sonia/scm/repository/spi/InitializingHttpScmProtocolWrapper.java index 7e7fb243cc..c5fd037cc8 100644 --- a/scm-core/src/main/java/sonia/scm/repository/spi/InitializingHttpScmProtocolWrapper.java +++ b/scm-core/src/main/java/sonia/scm/repository/spi/InitializingHttpScmProtocolWrapper.java @@ -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);