Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-14 17:26:22 +01:00
Code Issues Packages Projects Releases Activity

Fix source URL creation for SVN

Browse Source
This commit is contained in:
René Pfeuffer
2018-08-23 17:02:55 +02:00
parent ca563dd874
commit 40f963db98
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scm-webapp/src/main/java/sonia/scm/api/v2/resources/FileObjectMapper.java
View File

@@ -26,7 +26,7 @@ public abstract class FileObjectMapper extends BaseMapper<FileObject, FileObject
@AfterMapping @AfterMapping
void addLinks(FileObject fileObject, @MappingTarget FileObjectDto dto, @Context NamespaceAndName namespaceAndName, @Context String revision) { void addLinks(FileObject fileObject, @MappingTarget FileObjectDto dto, @Context NamespaceAndName namespaceAndName, @Context String revision) {
String path = fileObject.getPath(); String path = removeFirstSlash(fileObject.getPath());
Links.Builder links = Links.linkingTo() Links.Builder links = Links.linkingTo()
.self(addPath(resourceLinks.source().sourceWithPath(namespaceAndName.getNamespace(), namespaceAndName.getName(), revision, ""), path)); .self(addPath(resourceLinks.source().sourceWithPath(namespaceAndName.getNamespace(), namespaceAndName.getName(), revision, ""), path));
if (!dto.isDirectory()) { if (!dto.isDirectory()) {
@@ -40,4 +40,8 @@ public abstract class FileObjectMapper extends BaseMapper<FileObject, FileObject
private String addPath(String sourceWithPath, String path) { private String addPath(String sourceWithPath, String path) {
return URI.create(sourceWithPath).resolve(path).toASCIIString(); return URI.create(sourceWithPath).resolve(path).toASCIIString();
} }
private String removeFirstSlash(String source) {
return source.startsWith("/") ? source.substring(1) : source;
}
} }