Merge 2.0.0-m3

scm-it/src/test/java/sonia/scm/it/RepositoryAccessITCase.java

@@ -0,0 +1,67 @@
+package sonia.scm.it;
+
+import org.apache.http.HttpStatus;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.io.IOException;
+import java.util.Collection;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assume.assumeFalse;
+import static sonia.scm.it.RestUtil.given;
+import static sonia.scm.it.ScmTypes.availableScmTypes;
+
+@RunWith(Parameterized.class)
+public class RepositoryAccessITCase {
+
+  @Rule
+  public TemporaryFolder tempFolder = new TemporaryFolder();
+
+  private final String repositoryType;
+  private RepositoryUtil repositoryUtil;
+
+  public RepositoryAccessITCase(String repositoryType) {
+    this.repositoryType = repositoryType;
+  }
+
+  @Parameterized.Parameters(name = "{0}")
+  public static Collection<String> createParameters() {
+    return availableScmTypes();
+  }
+
+  @Before
+  public void initClient() throws IOException {
+    TestData.createDefault();
+    repositoryUtil = new RepositoryUtil(repositoryType, tempFolder.getRoot());
+  }
+
+  @Test
+  public void shouldFindBranches() throws IOException {
+    assumeFalse("There are no branches for SVN", repositoryType.equals("svn"));
+
+    repositoryUtil.createAndCommitFile("a.txt", "a");
+
+    String branchesUrl = given()
+      .when()
+      .get(TestData.getDefaultRepositoryUrl(repositoryType))
+      .then()
+      .statusCode(HttpStatus.SC_OK)
+      .extract()
+      .path("_links.branches.href");
+
+    Object branchName = given()
+      .when()
+      .get(branchesUrl)
+      .then()
+      .statusCode(HttpStatus.SC_OK)
+      .extract()
+      .path("_embedded.branches[0].name");
+
+    assertNotNull(branchName);
+  }
+}

scm-it/src/test/java/sonia/scm/it/RepositoryUtil.java

@@ -0,0 +1,62 @@
+package sonia.scm.it;
+
+import com.google.common.base.Charsets;
+import com.google.common.io.Files;
+import org.apache.http.HttpStatus;
+import sonia.scm.repository.Changeset;
+import sonia.scm.repository.Person;
+import sonia.scm.repository.client.api.ClientCommand;
+import sonia.scm.repository.client.api.RepositoryClient;
+import sonia.scm.repository.client.api.RepositoryClientFactory;
+import sonia.scm.web.VndMediaType;
+
+import java.io.File;
+import java.io.IOException;
+
+import static sonia.scm.it.RestUtil.ADMIN_PASSWORD;
+import static sonia.scm.it.RestUtil.ADMIN_USERNAME;
+import static sonia.scm.it.RestUtil.given;
+
+public class RepositoryUtil {
+
+  private static final RepositoryClientFactory REPOSITORY_CLIENT_FACTORY = new RepositoryClientFactory();
+
+  private final RepositoryClient repositoryClient;
+  private final File folder;
+
+  RepositoryUtil(String repositoryType, File folder) throws IOException {
+    this.repositoryClient = createRepositoryClient(repositoryType, folder);
+    this.folder = folder;
+  }
+
+  static RepositoryClient createRepositoryClient(String repositoryType, File folder) throws IOException {
+    String httpProtocolUrl = given(VndMediaType.REPOSITORY)
+
+      .when()
+      .get(TestData.getDefaultRepositoryUrl(repositoryType))
+
+      .then()
+      .statusCode(HttpStatus.SC_OK)
+      .extract()
+      .path("_links.httpProtocol.href");
+
+
+    return REPOSITORY_CLIENT_FACTORY.create(repositoryType, httpProtocolUrl, ADMIN_USERNAME, ADMIN_PASSWORD, folder);
+  }
+
+  void createAndCommitFile(String fileName, String content) throws IOException {
+    Files.write(content, new File(folder, fileName), Charsets.UTF_8);
+    repositoryClient.getAddCommand().add(fileName);
+    commit("added " + fileName);
+  }
+
+  Changeset commit(String message) throws IOException {
+    Changeset changeset = repositoryClient.getCommitCommand().commit(
+      new Person("scmadmin", "scmadmin@scm-manager.org"), message
+    );
+    if (repositoryClient.isCommandSupported(ClientCommand.PUSH)) {
+      repositoryClient.getPushCommand().push();
+    }
+    return changeset;
+  }
+}

scm-it/src/test/java/sonia/scm/it/RestUtil.java

@@ -16,10 +16,18 @@ public class RestUtil {
     return REST_BASE_URL.resolve(path);
   }
 
+  public static final String ADMIN_USERNAME = "scmadmin";
+  public static final String ADMIN_PASSWORD = "scmadmin";
+
   public static RequestSpecification given(String mediaType) {
     return RestAssured.given()
       .contentType(mediaType)
       .accept(mediaType)
-      .auth().preemptive().basic("scmadmin", "scmadmin");
+      .auth().preemptive().basic(ADMIN_USERNAME, ADMIN_PASSWORD);
+  }
+
+  public static RequestSpecification given() {
+    return RestAssured.given()
+      .auth().preemptive().basic(ADMIN_USERNAME, ADMIN_PASSWORD);
   }
 }

scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapper.java

@@ -8,6 +8,9 @@ import org.mapstruct.MappingTarget;
 import sonia.scm.repository.HealthCheckFailure;
 import sonia.scm.repository.Repository;
 import sonia.scm.repository.RepositoryPermissions;
+import sonia.scm.repository.api.Command;
+import sonia.scm.repository.api.RepositoryService;
+import sonia.scm.repository.api.RepositoryServiceFactory;
 
 import static de.otto.edison.hal.Link.link;
 import static de.otto.edison.hal.Links.linkingTo;
@@ -19,6 +22,8 @@ public abstract class RepositoryToRepositoryDtoMapper extends BaseMapper<Reposit
 
   @Inject
   private ResourceLinks resourceLinks;
+  @Inject
+  private RepositoryServiceFactory serviceFactory;
 
   abstract HealthCheckFailureDto toDto(HealthCheckFailure failure);
 
@@ -33,8 +38,14 @@ public abstract class RepositoryToRepositoryDtoMapper extends BaseMapper<Reposit
       linksBuilder.single(link("update", resourceLinks.repository().update(target.getNamespace(), target.getName())));
       linksBuilder.single(link("permissions", resourceLinks.permissionCollection().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())));
+    try (RepositoryService repositoryService = serviceFactory.create(repository)) {
+      if (repositoryService.isSupported(Command.TAGS)) {
+        linksBuilder.single(link("tags", resourceLinks.tagCollection().self(target.getNamespace(), target.getName())));
+      }
+      if (repositoryService.isSupported(Command.BRANCHES)) {
+        linksBuilder.single(link("branches", resourceLinks.branchCollection().self(target.getNamespace(), target.getName())));
+      }
+    }
     linksBuilder.single(link("changesets", resourceLinks.changeset().self(target.getNamespace(), target.getName())));
     linksBuilder.single(link("sources", resourceLinks.source().selfWithoutRevision(target.getNamespace(), target.getName())));
     target.add(linksBuilder.build());

scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRootResourceTest.java

@@ -10,6 +10,7 @@ import org.jboss.resteasy.mock.MockHttpResponse;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
+import org.mockito.Answers;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import sonia.scm.PageResult;
@@ -18,6 +19,7 @@ import sonia.scm.repository.Repository;
 import sonia.scm.repository.RepositoryException;
 import sonia.scm.repository.RepositoryIsNotArchivedException;
 import sonia.scm.repository.RepositoryManager;
+import sonia.scm.repository.api.RepositoryServiceFactory;
 import sonia.scm.web.VndMediaType;
 
 import javax.servlet.http.HttpServletResponse;
@@ -57,6 +59,9 @@ public class RepositoryRootResourceTest {
 
   @Mock
   private RepositoryManager repositoryManager;
+  @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+  private RepositoryServiceFactory serviceFactory;
+
 
   private final URI baseUri = URI.create("/");
   private final ResourceLinks resourceLinks = ResourceLinksMock.createMock(baseUri);

scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapperTest.java

@@ -7,17 +7,23 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
+import org.mockito.Answers;
 import org.mockito.InjectMocks;
+import org.mockito.Mock;
 import sonia.scm.repository.HealthCheckFailure;
 import sonia.scm.repository.Permission;
 import sonia.scm.repository.PermissionType;
 import sonia.scm.repository.Repository;
+import sonia.scm.repository.api.Command;
+import sonia.scm.repository.api.RepositoryServiceFactory;
 
 import java.net.URI;
 
 import static java.util.Collections.singletonList;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;
 
 @SubjectAware(
@@ -33,6 +39,8 @@ public class RepositoryToRepositoryDtoMapperTest {
   private final URI baseUri = URI.create("http://example.com/base/");
   @SuppressWarnings("unused") // Is injected
   private final ResourceLinks resourceLinks = ResourceLinksMock.createMock(baseUri);
+  @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+  private RepositoryServiceFactory serviceFactory;
 
   @InjectMocks
   private RepositoryToRepositoryDtoMapperImpl mapper;
@@ -40,6 +48,7 @@ public class RepositoryToRepositoryDtoMapperTest {
   @Before
   public void init() {
     initMocks(this);
+    when(serviceFactory.create(any(Repository.class)).isSupported(any(Command.class))).thenReturn(true);
   }
 
   @After
@@ -103,7 +112,7 @@ public class RepositoryToRepositoryDtoMapperTest {
   }
 
   @Test
-  public void shouldCreateTagsLink() {
+  public void shouldCreateTagsLink_ifSupported() {
     RepositoryDto dto = mapper.map(createTestRepository());
     assertEquals(
       "http://example.com/base/v2/repositories/testspace/test/tags/",
@@ -111,13 +120,27 @@ public class RepositoryToRepositoryDtoMapperTest {
   }
 
   @Test
-  public void shouldCreateBranchesLink() {
+  public void shouldCreateBranchesLink_ifSupported() {
     RepositoryDto dto = mapper.map(createTestRepository());
     assertEquals(
       "http://example.com/base/v2/repositories/testspace/test/branches/",
       dto.getLinks().getLinkBy("branches").get().getHref());
   }
 
+  @Test
+  public void shouldNotCreateTagsLink_ifNotSupported() {
+    when(serviceFactory.create(any(Repository.class)).isSupported(Command.TAGS)).thenReturn(false);
+    RepositoryDto dto = mapper.map(createTestRepository());
+    assertFalse(dto.getLinks().getLinkBy("tags").isPresent());
+  }
+
+  @Test
+  public void shouldNotCreateBranchesLink_ifNotSupported() {
+    when(serviceFactory.create(any(Repository.class)).isSupported(Command.BRANCHES)).thenReturn(false);
+    RepositoryDto dto = mapper.map(createTestRepository());
+    assertFalse(dto.getLinks().getLinkBy("branches").isPresent());
+  }
+
   @Test
   public void shouldCreateChangesetsLink() {
     RepositoryDto dto = mapper.map(createTestRepository());