mirror of
https://github.com/scm-manager/scm-manager.git
synced 2025-11-12 16:35:45 +01:00
Generate link to sources for repository
This commit is contained in:
@@ -27,6 +27,7 @@ public class RepositoryResource {
|
|||||||
private final Provider<TagRootResource> tagRootResource;
|
private final Provider<TagRootResource> tagRootResource;
|
||||||
private final Provider<BranchRootResource> branchRootResource;
|
private final Provider<BranchRootResource> branchRootResource;
|
||||||
private final Provider<ChangesetRootResource> changesetRootResource;
|
private final Provider<ChangesetRootResource> changesetRootResource;
|
||||||
|
private final Provider<SourceRootResource> sourceRootResource;
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
public RepositoryResource(
|
public RepositoryResource(
|
||||||
@@ -34,13 +35,15 @@ public class RepositoryResource {
|
|||||||
RepositoryManager manager,
|
RepositoryManager manager,
|
||||||
Provider<TagRootResource> tagRootResource,
|
Provider<TagRootResource> tagRootResource,
|
||||||
Provider<BranchRootResource> branchRootResource,
|
Provider<BranchRootResource> branchRootResource,
|
||||||
Provider<ChangesetRootResource> changesetRootResource) {
|
Provider<ChangesetRootResource> changesetRootResource,
|
||||||
|
Provider<SourceRootResource> sourceRootResource) {
|
||||||
this.manager = manager;
|
this.manager = manager;
|
||||||
this.repositoryToDtoMapper = repositoryToDtoMapper;
|
this.repositoryToDtoMapper = repositoryToDtoMapper;
|
||||||
this.adapter = new SingleResourceManagerAdapter<>(manager);
|
this.adapter = new SingleResourceManagerAdapter<>(manager);
|
||||||
this.tagRootResource = tagRootResource;
|
this.tagRootResource = tagRootResource;
|
||||||
this.branchRootResource = branchRootResource;
|
this.branchRootResource = branchRootResource;
|
||||||
this.changesetRootResource = changesetRootResource;
|
this.changesetRootResource = changesetRootResource;
|
||||||
|
this.sourceRootResource = sourceRootResource;
|
||||||
}
|
}
|
||||||
|
|
||||||
@GET
|
@GET
|
||||||
@@ -84,4 +87,9 @@ public class RepositoryResource {
|
|||||||
public ChangesetRootResource changesets() {
|
public ChangesetRootResource changesets() {
|
||||||
return changesetRootResource.get();
|
return changesetRootResource.get();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Path("sources/")
|
||||||
|
public SourceRootResource sources() {
|
||||||
|
return sourceRootResource.get();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -37,6 +37,7 @@ public abstract class RepositoryToRepositoryDtoMapper extends BaseMapper<Reposit
|
|||||||
linksBuilder.single(link("tags", resourceLinks.tagCollection().self(target.getNamespace(), target.getName())));
|
linksBuilder.single(link("tags", resourceLinks.tagCollection().self(target.getNamespace(), target.getName())));
|
||||||
linksBuilder.single(link("branches", resourceLinks.branchCollection().self(target.getNamespace(), target.getName())));
|
linksBuilder.single(link("branches", resourceLinks.branchCollection().self(target.getNamespace(), target.getName())));
|
||||||
linksBuilder.single(link("changesets", resourceLinks.changesetCollection().self(target.getNamespace(), target.getName())));
|
linksBuilder.single(link("changesets", resourceLinks.changesetCollection().self(target.getNamespace(), target.getName())));
|
||||||
|
linksBuilder.single(link("sources", resourceLinks.sourceCollection().self(target.getNamespace(), target.getName())));
|
||||||
target.add(linksBuilder.build());
|
target.add(linksBuilder.build());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -172,4 +172,20 @@ class ResourceLinks {
|
|||||||
return changesetLinkBuilder.method("getRepositoryResource").parameters(namespace, name).method("changesets").parameters().method("getChangesetCollectionResource").parameters().method("getAll").parameters().href();
|
return changesetLinkBuilder.method("getRepositoryResource").parameters(namespace, name).method("changesets").parameters().method("getChangesetCollectionResource").parameters().method("getAll").parameters().href();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public SourceCollectionLinks sourceCollection() {
|
||||||
|
return new SourceCollectionLinks(uriInfoStore.get());
|
||||||
|
}
|
||||||
|
|
||||||
|
static class SourceCollectionLinks {
|
||||||
|
private final LinkBuilder sourceLinkBuilder;
|
||||||
|
|
||||||
|
SourceCollectionLinks(UriInfo uriInfo) {
|
||||||
|
sourceLinkBuilder = new LinkBuilder(uriInfo, RepositoryRootResource.class, RepositoryResource.class, SourceRootResource.class, SourceCollectionResource.class);
|
||||||
|
}
|
||||||
|
|
||||||
|
String self(String namespace, String name) {
|
||||||
|
return sourceLinkBuilder.method("getRepositoryResource").parameters(namespace, name).method("sources").parameters().method("getSourceCollectionResource").parameters().method("getAll").parameters().href();
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,18 @@
|
|||||||
|
package sonia.scm.api.v2.resources;
|
||||||
|
|
||||||
|
import javax.ws.rs.DefaultValue;
|
||||||
|
import javax.ws.rs.GET;
|
||||||
|
import javax.ws.rs.Path;
|
||||||
|
import javax.ws.rs.QueryParam;
|
||||||
|
import javax.ws.rs.core.Response;
|
||||||
|
|
||||||
|
public class SourceCollectionResource {
|
||||||
|
@GET
|
||||||
|
@Path("")
|
||||||
|
public Response getAll(@DefaultValue("0") @QueryParam("page") int page,
|
||||||
|
@DefaultValue("10") @QueryParam("pageSize") int pageSize,
|
||||||
|
@QueryParam("sortBy") String sortBy,
|
||||||
|
@DefaultValue("false") @QueryParam("desc") boolean desc) {
|
||||||
|
throw new UnsupportedOperationException();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
package sonia.scm.api.v2.resources;
|
||||||
|
|
||||||
|
import javax.inject.Inject;
|
||||||
|
import javax.inject.Provider;
|
||||||
|
import javax.ws.rs.Path;
|
||||||
|
|
||||||
|
public class SourceRootResource {
|
||||||
|
|
||||||
|
private final Provider<SourceCollectionResource> sourceCollectionResource;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
public SourceRootResource(Provider<SourceCollectionResource> sourceCollectionResource) {
|
||||||
|
this.sourceCollectionResource = sourceCollectionResource;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Path("")
|
||||||
|
public SourceCollectionResource getSourceCollectionResource() {
|
||||||
|
return sourceCollectionResource.get();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -48,7 +48,7 @@ public class RepositoryRootResourceTest {
|
|||||||
@Before
|
@Before
|
||||||
public void prepareEnvironment() {
|
public void prepareEnvironment() {
|
||||||
initMocks(this);
|
initMocks(this);
|
||||||
RepositoryResource repositoryResource = new RepositoryResource(repositoryToDtoMapper, repositoryManager, null, null, null);
|
RepositoryResource repositoryResource = new RepositoryResource(repositoryToDtoMapper, repositoryManager, null, null, null, null);
|
||||||
RepositoryRootResource repositoryRootResource = new RepositoryRootResource(MockProvider.of(repositoryResource));
|
RepositoryRootResource repositoryRootResource = new RepositoryRootResource(MockProvider.of(repositoryResource));
|
||||||
dispatcher.getRegistry().addSingletonResource(repositoryRootResource);
|
dispatcher.getRegistry().addSingletonResource(repositoryRootResource);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -125,6 +125,14 @@ public class RepositoryToRepositoryDtoMapperTest {
|
|||||||
dto.getLinks().getLinkBy("changesets").get().getHref());
|
dto.getLinks().getLinkBy("changesets").get().getHref());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void shouldCreateSourcesLink() {
|
||||||
|
RepositoryDto dto = mapper.map(createTestRepository());
|
||||||
|
assertEquals(
|
||||||
|
"http://example.com/base/v2/repositories/testspace/test/sources/",
|
||||||
|
dto.getLinks().getLinkBy("sources").get().getHref());
|
||||||
|
}
|
||||||
|
|
||||||
private Repository createTestRepository() {
|
private Repository createTestRepository() {
|
||||||
Repository repository = new Repository();
|
Repository repository = new Repository();
|
||||||
repository.setNamespace("testspace");
|
repository.setNamespace("testspace");
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ public class ResourceLinksMock {
|
|||||||
when(resourceLinks.tagCollection()).thenReturn(new ResourceLinks.TagCollectionLinks(uriInfo));
|
when(resourceLinks.tagCollection()).thenReturn(new ResourceLinks.TagCollectionLinks(uriInfo));
|
||||||
when(resourceLinks.branchCollection()).thenReturn(new ResourceLinks.BranchCollectionLinks(uriInfo));
|
when(resourceLinks.branchCollection()).thenReturn(new ResourceLinks.BranchCollectionLinks(uriInfo));
|
||||||
when(resourceLinks.changesetCollection()).thenReturn(new ResourceLinks.ChangesetCollectionLinks(uriInfo));
|
when(resourceLinks.changesetCollection()).thenReturn(new ResourceLinks.ChangesetCollectionLinks(uriInfo));
|
||||||
|
when(resourceLinks.sourceCollection()).thenReturn(new ResourceLinks.SourceCollectionLinks(uriInfo));
|
||||||
return resourceLinks;
|
return resourceLinks;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -120,6 +120,12 @@ public class ResourceLinksTest {
|
|||||||
assertEquals(BASE_URL + RepositoryRootResource.REPOSITORIES_PATH_V2 + "space/repo/changesets/", url);
|
assertEquals(BASE_URL + RepositoryRootResource.REPOSITORIES_PATH_V2 + "space/repo/changesets/", url);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void shouldCreateCorrectSourceCollectionUrl() {
|
||||||
|
String url = resourceLinks.sourceCollection().self("space", "repo");
|
||||||
|
assertEquals(BASE_URL + RepositoryRootResource.REPOSITORIES_PATH_V2 + "space/repo/sources/", url);
|
||||||
|
}
|
||||||
|
|
||||||
@Before
|
@Before
|
||||||
public void initUriInfo() {
|
public void initUriInfo() {
|
||||||
initMocks(this);
|
initMocks(this);
|
||||||
|
|||||||
Reference in New Issue
Block a user