From 8320c75c89fd244d69cefb2e90d7e69f3c0797c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Wed, 22 Aug 2018 14:29:05 +0200
Subject: [PATCH] Fix svn revision in sources HAL links

---
 .../sonia/scm/repository/spi/SvnBrowseCommand.java   | 12 ++++++------
 .../sonia/scm/api/v2/resources/FileObjectMapper.java |  8 ++++++--
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnBrowseCommand.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnBrowseCommand.java
index 1464d7eb96..6d408c8f17 100644
--- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnBrowseCommand.java
+++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnBrowseCommand.java
@@ -36,17 +36,14 @@ package sonia.scm.repository.spi;
 //~--- non-JDK imports --------------------------------------------------------
 
 import com.google.common.collect.Lists;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import org.tmatesoft.svn.core.SVNDirEntry;
 import org.tmatesoft.svn.core.SVNException;
 import org.tmatesoft.svn.core.SVNNodeKind;
 import org.tmatesoft.svn.core.SVNProperties;
 import org.tmatesoft.svn.core.SVNProperty;
 import org.tmatesoft.svn.core.io.SVNRepository;
-
 import sonia.scm.repository.BrowserResult;
 import sonia.scm.repository.FileObject;
 import sonia.scm.repository.Repository;
@@ -55,13 +52,12 @@ import sonia.scm.repository.SubRepository;
 import sonia.scm.repository.SvnUtil;
 import sonia.scm.util.Util;
 
-//~--- JDK imports ------------------------------------------------------------
-
 import java.io.IOException;
-
 import java.util.Collection;
 import java.util.List;
 
+//~--- JDK imports ------------------------------------------------------------
+
 /**
  *
  * @author Sebastian Sdorra
@@ -143,6 +139,10 @@ public class SvnBrowseCommand extends AbstractSvnCommand
         }
       }
 
+      if (revisionNumber == -1) {
+        revisionNumber = svnRepository.getLatestRevision();
+      }
+
       result = new BrowserResult();
       result.setRevision(String.valueOf(revisionNumber));
       result.setFiles(children);
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/FileObjectMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/FileObjectMapper.java
index ebabf79342..fbc4c8d913 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/FileObjectMapper.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/FileObjectMapper.java
@@ -26,11 +26,15 @@ public abstract class FileObjectMapper extends BaseMapper<FileObject, FileObject
   @AfterMapping
   void addLinks(FileObject fileObject, @MappingTarget FileObjectDto dto, @Context NamespaceAndName namespaceAndName, @Context String revision) {
     Links.Builder links = Links.linkingTo()
-      .self(resourceLinks.source().sourceWithPath(namespaceAndName.getNamespace(), namespaceAndName.getName(), revision, fileObject.getPath()));
+      .self(resourceLinks.source().sourceWithPath(namespaceAndName.getNamespace(), namespaceAndName.getName(), revision, removeFirstSlash(fileObject.getPath())));
     if (!dto.isDirectory()) {
-      links.single(link("content", resourceLinks.source().content(namespaceAndName.getNamespace(), namespaceAndName.getName(), revision, fileObject.getPath())));
+      links.single(link("content", resourceLinks.source().content(namespaceAndName.getNamespace(), namespaceAndName.getName(), revision, removeFirstSlash(fileObject.getPath()))));
     }
 
     dto.add(links.build());
   }
+
+  private String removeFirstSlash(String source) {
+    return source.startsWith("/") ? source.substring(1) : source;
+  }
 }