Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-01-20 14:32:12 +01:00
Code Issues Packages Projects Releases Activity

append import links as array

Browse Source
This commit is contained in:
Eduard Heimbuch
2020-11-30 11:31:41 +01:00
parent 8d96c5fdd2
commit 7ee8755dca
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryTypeToRepositoryTypeDtoMapper.java
View File

@@ -24,6 +24,7 @@
package sonia.scm.api.v2.resources;
import de.otto.edison.hal.Link;
import de.otto.edison.hal.Links;
import org.mapstruct.AfterMapping;
import org.mapstruct.Mapper;
@@ -34,7 +35,6 @@ import sonia.scm.repository.api.Command;
import javax.inject.Inject;
import static de.otto.edison.hal.Link.link;
import static de.otto.edison.hal.Links.linkingTo;
@Mapper
@@ -48,7 +48,7 @@ public abstract class RepositoryTypeToRepositoryTypeDtoMapper extends BaseMapper
Links.Builder linksBuilder = linkingTo().self(resourceLinks.repositoryType().self(repositoryType.getName()));
if (RepositoryPermissions.create().isPermitted() && repositoryType.getSupportedCommands().contains(Command.PULL)) {
linksBuilder.single(link("importFromUrl", resourceLinks.repository().importFromUrl(repositoryType.getName())));
linksBuilder.array(Link.linkBuilder("import", resourceLinks.repository().importFromUrl(repositoryType.getName())).withName("url").build());
}
target.add(linksBuilder.build());

6
scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryTypeToRepositoryTypeDtoMapperTest.java
View File

@@ -94,7 +94,7 @@ public class RepositoryTypeToRepositoryTypeDtoMapperTest {
RepositoryTypeDto dto = mapper.map(type);
assertEquals(
"https://scm-manager.org/scm/v2/repositories/import/hk/url",
dto.getLinks().getLinkBy("importFromUrl").get().getHref()
dto.getLinks().getLinkBy("import").get().getHref()
);
}
@@ -102,7 +102,7 @@ public class RepositoryTypeToRepositoryTypeDtoMapperTest {
public void shouldNotAppendImportFromUrlLinkIfCommandNotSupported() {
when(subject.isPermitted("repository:create")).thenReturn(true);
RepositoryTypeDto dto = mapper.map(type);
assertFalse(dto.getLinks().getLinkBy("importFromUrl").isPresent());
assertFalse(dto.getLinks().getLinkBy("import").isPresent());
}
@Test
@@ -110,6 +110,6 @@ public class RepositoryTypeToRepositoryTypeDtoMapperTest {
RepositoryType type = new RepositoryType("hk", "Hitchhiker", ImmutableSet.of(Command.PULL));
RepositoryTypeDto dto = mapper.map(type);
assertFalse(dto.getLinks().getLinkBy("importFromUrl").isPresent());
assertFalse(dto.getLinks().getLinkBy("import").isPresent());
}
}