From 4699166f877ba6de319782600b064798a1d1b823 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Fri, 24 Aug 2018 08:43:04 +0200
Subject: [PATCH] Change self link for files to content

---
 .../resources/FileObjectToFileObjectDtoMapper.java  | 11 +++++------
 .../FileObjectToFileObjectDtoMapperTest.java        | 13 ++++++++++---
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/FileObjectToFileObjectDtoMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/FileObjectToFileObjectDtoMapper.java
index a3d1cae6b5..bc814c7e0c 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/FileObjectToFileObjectDtoMapper.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/FileObjectToFileObjectDtoMapper.java
@@ -12,8 +12,6 @@ import sonia.scm.repository.SubRepository;
 import javax.inject.Inject;
 import java.net.URI;
 
-import static de.otto.edison.hal.Link.link;
-
 @Mapper
 public abstract class FileObjectToFileObjectDtoMapper extends BaseMapper<FileObject, FileObjectDto> {
 
@@ -27,10 +25,11 @@ public abstract class FileObjectToFileObjectDtoMapper extends BaseMapper<FileObj
   @AfterMapping
   void addLinks(FileObject fileObject, @MappingTarget FileObjectDto dto, @Context NamespaceAndName namespaceAndName, @Context String revision) {
     String path = removeFirstSlash(fileObject.getPath());
-    Links.Builder links = Links.linkingTo()
-      .self(addPath(resourceLinks.source().sourceWithPath(namespaceAndName.getNamespace(), namespaceAndName.getName(), revision, ""), path));
-    if (!dto.isDirectory()) {
-      links.single(link("content", addPath(resourceLinks.source().content(namespaceAndName.getNamespace(), namespaceAndName.getName(), revision, ""), path)));
+    Links.Builder links = Links.linkingTo();
+    if (dto.isDirectory()) {
+      links.self(addPath(resourceLinks.source().sourceWithPath(namespaceAndName.getNamespace(), namespaceAndName.getName(), revision, ""), path));
+    } else {
+      links.self(addPath(resourceLinks.source().content(namespaceAndName.getNamespace(), namespaceAndName.getName(), revision, ""), path));
     }
 
     dto.add(links.build());
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileObjectToFileObjectDtoMapperTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileObjectToFileObjectDtoMapperTest.java
index 420e99c704..768e0d0525 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileObjectToFileObjectDtoMapperTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileObjectToFileObjectDtoMapperTest.java
@@ -50,8 +50,8 @@ public class FileObjectToFileObjectDtoMapperTest {
   }
 
   @Test
-  public void shouldHaveCorrectSelfLink() {
-    FileObject fileObject = createFileObject();
+  public void shouldHaveCorrectSelfLinkForDirectory() {
+    FileObject fileObject = createDirectoryObject();
     FileObjectDto dto = mapper.map(fileObject, new NamespaceAndName("namespace", "name"), "revision");
 
     assertThat(dto.getLinks().getLinkBy("self").get().getHref()).isEqualTo(expectedBaseUri.resolve("namespace/name/sources/revision/foo/bar").toString());
@@ -60,9 +60,16 @@ public class FileObjectToFileObjectDtoMapperTest {
   @Test
   public void shouldHaveCorrectContentLink() {
     FileObject fileObject = createFileObject();
+    fileObject.setDirectory(false);
     FileObjectDto dto = mapper.map(fileObject, new NamespaceAndName("namespace", "name"), "revision");
 
-    assertThat(dto.getLinks().getLinkBy("content").get().getHref()).isEqualTo(expectedBaseUri.resolve("namespace/name/content/revision/foo/bar").toString());
+    assertThat(dto.getLinks().getLinkBy("self").get().getHref()).isEqualTo(expectedBaseUri.resolve("namespace/name/content/revision/foo/bar").toString());
+  }
+
+  private FileObject createDirectoryObject() {
+    FileObject fileObject = createFileObject();
+    fileObject.setDirectory(true);
+    return fileObject;
   }
 
   private FileObject createFileObject() {