From 6fff26eb7647e7501983290c6d504143d932e648 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Mon, 6 Aug 2018 15:34:31 +0200
Subject: [PATCH] Add http protocol link to repository object response

---
 .../java/sonia/scm/it/RepositoriesITCase.java     | 15 +++++++++++++--
 .../RepositoryToRepositoryDtoMapper.java          |  1 +
 .../sonia/scm/api/v2/resources/ResourceLinks.java |  7 +++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java b/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java
index eaab0f29b7..44cbb9dac6 100644
--- a/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java
+++ b/scm-it/src/test/java/sonia/scm/it/RepositoriesITCase.java
@@ -60,7 +60,6 @@ import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.nullValue;
 import static org.junit.Assert.assertEquals;
 import static sonia.scm.it.RegExMatcher.matchesPattern;
-import static sonia.scm.it.RestUtil.BASE_URL;
 import static sonia.scm.it.RestUtil.createResourceUrl;
 import static sonia.scm.it.RestUtil.given;
 
@@ -195,7 +194,19 @@ public class RepositoriesITCase {
 
   private RepositoryClient createRepositoryClient() throws IOException {
     RepositoryClientFactory clientFactory = new RepositoryClientFactory();
-    return clientFactory.create(repositoryType, BASE_URL + repositoryType + "/scmadmin/HeartOfGold-" + repositoryType, "scmadmin", "scmadmin", temporaryFolder.newFolder());
+    String cloneUrl = readCloneUrl();
+    return clientFactory.create(repositoryType, cloneUrl, "scmadmin", "scmadmin", temporaryFolder.newFolder());
+  }
+
+  private String readCloneUrl() {
+    return given(VndMediaType.REPOSITORY)
+
+      .when()
+      .get(repositoryUrl)
+
+      .then()
+      .extract()
+      .path("_links.httpProtocol.href");
   }
 
   private String repositoryJson() {
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapper.java
index 2f13723d39..cb89f0ea63 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapper.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapper.java
@@ -25,6 +25,7 @@ public abstract class RepositoryToRepositoryDtoMapper extends BaseMapper<Reposit
   @AfterMapping
   void appendLinks(Repository repository, @MappingTarget RepositoryDto target) {
     Links.Builder linksBuilder = linkingTo().self(resourceLinks.repository().self(target.getNamespace(), target.getName()));
+    linksBuilder.single(link("httpProtocol", resourceLinks.repository().clone(target.getType(), target.getNamespace(), target.getName())));
     if (RepositoryPermissions.delete(repository).isPermitted()) {
       linksBuilder.single(link("delete", resourceLinks.repository().delete(target.getNamespace(), target.getName())));
     }
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ResourceLinks.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ResourceLinks.java
index d02747d2af..f025001ca1 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ResourceLinks.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ResourceLinks.java
@@ -2,6 +2,7 @@ package sonia.scm.api.v2.resources;
 
 import javax.inject.Inject;
 import javax.ws.rs.core.UriInfo;
+import java.net.URI;
 
 class ResourceLinks {
 
@@ -127,15 +128,21 @@ class ResourceLinks {
 
   static class RepositoryLinks {
     private final LinkBuilder repositoryLinkBuilder;
+    private final UriInfo uriInfo;
 
     RepositoryLinks(UriInfo uriInfo) {
       repositoryLinkBuilder = new LinkBuilder(uriInfo, RepositoryRootResource.class, RepositoryResource.class);
+      this.uriInfo = uriInfo;
     }
 
     String self(String namespace, String name) {
       return repositoryLinkBuilder.method("getRepositoryResource").parameters(namespace, name).method("get").parameters().href();
     }
 
+    String clone(String type, String namespace, String name) {
+      return uriInfo.getBaseUri().resolve(URI.create("../../" + type + "/" + namespace + "/" + name)).toASCIIString();
+    }
+
     String delete(String namespace, String name) {
       return repositoryLinkBuilder.method("getRepositoryResource").parameters(namespace, name).method("delete").parameters().href();
     }