merge with 2.0.0-m3

Jenkinsfile

@@ -125,7 +125,7 @@ boolean isMainBranch() {
 
 boolean waitForQualityGateWebhookToBeCalled() {
   boolean isQualityGateSucceeded = true
-  timeout(time: 2, unit: 'MINUTES') { // Needed when there is no webhook for example
+  timeout(time: 5, unit: 'MINUTES') { // Needed when there is no webhook for example
     def qGate = waitForQualityGate()
     echo "SonarQube Quality Gate status: ${qGate.status}"
     if (qGate.status != 'OK') {

scm-core/src/main/java/sonia/scm/GenericDAO.java

@@ -114,4 +114,5 @@ public interface GenericDAO<T>
    * @return all items
    */
   public Collection<T> getAll();
+
 }

scm-core/src/main/java/sonia/scm/Manager.java

@@ -47,6 +47,9 @@ public interface Manager<T extends ModelObject>
         extends HandlerBase<T>, LastModifiedAware
 {
 
+  int DEFAULT_LIMIT = 5;
+
+
   /**
    * Reloads a object from store and overwrites all changes.
    *

scm-core/src/main/java/sonia/scm/ReducedModelObject.java

@@ -0,0 +1,15 @@
+package sonia.scm;
+
+
+/**
+ * This is a reduced form of a model object.
+ * It can be used as search result to avoid returning the whole object properties.
+ *
+ * @author Mohamed Karray
+ */
+public interface ReducedModelObject {
+
+  String getId();
+
+  String getDisplayName();
+}

scm-core/src/main/java/sonia/scm/group/Group.java

@@ -42,6 +42,7 @@ import com.google.common.base.Objects;
 import com.google.common.collect.Lists;
 import sonia.scm.BasicPropertiesAware;
 import sonia.scm.ModelObject;
+import sonia.scm.ReducedModelObject;
 import sonia.scm.util.Util;
 import sonia.scm.util.ValidationUtil;
 
@@ -60,11 +61,11 @@ import java.util.List;
  *
  * @author Sebastian Sdorra
  */
-@StaticPermissions(value = "group", globalPermissions = {"create", "list"})
+@StaticPermissions(value = "group", globalPermissions = {"create", "list", "autocomplete"})
 @XmlRootElement(name = "groups")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class Group extends BasicPropertiesAware
-  implements ModelObject, PermissionObject
+  implements ModelObject, PermissionObject, ReducedModelObject
 {
 
   /** Field description */
@@ -309,6 +310,11 @@ public class Group extends BasicPropertiesAware
     return name;
   }
 
+  @Override
+  public String getDisplayName() {
+    return description;
+  }
+
   /**
    * Returns a timestamp of the last modified date of this group.
    *

scm-core/src/main/java/sonia/scm/group/GroupManager.java

@@ -61,4 +61,14 @@ public interface GroupManager
    * @return all groups assigned to the given member
    */
   public Collection<Group> getGroupsForMember(String member);
+
+
+  /**
+   * Returns a {@link java.util.Collection} of filtered objects
+   *
+   * @param filter the searched string
+   * @return filtered object from the store
+   */
+  Collection<Group> autocomplete(String filter);
+
 }

scm-core/src/main/java/sonia/scm/group/GroupManagerDecorator.java

@@ -109,6 +109,11 @@ public class GroupManagerDecorator
     return decorated.getGroupsForMember(member);
   }
 
+  @Override
+  public Collection<Group> autocomplete(String filter) {
+    return decorated.autocomplete(filter);
+  }
+
   //~--- fields ---------------------------------------------------------------
 
   /** Field description */

scm-core/src/main/java/sonia/scm/repository/ChangesetPagingResult.java

@@ -82,6 +82,22 @@ public class ChangesetPagingResult implements Iterable<Changeset>, Serializable
   {
     this.total = total;
     this.changesets = changesets;
+    this.branchName = null;
+  }
+
+  /**
+   * Constructs a new changeset paging result for a specific branch.
+   *
+   *
+   * @param total total number of changesets
+   * @param changesets current list of fetched changesets
+   * @param branchName branch name this result was created for
+   */
+  public ChangesetPagingResult(int total, List<Changeset> changesets, String branchName)
+  {
+    this.total = total;
+    this.changesets = changesets;
+    this.branchName = branchName;
   }
 
   //~--- methods --------------------------------------------------------------
@@ -158,6 +174,7 @@ public class ChangesetPagingResult implements Iterable<Changeset>, Serializable
     return MoreObjects.toStringHelper(this)
                   .add("changesets", changesets)
                   .add("total", total)
+                  .add("branch", branchName)
                   .toString();
     //J+
   }
@@ -186,37 +203,35 @@ public class ChangesetPagingResult implements Iterable<Changeset>, Serializable
     return total;
   }
 
-  //~--- set methods ----------------------------------------------------------
-
-  /**
-   * Sets the current list of changesets.
-   *
-   *
-   * @param changesets current list of changesets
-   */
-  public void setChangesets(List<Changeset> changesets)
+  void setChangesets(List<Changeset> changesets)
   {
     this.changesets = changesets;
   }
 
-  /**
-   * Sets the total number of changesets
-   *
-   *
-   * @param total total number of changesets
-   */
-  public void setTotal(int total)
+  void setTotal(int total)
   {
     this.total = total;
   }
 
+  void setBranchName(String branchName) {
+    this.branchName = branchName;
+  }
+
+  /**
+   * Returns the branch name this result was created for. This can either be an explicit branch ("give me all
+   * changesets for branch xyz") or an implicit one ("give me the changesets for the default").
+   */
+  public String getBranchName() {
+    return branchName;
+  }
+
   //~--- fields ---------------------------------------------------------------
 
-  /** current list of changesets */
   @XmlElement(name = "changeset")
   @XmlElementWrapper(name = "changesets")
   private List<Changeset> changesets;
 
-  /** total number of changesets */
   private int total;
+
+  private String branchName;
 }

scm-core/src/main/java/sonia/scm/repository/Repository.java

@@ -64,7 +64,7 @@ import java.util.List;
 )
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlRootElement(name = "repositories")
-public class Repository extends BasicPropertiesAware implements ModelObject, PermissionObject {
+public class Repository extends BasicPropertiesAware implements ModelObject, PermissionObject{
 
 
   private static final long serialVersionUID = 3486560714961909711L;

scm-core/src/main/java/sonia/scm/search/SearchRequest.java

@@ -70,6 +70,12 @@ public class SearchRequest
     this.ignoreCase = ignoreCase;
   }
 
+  public SearchRequest(String query, boolean ignoreCase, int maxResults) {
+    this.query = query;
+    this.ignoreCase = ignoreCase;
+    this.maxResults = maxResults;
+  }
+
   //~--- get methods ----------------------------------------------------------
 
   /**

scm-core/src/main/java/sonia/scm/user/User.java

@@ -41,6 +41,7 @@ import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
 import sonia.scm.BasicPropertiesAware;
 import sonia.scm.ModelObject;
+import sonia.scm.ReducedModelObject;
 import sonia.scm.util.Util;
 import sonia.scm.util.ValidationUtil;
 
@@ -55,10 +56,10 @@ import java.security.Principal;
  *
  * @author Sebastian Sdorra
  */
-@StaticPermissions(value = "user", globalPermissions = {"create", "list"})
+@StaticPermissions(value = "user", globalPermissions = {"create", "list", "autocomplete"})
 @XmlRootElement(name = "users")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class User extends BasicPropertiesAware implements Principal, ModelObject, PermissionObject
+public class User extends BasicPropertiesAware implements Principal, ModelObject, PermissionObject, ReducedModelObject
 {
 
   /** Field description */

scm-core/src/main/java/sonia/scm/user/UserManager.java

@@ -39,6 +39,7 @@ import sonia.scm.Manager;
 import sonia.scm.search.Searchable;
 
 import java.text.MessageFormat;
+import java.util.Collection;
 import java.util.function.Consumer;
 
 import static sonia.scm.user.ChangePasswordNotAllowedException.WRONG_USER_TYPE;
@@ -90,5 +91,13 @@ public interface UserManager
     return getDefaultType().equals(user.getType());
   }
 
+  /**
+   * Returns a {@link java.util.Collection} of filtered objects
+   *
+   * @param filter the searched string
+   * @return filtered object from the store
+   */
+  Collection<User> autocomplete(String filter);
+
 
 }

scm-core/src/main/java/sonia/scm/user/UserManagerDecorator.java

@@ -121,6 +121,11 @@ public class UserManagerDecorator extends ManagerDecorator<User>
     return decorated.getDefaultType();
   }
 
+  @Override
+  public Collection<User> autocomplete(String filter) {
+    return decorated.autocomplete(filter);
+  }
+
   //~--- fields ---------------------------------------------------------------
 
   /** Field description */

scm-core/src/main/java/sonia/scm/web/VndMediaType.java

@@ -18,6 +18,7 @@ public class VndMediaType {
   public static final String INDEX = PREFIX + "index" + SUFFIX;
   public static final String USER = PREFIX + "user" + SUFFIX;
   public static final String GROUP = PREFIX + "group" + SUFFIX;
+  public static final String AUTOCOMPLETE =  PREFIX + "autocomplete" + SUFFIX;
   public static final String REPOSITORY = PREFIX + "repository" + SUFFIX;
   public static final String PERMISSION = PREFIX + "permission" + SUFFIX;
   public static final String CHANGESET = PREFIX + "changeset" + SUFFIX;

scm-dao-xml/src/main/java/sonia/scm/xml/AbstractXmlDAO.java

@@ -35,17 +35,20 @@ package sonia.scm.xml;
 //~--- non-JDK imports --------------------------------------------------------
 
 import com.google.common.collect.ImmutableList;
+import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import sonia.scm.GenericDAO;
 import sonia.scm.ModelObject;
 import sonia.scm.group.xml.XmlGroupDAO;
-
-//~--- JDK imports ------------------------------------------------------------
+import sonia.scm.store.ConfigurationStore;
+import sonia.scm.util.AssertUtil;
 
 import java.util.Collection;
-import sonia.scm.store.ConfigurationStore;
+import java.util.stream.Collectors;
+
+//~--- JDK imports ------------------------------------------------------------
 
 /**
  *

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

@@ -0,0 +1,73 @@
+package sonia.scm.it;
+
+import org.junit.Before;
+import org.junit.Test;
+import sonia.scm.it.utils.ScmRequests;
+import sonia.scm.it.utils.TestData;
+
+import java.util.List;
+import java.util.Map;
+import java.util.function.Consumer;
+import java.util.stream.IntStream;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class AutoCompleteITCase {
+
+
+  public static final String CREATED_USER_PREFIX = "user_";
+  public static final String CREATED_GROUP_PREFIX = "group_";
+
+  @Before
+  public void init() {
+    TestData.cleanup();
+  }
+
+  @Test
+  public void adminShouldAutoComplete() {
+    shouldAutocomplete(TestData.USER_SCM_ADMIN, TestData.USER_SCM_ADMIN);
+  }
+
+  @Test
+  public void userShouldAutoComplete() {
+    String username = "nonAdmin";
+    String password = "pass";
+    TestData.createUser(username, password, false, "xml", "email@e.de");
+    shouldAutocomplete(username, password);
+  }
+
+  public void shouldAutocomplete(String username, String password) {
+    createUsers();
+    createGroups();
+    ScmRequests.start()
+      .requestIndexResource(username, password)
+      .assertStatusCode(200)
+      .requestAutoCompleteGroups("group*")
+      .assertStatusCode(200)
+      .assertAutoCompleteResults(assertAutoCompleteResult(CREATED_GROUP_PREFIX))
+      .returnToPrevious()
+      .requestAutoCompleteUsers("user*")
+      .assertStatusCode(200)
+      .assertAutoCompleteResults(assertAutoCompleteResult(CREATED_USER_PREFIX));
+  }
+
+  @SuppressWarnings("unchecked")
+  private Consumer<List<Map>> assertAutoCompleteResult(String id) {
+    return autoCompleteDtos -> {
+      IntStream.range(0, 5).forEach(i -> {
+        assertThat(autoCompleteDtos).as("return maximum 5 entries").hasSize(5);
+        assertThat(autoCompleteDtos.get(i)).containsEntry("id", id + (i + 1));
+        assertThat(autoCompleteDtos.get(i)).containsEntry("displayName", id + (i + 1));
+      });
+    };
+  }
+
+  private void createUsers() {
+    IntStream.range(0, 6).forEach(i -> TestData.createUser(CREATED_USER_PREFIX + (i + 1), "pass", false, "xml", CREATED_USER_PREFIX + (i + 1) + "@scm-manager.org"));
+  }
+
+  private void createGroups() {
+    IntStream.range(0, 6).forEach(i -> TestData.createGroup(CREATED_GROUP_PREFIX + (i + 1), CREATED_GROUP_PREFIX + (i + 1)));
+  }
+
+}

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

@@ -20,12 +20,9 @@ public class MeITCase {
     String newPassword = TestData.USER_SCM_ADMIN + "1";
     // admin change the own password
     ScmRequests.start()
-      .given()
-      .url(TestData.getMeUrl())
-      .usernameAndPassword(TestData.USER_SCM_ADMIN, TestData.USER_SCM_ADMIN)
-      .getMeResource()
+      .requestIndexResource(TestData.USER_SCM_ADMIN, TestData.USER_SCM_ADMIN)
+      .requestMe()
       .assertStatusCode(200)
-      .usingMeResponse()
       .assertAdmin(aBoolean -> assertThat(aBoolean).isEqualTo(Boolean.TRUE))
       .assertPassword(Assert::assertNull)
       .assertType(s -> assertThat(s).isEqualTo("xml"))
@@ -33,12 +30,9 @@ public class MeITCase {
       .assertStatusCode(204);
     // assert password is changed -> login with the new Password than undo changes
     ScmRequests.start()
-      .given()
-      .url(TestData.getUserUrl(TestData.USER_SCM_ADMIN))
-      .usernameAndPassword(TestData.USER_SCM_ADMIN, newPassword)
-      .getMeResource()
+      .requestIndexResource(TestData.USER_SCM_ADMIN, newPassword)
+      .requestMe()
       .assertStatusCode(200)
-      .usingMeResponse()
       .assertAdmin(aBoolean -> assertThat(aBoolean).isEqualTo(Boolean.TRUE))// still admin
       .requestChangePassword(newPassword, TestData.USER_SCM_ADMIN)
       .assertStatusCode(204);
@@ -49,14 +43,11 @@ public class MeITCase {
     String newUser = "user";
     String password = "pass";
     String type = "not XML Type";
-    TestData.createUser(newUser, password, true, type);
+    TestData.createUser(newUser, password, true, type, "user@scm-manager.org");
     ScmRequests.start()
-      .given()
-      .url(TestData.getMeUrl())
-      .usernameAndPassword(newUser, password)
-      .getMeResource()
+      .requestIndexResource(newUser, password)
+      .requestMe()
       .assertStatusCode(200)
-      .usingMeResponse()
       .assertAdmin(aBoolean -> assertThat(aBoolean).isEqualTo(Boolean.TRUE))
       .assertPassword(Assert::assertNull)
       .assertType(s -> assertThat(s).isEqualTo(type))

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

@@ -87,13 +87,13 @@ public class PermissionsITCase {
   @Before
   public void prepareEnvironment() {
     TestData.createDefault();
-    TestData.createUser(USER_READ, USER_PASS);
+    TestData.createNotAdminUser(USER_READ, USER_PASS);
     TestData.createUserPermission(USER_READ, PermissionType.READ, repositoryType);
-    TestData.createUser(USER_WRITE, USER_PASS);
+    TestData.createNotAdminUser(USER_WRITE, USER_PASS);
     TestData.createUserPermission(USER_WRITE, PermissionType.WRITE, repositoryType);
-    TestData.createUser(USER_OWNER, USER_PASS);
+    TestData.createNotAdminUser(USER_OWNER, USER_PASS);
     TestData.createUserPermission(USER_OWNER, PermissionType.OWNER, repositoryType);
-    TestData.createUser(USER_OTHER, USER_PASS);
+    TestData.createNotAdminUser(USER_OTHER, USER_PASS);
     createdPermissions = 3;
   }
 

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

@@ -44,7 +44,7 @@ public class RepositoryAccessITCase {
 
   private final String repositoryType;
   private File folder;
-  private ScmRequests.AppliedRepositoryRequest repositoryGetRequest;
+  private ScmRequests.RepositoryResponse<ScmRequests.IndexResponse> repositoryResponse;
 
   public RepositoryAccessITCase(String repositoryType) {
     this.repositoryType = repositoryType;
@@ -59,17 +59,13 @@ public class RepositoryAccessITCase {
   public void init() {
     TestData.createDefault();
     folder = tempFolder.getRoot();
-    repositoryGetRequest = ScmRequests.start()
-      .given()
-      .url(TestData.getDefaultRepositoryUrl(repositoryType))
-      .usernameAndPassword(ADMIN_USERNAME, ADMIN_PASSWORD)
-      .getRepositoryResource()
+    String namespace = ADMIN_USERNAME;
+    String repo = TestData.getDefaultRepoName(repositoryType);
+    repositoryResponse =
+      ScmRequests.start()
+      .requestIndexResource(ADMIN_USERNAME, ADMIN_PASSWORD)
+      .requestRepository(namespace, repo)
       .assertStatusCode(HttpStatus.SC_OK);
-    ScmRequests.AppliedMeRequest meGetRequest = ScmRequests.start()
-      .given()
-      .url(TestData.getMeUrl())
-      .usernameAndPassword(ADMIN_USERNAME, ADMIN_PASSWORD)
-      .getMeResource();
   }
 
   @Test
@@ -306,17 +302,12 @@ public class RepositoryAccessITCase {
   public void shouldFindFileHistory() throws IOException {
     RepositoryClient repositoryClient = RepositoryUtil.createRepositoryClient(repositoryType, folder);
     Changeset changeset = RepositoryUtil.createAndCommitFile(repositoryClient, ADMIN_USERNAME, "folder/subfolder/a.txt", "a");
-    repositoryGetRequest
-      .usingRepositoryResponse()
+    repositoryResponse
       .requestSources()
-      .usingSourcesResponse()
       .requestSelf("folder")
-      .usingSourcesResponse()
       .requestSelf("subfolder")
-      .usingSourcesResponse()
       .requestFileHistory("a.txt")
       .assertStatusCode(HttpStatus.SC_OK)
-      .usingChangesetsResponse()
       .assertChangesets(changesets -> {
           assertThat(changesets).hasSize(1);
           assertThat(changesets.get(0)).containsEntry("id", changeset.getId());
@@ -332,14 +323,11 @@ public class RepositoryAccessITCase {
     String fileName = "a.txt";
     Changeset changeset = RepositoryUtil.createAndCommitFile(repositoryClient, ADMIN_USERNAME, fileName, "a");
     String revision = changeset.getId();
-    repositoryGetRequest
-      .usingRepositoryResponse()
+    repositoryResponse
       .requestChangesets()
       .assertStatusCode(HttpStatus.SC_OK)
-      .usingChangesetsResponse()
       .requestModifications(revision)
       .assertStatusCode(HttpStatus.SC_OK)
-      .usingModificationsResponse()
       .assertRevision(actualRevision -> assertThat(actualRevision).isEqualTo(revision))
       .assertAdded(addedFiles -> assertThat(addedFiles)
         .hasSize(1)
@@ -359,14 +347,11 @@ public class RepositoryAccessITCase {
     Changeset changeset = RepositoryUtil.removeAndCommitFile(repositoryClient, ADMIN_USERNAME, fileName);
 
     String revision = changeset.getId();
-    repositoryGetRequest
-      .usingRepositoryResponse()
+    repositoryResponse
       .requestChangesets()
       .assertStatusCode(HttpStatus.SC_OK)
-      .usingChangesetsResponse()
       .requestModifications(revision)
       .assertStatusCode(HttpStatus.SC_OK)
-      .usingModificationsResponse()
       .assertRevision(actualRevision -> assertThat(actualRevision).isEqualTo(revision))
       .assertRemoved(removedFiles -> assertThat(removedFiles)
         .hasSize(1)
@@ -386,14 +371,11 @@ public class RepositoryAccessITCase {
     Changeset changeset = RepositoryUtil.createAndCommitFile(repositoryClient, ADMIN_USERNAME, fileName, "new Content");
 
     String revision = changeset.getId();
-    repositoryGetRequest
-      .usingRepositoryResponse()
+    repositoryResponse
       .requestChangesets()
       .assertStatusCode(HttpStatus.SC_OK)
-      .usingChangesetsResponse()
       .requestModifications(revision)
       .assertStatusCode(HttpStatus.SC_OK)
-      .usingModificationsResponse()
       .assertRevision(actualRevision -> assertThat(actualRevision).isEqualTo(revision))
       .assertModified(modifiedFiles -> assertThat(modifiedFiles)
         .hasSize(1)
@@ -423,14 +405,11 @@ public class RepositoryAccessITCase {
     Changeset changeset = RepositoryUtil.commitMultipleFileModifications(repositoryClient, ADMIN_USERNAME, addedFiles, modifiedFiles, removedFiles);
 
     String revision = changeset.getId();
-    repositoryGetRequest
-      .usingRepositoryResponse()
+    repositoryResponse
       .requestChangesets()
       .assertStatusCode(HttpStatus.SC_OK)
-      .usingChangesetsResponse()
       .requestModifications(revision)
       .assertStatusCode(HttpStatus.SC_OK)
-      .usingModificationsResponse()
       .assertRevision(actualRevision -> assertThat(actualRevision).isEqualTo(revision))
       .assertAdded(a -> assertThat(a)
         .hasSize(1)
@@ -463,14 +442,11 @@ public class RepositoryAccessITCase {
     Changeset changeset = RepositoryUtil.commitMultipleFileModifications(repositoryClient, ADMIN_USERNAME, addedFiles, modifiedFiles, removedFiles);
 
     String revision = changeset.getId();
-    repositoryGetRequest
-      .usingRepositoryResponse()
+    repositoryResponse
       .requestChangesets()
       .assertStatusCode(HttpStatus.SC_OK)
-      .usingChangesetsResponse()
       .requestModifications(revision)
       .assertStatusCode(HttpStatus.SC_OK)
-      .usingModificationsResponse()
       .assertRevision(actualRevision -> assertThat(actualRevision).isEqualTo(revision))
       .assertAdded(a -> assertThat(a)
         .hasSize(3)

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

@@ -19,57 +19,48 @@ public class UserITCase {
   public void adminShouldChangeOwnPassword() {
     String newUser = "user";
     String password = "pass";
-    TestData.createUser(newUser, password, true, "xml");
+    TestData.createUser(newUser, password, true, "xml", "user@scm-manager.org");
     String newPassword = "new_password";
     // admin change the own password
     ScmRequests.start()
-      .given()
-      .url(TestData.getUserUrl(newUser))
-      .usernameAndPassword(newUser, password)
-      .getUserResource()
+      .requestIndexResource(newUser, password)
+      .assertStatusCode(200)
+      .requestUser(newUser)
       .assertStatusCode(200)
-      .usingUserResponse()
       .assertAdmin(aBoolean -> assertThat(aBoolean).isEqualTo(Boolean.TRUE))
       .assertPassword(Assert::assertNull)
       .requestChangePassword(newPassword) // the oldPassword is not needed in the user resource
       .assertStatusCode(204);
     // assert password is changed -> login with the new Password
     ScmRequests.start()
-      .given()
-      .url(TestData.getUserUrl(newUser))
-      .usernameAndPassword(newUser, newPassword)
-      .getUserResource()
+      .requestIndexResource(newUser, newPassword)
       .assertStatusCode(200)
-      .usingUserResponse()
+      .requestUser(newUser)
       .assertAdmin(isAdmin -> assertThat(isAdmin).isEqualTo(Boolean.TRUE))
       .assertPassword(Assert::assertNull);
-
   }
 
   @Test
   public void adminShouldChangePasswordOfOtherUser() {
     String newUser = "user";
     String password = "pass";
-    TestData.createUser(newUser, password, true, "xml");
+    TestData.createUser(newUser, password, true, "xml", "user@scm-manager.org");
     String newPassword = "new_password";
     // admin change the password of the user
     ScmRequests.start()
-      .given()
-      .url(TestData.getUserUrl(newUser))// the admin get the user object
-      .usernameAndPassword(TestData.USER_SCM_ADMIN, TestData.USER_SCM_ADMIN)
-      .getUserResource()
+      .requestIndexResource(TestData.USER_SCM_ADMIN, TestData.USER_SCM_ADMIN)
+      .assertStatusCode(200)
+      .requestUser(newUser)
       .assertStatusCode(200)
-      .usingUserResponse()
       .assertAdmin(aBoolean -> assertThat(aBoolean).isEqualTo(Boolean.TRUE)) // the user anonymous is not an admin
       .assertPassword(Assert::assertNull)
       .requestChangePassword(newPassword) // the oldPassword is not needed in the user resource
       .assertStatusCode(204);
     // assert password is changed
     ScmRequests.start()
-      .given()
-      .url(TestData.getUserUrl(newUser))
-      .usernameAndPassword(newUser, newPassword)
-      .getUserResource()
+      .requestIndexResource(newUser, newPassword)
+      .assertStatusCode(200)
+      .requestUser(newUser)
       .assertStatusCode(200);
 
   }
@@ -80,14 +71,12 @@ public class UserITCase {
     String newUser = "user";
     String password = "pass";
     String type = "not XML Type";
-    TestData.createUser(newUser, password, true, type);
+    TestData.createUser(newUser, password, true, type, "user@scm-manager.org");
     ScmRequests.start()
-      .given()
-      .url(TestData.getMeUrl())
-      .usernameAndPassword(newUser, password)
-      .getUserResource()
+      .requestIndexResource(newUser, password)
+      .assertStatusCode(200)
+      .requestUser(newUser)
       .assertStatusCode(200)
-      .usingUserResponse()
       .assertAdmin(aBoolean -> assertThat(aBoolean).isEqualTo(Boolean.TRUE))
       .assertPassword(Assert::assertNull)
       .assertType(s -> assertThat(s).isEqualTo(type))

scm-it/src/test/java/sonia/scm/it/utils/ScmRequests.java

@@ -4,7 +4,6 @@ import io.restassured.RestAssured;
 import io.restassured.response.Response;
 import sonia.scm.web.VndMediaType;
 
-import java.net.URI;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Consumer;
@@ -33,8 +32,10 @@ public class ScmRequests {
     return new ScmRequests();
   }
 
-  public Given given() {
-    return new Given();
+  public IndexResponse requestIndexResource(String username, String password) {
+    setUsername(username);
+    setPassword(password);
+    return new IndexResponse(applyGETRequest(RestUtil.REST_BASE_URL.toString()));
   }
 
 
@@ -46,24 +47,46 @@ public class ScmRequests {
    * @return the response of the GET request using the given link
    */
   private Response applyGETRequestFromLink(Response response, String linkPropertyName) {
-    return applyGETRequest(response
-      .then()
-      .extract()
-      .path(linkPropertyName));
+    return applyGETRequestFromLinkWithParams(response, linkPropertyName, "");
   }
 
+  /**
+   * Apply a GET Request to the extracted url from the given link
+   *
+   * @param linkPropertyName the property name of link
+   * @param response         the response containing the link
+   * @param params           query params eg. ?q=xyz&count=12 or path params eg. namespace/name
+   * @return the response of the GET request using the given link
+   */
+  private Response applyGETRequestFromLinkWithParams(Response response, String linkPropertyName, String params) {
+    return applyGETRequestWithQueryParams(response
+      .then()
+      .extract()
+      .path(linkPropertyName), params);
+  }
+
+  /**
+   * Apply a GET Request to the given <code>url</code> and return the response.
+   *
+   * @param url    the url of the GET request
+   * @param params query params eg. ?q=xyz&count=12 or path params eg. namespace/name
+   * @return the response of the GET request using the given <code>url</code>
+   */
+  private Response applyGETRequestWithQueryParams(String url, String params) {
+    return RestAssured.given()
+      .auth().preemptive().basic(username, password)
+      .when()
+      .get(url + params);
+  }
 
   /**
    * Apply a GET Request to the given <code>url</code> and return the response.
    *
    * @param url the url of the GET request
    * @return the response of the GET request using the given <code>url</code>
-   */
+   **/
   private Response applyGETRequest(String url) {
-    return RestAssured.given()
-      .auth().preemptive().basic(username, password)
-      .when()
-      .get(url);
+    return applyGETRequestWithQueryParams(url, "");
   }
 
 
@@ -101,11 +124,6 @@ public class ScmRequests {
       .put(url);
   }
 
-
-  private void setUrl(String url) {
-    this.url = url;
-  }
-
   private void setUsername(String username) {
     this.username = username;
   }
@@ -114,296 +132,185 @@ public class ScmRequests {
     this.password = password;
   }
 
-  private String getUrl() {
-    return url;
+
+  public class IndexResponse extends ModelResponse<IndexResponse, IndexResponse> {
+    public static final String LINK_AUTOCOMPLETE_USERS = "_links.autocomplete.find{it.name=='users'}.href";
+    public static final String LINK_AUTOCOMPLETE_GROUPS = "_links.autocomplete.find{it.name=='groups'}.href";
+    public static final String LINK_REPOSITORIES = "_links.repositories.href";
+    private static final String LINK_ME = "_links.me.href";
+    private static final String LINK_USERS = "_links.users.href";
+
+    public IndexResponse(Response response) {
+      super(response, null);
     }
 
-  private String getUsername() {
-    return username;
+    public AutoCompleteResponse<IndexResponse> requestAutoCompleteUsers(String q) {
+      return new AutoCompleteResponse<>(applyGETRequestFromLinkWithParams(response, LINK_AUTOCOMPLETE_USERS, "?q=" + q), this);
     }
 
-  private String getPassword() {
-    return password;
+    public AutoCompleteResponse<IndexResponse> requestAutoCompleteGroups(String q) {
+      return new AutoCompleteResponse<>(applyGETRequestFromLinkWithParams(response, LINK_AUTOCOMPLETE_GROUPS, "?q=" + q), this);
     }
 
-  public class Given {
-
-    public GivenUrl url(String url) {
-      setUrl(url);
-      return new GivenUrl();
+    public RepositoryResponse<IndexResponse> requestRepository(String namespace, String name) {
+      return new RepositoryResponse<>(applyGETRequestFromLinkWithParams(response, LINK_REPOSITORIES, namespace + "/" + name), this);
     }
 
-    public GivenUrl url(URI url) {
-      setUrl(url.toString());
-      return new GivenUrl();
+    public MeResponse<IndexResponse> requestMe() {
+      return new MeResponse<>(applyGETRequestFromLink(response, LINK_ME), this);
+    }
+
+    public UserResponse<IndexResponse> requestUser(String username) {
+      return new UserResponse<>(applyGETRequestFromLinkWithParams(response, LINK_USERS, username), this);
     }
 
   }
 
-  public class GivenWithUrlAndAuth {
-    public AppliedMeRequest getMeResource() {
-      return new AppliedMeRequest(applyGETRequest(url));
+  public class RepositoryResponse<PREV extends ModelResponse> extends ModelResponse<RepositoryResponse<PREV>, PREV> {
+
+
+    public static final String LINKS_SOURCES = "_links.sources.href";
+    public static final String LINKS_CHANGESETS = "_links.changesets.href";
+
+    public RepositoryResponse(Response response, PREV previousResponse) {
+      super(response, previousResponse);
     }
 
-    public AppliedUserRequest getUserResource() {
-      return new AppliedUserRequest(applyGETRequest(url));
+    public SourcesResponse<RepositoryResponse> requestSources() {
+      return new SourcesResponse<>(applyGETRequestFromLink(response, LINKS_SOURCES), this);
     }
 
-    public AppliedRepositoryRequest getRepositoryResource() {
-      return new AppliedRepositoryRequest(
-        applyGETRequest(url)
-      );
-    }
-  }
-
-  public class AppliedRequest<SELF extends AppliedRequest> {
-    private Response response;
-
-    public AppliedRequest(Response response) {
-      this.response = response;
-    }
-
-    /**
-     * apply custom assertions to the actual response
-     *
-     * @param consumer consume the response in order to assert the content. the header, the payload etc..
-     * @return the self object
-     */
-    public SELF assertResponse(Consumer<Response> consumer) {
-      consumer.accept(response);
-      return (SELF) this;
-    }
-
-    /**
-     * special assertion of the status code
-     *
-     * @param expectedStatusCode the expected status code
-     * @return the self object
-     */
-    public SELF assertStatusCode(int expectedStatusCode) {
-      this.response.then().assertThat().statusCode(expectedStatusCode);
-      return (SELF) this;
+    public ChangesetsResponse<RepositoryResponse> requestChangesets() {
+      return new ChangesetsResponse<>(applyGETRequestFromLink(response, LINKS_CHANGESETS), this);
     }
 
   }
 
-  public class AppliedRepositoryRequest extends AppliedRequest<AppliedRepositoryRequest> {
+  public class ChangesetsResponse<PREV extends ModelResponse> extends ModelResponse<ChangesetsResponse<PREV>, PREV> {
 
-    public AppliedRepositoryRequest(Response response) {
-      super(response);
-    }
-
-    public RepositoryResponse usingRepositoryResponse() {
-      return new RepositoryResponse(super.response);
-    }
-  }
-
-  public class RepositoryResponse {
-
-    private Response repositoryResponse;
-
-    public RepositoryResponse(Response repositoryResponse) {
-      this.repositoryResponse = repositoryResponse;
-    }
-
-    public AppliedSourcesRequest requestSources() {
-      return new AppliedSourcesRequest(applyGETRequestFromLink(repositoryResponse, "_links.sources.href"));
-    }
-
-    public AppliedChangesetsRequest requestChangesets() {
-      return new AppliedChangesetsRequest(applyGETRequestFromLink(repositoryResponse, "_links.changesets.href"));
-    }
-  }
-
-  public class AppliedChangesetsRequest extends AppliedRequest<AppliedChangesetsRequest> {
-
-    public AppliedChangesetsRequest(Response response) {
-      super(response);
-    }
-
-    public ChangesetsResponse usingChangesetsResponse() {
-      return new ChangesetsResponse(super.response);
-    }
-  }
-
-  public class ChangesetsResponse {
-    private Response changesetsResponse;
-
-    public ChangesetsResponse(Response changesetsResponse) {
-      this.changesetsResponse = changesetsResponse;
+    public ChangesetsResponse(Response response, PREV previousResponse) {
+      super(response, previousResponse);
     }
 
     public ChangesetsResponse assertChangesets(Consumer<List<Map>> changesetsConsumer) {
-      List<Map> changesets = changesetsResponse.then().extract().path("_embedded.changesets");
+      List<Map> changesets = response.then().extract().path("_embedded.changesets");
       changesetsConsumer.accept(changesets);
       return this;
     }
 
-    public AppliedDiffRequest requestDiff(String revision) {
-      return new AppliedDiffRequest(applyGETRequestFromLink(changesetsResponse, "_embedded.changesets.find{it.id=='" + revision + "'}._links.diff.href"));
+    public DiffResponse<ChangesetsResponse> requestDiff(String revision) {
+      return new DiffResponse<>(applyGETRequestFromLink(response, "_embedded.changesets.find{it.id=='" + revision + "'}._links.diff.href"), this);
     }
 
-    public AppliedModificationsRequest requestModifications(String revision) {
-      return new AppliedModificationsRequest(applyGETRequestFromLink(changesetsResponse, "_embedded.changesets.find{it.id=='" + revision + "'}._links.modifications.href"));
+    public ModificationsResponse<ChangesetsResponse> requestModifications(String revision) {
+      return new ModificationsResponse<>(applyGETRequestFromLink(response, "_embedded.changesets.find{it.id=='" + revision + "'}._links.modifications.href"), this);
     }
   }
 
-  public class AppliedSourcesRequest extends AppliedRequest<AppliedSourcesRequest> {
 
-    public AppliedSourcesRequest(Response sourcesResponse) {
-      super(sourcesResponse);
-    }
+  public class SourcesResponse<PREV extends ModelResponse> extends ModelResponse<SourcesResponse<PREV>, PREV> {
 
-    public SourcesResponse usingSourcesResponse() {
-      return new SourcesResponse(super.response);
-    }
-  }
-
-  public class SourcesResponse {
-
-    private Response sourcesResponse;
-
-    public SourcesResponse(Response sourcesResponse) {
-      this.sourcesResponse = sourcesResponse;
+    public SourcesResponse(Response response, PREV previousResponse) {
+      super(response, previousResponse);
     }
 
     public SourcesResponse assertRevision(Consumer<String> assertRevision) {
-      String revision = sourcesResponse.then().extract().path("revision");
+      String revision = response.then().extract().path("revision");
       assertRevision.accept(revision);
       return this;
     }
 
     public SourcesResponse assertFiles(Consumer<List> assertFiles) {
-      List files = sourcesResponse.then().extract().path("files");
+      List files = response.then().extract().path("files");
       assertFiles.accept(files);
       return this;
     }
 
-    public AppliedChangesetsRequest requestFileHistory(String fileName) {
-      return new AppliedChangesetsRequest(applyGETRequestFromLink(sourcesResponse, "_embedded.files.find{it.name=='" + fileName + "'}._links.history.href"));
+    public ChangesetsResponse<SourcesResponse> requestFileHistory(String fileName) {
+      return new ChangesetsResponse<>(applyGETRequestFromLink(response, "_embedded.files.find{it.name=='" + fileName + "'}._links.history.href"), this);
     }
 
-    public AppliedSourcesRequest requestSelf(String fileName) {
-      return new AppliedSourcesRequest(applyGETRequestFromLink(sourcesResponse, "_embedded.files.find{it.name=='" + fileName + "'}._links.self.href"));
+    public SourcesResponse<SourcesResponse> requestSelf(String fileName) {
+      return new SourcesResponse<>(applyGETRequestFromLink(response, "_embedded.files.find{it.name=='" + fileName + "'}._links.self.href"), this);
     }
   }
 
-  public class AppliedDiffRequest extends AppliedRequest<AppliedDiffRequest> {
+  public class ModificationsResponse<PREV extends ModelResponse> extends ModelResponse<ModificationsResponse<PREV>, PREV> {
 
-    public AppliedDiffRequest(Response response) {
-      super(response);
-    }
+    public ModificationsResponse(Response response, PREV previousResponse) {
+      super(response, previousResponse);
     }
 
-  public class GivenUrl {
-
-    public GivenWithUrlAndAuth usernameAndPassword(String username, String password) {
-      setUsername(username);
-      setPassword(password);
-      return new GivenWithUrlAndAuth();
-    }
-  }
-
-  public class AppliedModificationsRequest extends AppliedRequest<AppliedModificationsRequest> {
-    public AppliedModificationsRequest(Response response) {
-      super(response);
-    }
-
-    public ModificationsResponse usingModificationsResponse() {
-      return new ModificationsResponse(super.response);
-    }
-
-  }
-
-  public class ModificationsResponse {
-    private Response resource;
-
-    public ModificationsResponse(Response resource) {
-      this.resource = resource;
-    }
-
-    public ModificationsResponse assertRevision(Consumer<String> assertRevision) {
-      String revision = resource.then().extract().path("revision");
+    public ModificationsResponse<PREV> assertRevision(Consumer<String> assertRevision) {
+      String revision = response.then().extract().path("revision");
       assertRevision.accept(revision);
       return this;
     }
 
-    public ModificationsResponse assertAdded(Consumer<List<String>> assertAdded) {
-      List<String> added = resource.then().extract().path("added");
+    public ModificationsResponse<PREV> assertAdded(Consumer<List<String>> assertAdded) {
+      List<String> added = response.then().extract().path("added");
       assertAdded.accept(added);
       return this;
     }
 
-    public ModificationsResponse assertRemoved(Consumer<List<String>> assertRemoved) {
-      List<String> removed = resource.then().extract().path("removed");
+    public ModificationsResponse<PREV> assertRemoved(Consumer<List<String>> assertRemoved) {
+      List<String> removed = response.then().extract().path("removed");
       assertRemoved.accept(removed);
       return this;
     }
 
-    public ModificationsResponse assertModified(Consumer<List<String>> assertModified) {
-      List<String> modified = resource.then().extract().path("modified");
+    public ModificationsResponse<PREV> assertModified(Consumer<List<String>> assertModified) {
+      List<String> modified = response.then().extract().path("modified");
       assertModified.accept(modified);
       return this;
     }
 
   }
 
-  public class AppliedMeRequest extends AppliedRequest<AppliedMeRequest> {
-
-    public AppliedMeRequest(Response response) {
-      super(response);
-    }
-
-    public MeResponse usingMeResponse() {
-      return new MeResponse(super.response);
-    }
-
-  }
-
-  public class MeResponse extends UserResponse<MeResponse> {
+  public class MeResponse<PREV extends ModelResponse> extends UserResponse<PREV> {
 
 
-    public MeResponse(Response response) {
-      super(response);
-    }
-
-    public AppliedChangePasswordRequest requestChangePassword(String oldPassword, String newPassword) {
-      return new AppliedChangePasswordRequest(applyPUTRequestFromLink(super.response, "_links.password.href", VndMediaType.PASSWORD_CHANGE, createPasswordChangeJson(oldPassword, newPassword)));
+    public MeResponse(Response response, PREV previousResponse) {
+      super(response, previousResponse);
     }
 
 
   }
 
-  public class UserResponse<SELF extends UserResponse> extends ModelResponse<SELF> {
+  public class UserResponse<PREV extends ModelResponse> extends ModelResponse<UserResponse<PREV>, PREV> {
 
     public static final String LINKS_PASSWORD_HREF = "_links.password.href";
 
-    public UserResponse(Response response) {
-      super(response);
+    public UserResponse(Response response, PREV previousResponse) {
+      super(response, previousResponse);
     }
 
-    public SELF assertPassword(Consumer<String> assertPassword) {
+    public UserResponse<PREV> assertPassword(Consumer<String> assertPassword) {
       return super.assertSingleProperty(assertPassword, "password");
     }
 
-    public SELF assertType(Consumer<String> assertType) {
+    public UserResponse<PREV> assertType(Consumer<String> assertType) {
       return assertSingleProperty(assertType, "type");
     }
 
-    public SELF assertAdmin(Consumer<Boolean> assertAdmin) {
+    public UserResponse<PREV> assertAdmin(Consumer<Boolean> assertAdmin) {
       return assertSingleProperty(assertAdmin, "admin");
     }
 
-    public SELF assertPasswordLinkDoesNotExists() {
+    public UserResponse<PREV> assertPasswordLinkDoesNotExists() {
       return assertPropertyPathDoesNotExists(LINKS_PASSWORD_HREF);
     }
 
-    public SELF assertPasswordLinkExists() {
+    public UserResponse<PREV> assertPasswordLinkExists() {
       return assertPropertyPathExists(LINKS_PASSWORD_HREF);
     }
 
-    public AppliedChangePasswordRequest requestChangePassword(String newPassword) {
-      return new AppliedChangePasswordRequest(applyPUTRequestFromLink(super.response, LINKS_PASSWORD_HREF, VndMediaType.PASSWORD_CHANGE, createPasswordChangeJson(null, newPassword)));
+    public ChangePasswordResponse<UserResponse> requestChangePassword(String newPassword) {
+      return requestChangePassword(null, newPassword);
+    }
+
+    public ChangePasswordResponse<UserResponse> requestChangePassword(String oldPassword, String newPassword) {
+      return new ChangePasswordResponse<>(applyPUTRequestFromLink(super.response, LINKS_PASSWORD_HREF, VndMediaType.PASSWORD_CHANGE, createPasswordChangeJson(oldPassword, newPassword)), this);
     }
 
   }
@@ -412,12 +319,18 @@ public class ScmRequests {
   /**
    * encapsulate standard assertions over model properties
    */
-  public class ModelResponse<SELF extends ModelResponse> {
+  public class ModelResponse<SELF extends ModelResponse<SELF, PREV>, PREV extends ModelResponse> {
 
+    protected PREV previousResponse;
     protected Response response;
 
-    public ModelResponse(Response response) {
+    public ModelResponse(Response response, PREV previousResponse) {
       this.response = response;
+      this.previousResponse = previousResponse;
+    }
+
+    public PREV returnToPrevious() {
+      return previousResponse;
     }
 
     public <T> SELF assertSingleProperty(Consumer<T> assertSingleProperty, String propertyJsonPath) {
@@ -441,25 +354,45 @@ public class ScmRequests {
       assertProperties.accept(properties);
       return (SELF) this;
     }
+
+    /**
+     * special assertion of the status code
+     *
+     * @param expectedStatusCode the expected status code
+     * @return the self object
+     */
+    public SELF assertStatusCode(int expectedStatusCode) {
+      this.response.then().assertThat().statusCode(expectedStatusCode);
+      return (SELF) this;
+    }
   }
 
-  public class AppliedChangePasswordRequest extends AppliedRequest<AppliedChangePasswordRequest> {
+  public class AutoCompleteResponse<PREV extends ModelResponse> extends ModelResponse<AutoCompleteResponse<PREV>, PREV> {
 
-    public AppliedChangePasswordRequest(Response response) {
-      super(response);
+    public AutoCompleteResponse(Response response, PREV previousResponse) {
+      super(response, previousResponse);
+    }
+
+    public AutoCompleteResponse<PREV> assertAutoCompleteResults(Consumer<List<Map>> checker) {
+      List<Map> result = response.then().extract().path("");
+      checker.accept(result);
+      return this;
     }
 
   }
 
-  public class AppliedUserRequest extends AppliedRequest<AppliedUserRequest> {
 
-    public AppliedUserRequest(Response response) {
-      super(response);
+  public class DiffResponse<PREV extends ModelResponse> extends ModelResponse<DiffResponse<PREV>, PREV> {
+
+    public DiffResponse(Response response, PREV previousResponse) {
+      super(response, previousResponse);
+    }
   }
 
-    public UserResponse usingUserResponse() {
-      return new UserResponse(super.response);
-    }
+  public class ChangePasswordResponse<PREV extends ModelResponse> extends ModelResponse<ChangePasswordResponse<PREV>, PREV> {
 
+    public ChangePasswordResponse(Response response, PREV previousResponse) {
+      super(response, previousResponse);
+    }
   }
 }

scm-it/src/test/java/sonia/scm/it/utils/TestData.java

@@ -46,11 +46,11 @@ public class TestData {
     return DEFAULT_REPOSITORIES.get(repositoryType);
   }
 
-  public static void createUser(String username, String password) {
-     createUser(username, password, false, "xml");
+  public static void createNotAdminUser(String username, String password) {
+     createUser(username, password, false, "xml", "user1@scm-manager.org");
   }
 
-  public static void createUser(String username, String password, boolean isAdmin, String type) {
+  public static void createUser(String username, String password, boolean isAdmin, String type, final String email) {
     LOG.info("create user with username: {}", username);
     String admin = isAdmin ? "true" : "false";
     given(VndMediaType.USER)
@@ -61,7 +61,7 @@ public class TestData {
         .append("    \"admin\": ").append(admin).append(",\n")
         .append("    \"creationDate\": \"2018-08-21T12:26:46.084Z\",\n")
         .append("    \"displayName\": \"").append(username).append("\",\n")
-        .append("    \"mail\": \"user1@scm-manager.org\",\n")
+        .append("    \"mail\": \"" + email + "\",\n")
         .append("    \"name\": \"").append(username).append("\",\n")
         .append("    \"password\": \"").append(password).append("\",\n")
         .append("    \"type\": \"").append(type).append("\"\n")
@@ -71,6 +71,16 @@ public class TestData {
       .statusCode(HttpStatus.SC_CREATED)
     ;
   }
+  public static void createGroup(String groupName, String desc) {
+    LOG.info("create group with group name: {} and description {}", groupName, desc);
+    given(VndMediaType.GROUP)
+      .when()
+      .content(getGroupJson(groupName,desc))
+      .post(getGroupsUrl())
+      .then()
+      .statusCode(HttpStatus.SC_CREATED)
+    ;
+  }
 
   public static void createUserPermission(String name, PermissionType permissionType, String repositoryType) {
     String defaultPermissionUrl = TestData.getDefaultPermissionUrl(USER_SCM_ADMIN, USER_SCM_ADMIN, repositoryType);
@@ -193,28 +203,31 @@ public class TestData {
     return JSON_BUILDER
       .add("contact", "zaphod.beeblebrox@hitchhiker.com")
       .add("description", "Heart of Gold")
-      .add("name", "HeartOfGold-" + repositoryType)
+      .add("name", getDefaultRepoName(repositoryType))
       .add("archived", false)
       .add("type", repositoryType)
       .build().toString();
   }
 
-  public static URI getMeUrl() {
-    return RestUtil.createResourceUrl("me/");
+  public static String getDefaultRepoName(String repositoryType) {
+    return "HeartOfGold-" + repositoryType;
+  }
 
+  public static String getGroupJson(String groupname , String desc) {
+    return JSON_BUILDER
+      .add("name", groupname)
+      .add("description", desc)
+      .build().toString();
+  }
+
+  public static URI getGroupsUrl() {
+    return RestUtil.createResourceUrl("groups/");
   }
 
   public static URI getUsersUrl() {
     return RestUtil.createResourceUrl("users/");
-
   }
 
-  public static URI getUserUrl(String username) {
-    return getUsersUrl().resolve(username);
-
-  }
-
-
   public static String createPasswordChangeJson(String oldPassword, String newPassword) {
     return JSON_BUILDER
       .add("oldPassword", oldPassword)
@@ -225,4 +238,5 @@ public class TestData {
   public static void main(String[] args) {
     cleanup();
   }
+
 }

scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitChangesetConverter.java

@@ -39,7 +39,6 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Multimap;
 import org.eclipse.jgit.lib.ObjectId;
 import org.eclipse.jgit.lib.PersonIdent;
-import org.eclipse.jgit.lib.Ref;
 import org.eclipse.jgit.revwalk.RevCommit;
 import org.eclipse.jgit.revwalk.RevWalk;
 import org.eclipse.jgit.treewalk.TreeWalk;
@@ -51,8 +50,8 @@ import java.io.Closeable;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
-import java.util.Set;
 
 //~--- JDK imports ------------------------------------------------------------
 
@@ -130,27 +129,9 @@ public class GitChangesetConverter implements Closeable
    *
    * @throws IOException
    */
-  public Changeset createChangeset(RevCommit commit) throws IOException
+  public Changeset createChangeset(RevCommit commit)
   {
-    List<String> branches = Lists.newArrayList();
-    Set<Ref> refs = repository.getAllRefsByPeeledObjectId().get(commit.getId());
-
-    if (Util.isNotEmpty(refs))
-    {
-
-      for (Ref ref : refs)
-      {
-        String branch = GitUtil.getBranch(ref);
-
-        if (branch != null)
-        {
-          branches.add(branch);
-        }
-      }
-
-    }
-
-    return createChangeset(commit, branches);
+    return createChangeset(commit, Collections.emptyList());
   }
 
   /**
@@ -165,7 +146,6 @@ public class GitChangesetConverter implements Closeable
    * @throws IOException
    */
   public Changeset createChangeset(RevCommit commit, String branch)
-    throws IOException
   {
     return createChangeset(commit, Lists.newArrayList(branch));
   }
@@ -183,7 +163,6 @@ public class GitChangesetConverter implements Closeable
    * @throws IOException
    */
   public Changeset createChangeset(RevCommit commit, List<String> branches)
-    throws IOException
   {
     String id = commit.getId().name();
     List<String> parentList = null;

scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitUtil.java

@@ -63,8 +63,11 @@ import javax.servlet.http.HttpServletRequest;
 import java.io.File;
 import java.io.IOException;
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 
+import static java.util.Optional.of;
+
 //~--- JDK imports ------------------------------------------------------------
 
 /**
@@ -345,12 +348,11 @@ public final class GitUtil
    *
    * @throws IOException
    */
-  public static ObjectId getBranchId(org.eclipse.jgit.lib.Repository repo,
+  public static Ref getBranchId(org.eclipse.jgit.lib.Repository repo,
     String branchName)
     throws IOException
   {
-    ObjectId branchId = null;
-
+    Ref ref = null;
     if (!branchName.startsWith(REF_HEAD))
     {
       branchName = PREFIX_HEADS.concat(branchName);
@@ -360,24 +362,19 @@ public final class GitUtil
 
     try
     {
-      Ref ref = repo.findRef(branchName);
+      ref = repo.findRef(branchName);
 
-      if (ref != null)
-      {
-        branchId = ref.getObjectId();
-      }
-      else if (logger.isWarnEnabled())
+      if (ref == null)
       {
         logger.warn("could not find branch for {}", branchName);
       }
-
     }
     catch (IOException ex)
     {
       logger.warn("error occured during resolve of branch id", ex);
     }
 
-    return branchId;
+    return ref;
   }
 
   /**
@@ -499,68 +496,48 @@ public final class GitUtil
     return ref;
   }
 
-  /**
-   * Method description
-   *
-   *
-   * @param repo
-   *
-   * @return
-   *
-   * @throws IOException
-   */
-  public static ObjectId getRepositoryHead(org.eclipse.jgit.lib.Repository repo)
-    throws IOException
-  {
-    ObjectId id = null;
-    String head = null;
-    Map<String, Ref> refs = repo.getAllRefs();
-
-    for (Map.Entry<String, Ref> e : refs.entrySet())
-    {
-      String key = e.getKey();
-
-      if (REF_HEAD.equals(key))
-      {
-        head = REF_HEAD;
-        id = e.getValue().getObjectId();
-
-        break;
-      }
-      else if (key.startsWith(REF_HEAD_PREFIX))
-      {
-        id = e.getValue().getObjectId();
-        head = key.substring(REF_HEAD_PREFIX.length());
-
-        if (REF_MASTER.equals(head))
-        {
-          break;
-        }
-      }
+  public static ObjectId getRepositoryHead(org.eclipse.jgit.lib.Repository repo) {
+    return getRepositoryHeadRef(repo).map(Ref::getObjectId).orElse(null);
   }
 
-    if (id == null)
-    {
-      id = repo.resolve(Constants.HEAD);
+  public static Optional<Ref> getRepositoryHeadRef(org.eclipse.jgit.lib.Repository repo) {
+    Optional<Ref> foundRef = findMostAppropriateHead(repo.getAllRefs());
+
+    if (foundRef.isPresent()) {
+      if (logger.isDebugEnabled()) {
+        logger.debug("use {}:{} as repository head for directory {}",
+          foundRef.map(GitUtil::getBranch).orElse(null),
+          foundRef.map(Ref::getObjectId).map(ObjectId::name).orElse(null),
+          repo.getDirectory());
+      }
+    } else {
+      logger.warn("could not find repository head in directory {}", repo.getDirectory());
     }
 
-    if (logger.isDebugEnabled())
-    {
-      if ((head != null) && (id != null))
-      {
-        logger.debug("use {}:{} as repository head", head, id.name());
-      }
-      else if (id != null)
-      {
-        logger.debug("use {} as repository head", id.name());
-      }
-      else
-      {
-        logger.warn("could not find repository head");
-      }
+    return foundRef;
   }
 
-    return id;
+  private static Optional<Ref> findMostAppropriateHead(Map<String, Ref> refs) {
+    Ref refHead = refs.get(REF_HEAD);
+    if (refHead != null && refHead.isSymbolic() && isBranch(refHead.getTarget().getName())) {
+      return of(refHead.getTarget());
+    }
+
+    Ref master = refs.get(REF_HEAD_PREFIX + REF_MASTER);
+    if (master != null) {
+      return of(master);
+    }
+
+    Ref develop = refs.get(REF_HEAD_PREFIX + "develop");
+    if (develop != null) {
+      return of(develop);
+    }
+
+    return refs.entrySet()
+      .stream()
+      .filter(e -> e.getKey().startsWith(REF_HEAD_PREFIX))
+      .map(Map.Entry::getValue)
+      .findFirst();
   }
 
   /**

scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/AbstractGitCommand.java

@@ -34,19 +34,20 @@ package sonia.scm.repository.spi;
 
 //~--- non-JDK imports --------------------------------------------------------
 
-import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Strings;
-import org.eclipse.jgit.lib.Repository;
-
-//~--- JDK imports ------------------------------------------------------------
-
-import java.io.IOException;
 import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.lib.Ref;
+import org.eclipse.jgit.lib.Repository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import sonia.scm.repository.GitConstants;
 import sonia.scm.repository.GitUtil;
 
+import java.io.IOException;
+import java.util.Optional;
+
+//~--- JDK imports ------------------------------------------------------------
+
 /**
  *
  * @author Sebastian Sdorra
@@ -98,26 +99,28 @@ public class AbstractGitCommand
     return commit;
   }
 
-  protected ObjectId getBranchOrDefault(Repository gitRepository, String requestedBranch) throws IOException {
-    ObjectId head;
-    if ( Strings.isNullOrEmpty(requestedBranch) ) {
-      head = getDefaultBranch(gitRepository);
+  protected ObjectId getDefaultBranch(Repository gitRepository) throws IOException {
+    Ref ref = getBranchOrDefault(gitRepository, null);
+    if (ref == null) {
+      return null;
     } else {
-      head = GitUtil.getBranchId(gitRepository, requestedBranch);
+      return ref.getObjectId();
     }
-    return head;
   }
 
-  protected ObjectId getDefaultBranch(Repository gitRepository) throws IOException {
-    ObjectId head;
+  protected Ref getBranchOrDefault(Repository gitRepository, String requestedBranch) throws IOException {
+    if ( Strings.isNullOrEmpty(requestedBranch) ) {
       String defaultBranchName = repository.getProperty(GitConstants.PROPERTY_DEFAULT_BRANCH);
       if (!Strings.isNullOrEmpty(defaultBranchName)) {
-      head = GitUtil.getBranchId(gitRepository, defaultBranchName);
+        return GitUtil.getBranchId(gitRepository, defaultBranchName);
       } else {
         logger.trace("no default branch configured, use repository head as default");
-      head = GitUtil.getRepositoryHead(gitRepository);
+        Optional<Ref> repositoryHeadRef = GitUtil.getRepositoryHeadRef(gitRepository);
+        return repositoryHeadRef.orElse(null);
+      }
+    } else {
+      return GitUtil.getBranchId(gitRepository, requestedBranch);
     }
-    return head;
   }
 
   //~--- fields ---------------------------------------------------------------

scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitLogCommand.java

@@ -39,6 +39,7 @@ import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
 import org.eclipse.jgit.errors.MissingObjectException;
 import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.lib.Ref;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.revwalk.RevCommit;
 import org.eclipse.jgit.revwalk.RevWalk;
@@ -170,8 +171,8 @@ public class GitLogCommand extends AbstractGitCommand implements LogCommand
     GitChangesetConverter converter = null;
     RevWalk revWalk = null;
 
-    try (org.eclipse.jgit.lib.Repository gr = open()) {
-      if (!gr.getAllRefs().isEmpty()) {
+    try (org.eclipse.jgit.lib.Repository repository = open()) {
+      if (!repository.getAllRefs().isEmpty()) {
         int counter = 0;
         int start = request.getPagingStart();
 
@@ -188,18 +189,18 @@ public class GitLogCommand extends AbstractGitCommand implements LogCommand
         ObjectId startId = null;
 
         if (!Strings.isNullOrEmpty(request.getStartChangeset())) {
-          startId = gr.resolve(request.getStartChangeset());
+          startId = repository.resolve(request.getStartChangeset());
         }
 
         ObjectId endId = null;
 
         if (!Strings.isNullOrEmpty(request.getEndChangeset())) {
-          endId = gr.resolve(request.getEndChangeset());
+          endId = repository.resolve(request.getEndChangeset());
         }
 
-        revWalk = new RevWalk(gr);
+        revWalk = new RevWalk(repository);
 
-        converter = new GitChangesetConverter(gr, revWalk);
+        converter = new GitChangesetConverter(repository, revWalk);
 
         if (!Strings.isNullOrEmpty(request.getPath())) {
           revWalk.setTreeFilter(
@@ -207,13 +208,13 @@ public class GitLogCommand extends AbstractGitCommand implements LogCommand
               PathFilter.create(request.getPath()), TreeFilter.ANY_DIFF));
         }
 
-        ObjectId head = getBranchOrDefault(gr, request.getBranch());
+        Ref branch = getBranchOrDefault(repository,request.getBranch());
 
-        if (head != null) {
+        if (branch != null) {
           if (startId != null) {
             revWalk.markStart(revWalk.lookupCommit(startId));
           } else {
-            revWalk.markStart(revWalk.lookupCommit(head));
+            revWalk.markStart(revWalk.lookupCommit(branch.getObjectId()));
           }
 
           Iterator<RevCommit> iterator = revWalk.iterator();
@@ -234,10 +235,14 @@ public class GitLogCommand extends AbstractGitCommand implements LogCommand
           }
         }
 
+        if (branch != null) {
+          changesets = new ChangesetPagingResult(counter, changesetList, GitUtil.getBranch(branch.getName()));
+        } else {
           changesets = new ChangesetPagingResult(counter, changesetList);
+        }
       } else if (logger.isWarnEnabled()) {
         logger.warn("the repository {} seems to be empty",
-          repository.getName());
+          this.repository.getName());
 
         changesets = new ChangesetPagingResult(0, Collections.EMPTY_LIST);
       }

scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitLogCommandTest.java

@@ -1,3 +1,4 @@
+
 /**
  * Copyright (c) 2010, Sebastian Sdorra
  * All rights reserved.
@@ -33,14 +34,17 @@
 
 package sonia.scm.repository.spi;
 
-//~--- non-JDK imports --------------------------------------------------------
-
+import com.google.common.io.Files;
 import org.junit.Test;
 import sonia.scm.repository.Changeset;
 import sonia.scm.repository.ChangesetPagingResult;
 import sonia.scm.repository.GitConstants;
 import sonia.scm.repository.Modifications;
 
+import java.io.File;
+import java.io.IOException;
+
+import static java.nio.charset.Charset.defaultCharset;
 import static org.hamcrest.Matchers.contains;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -48,8 +52,6 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
-//~--- JDK imports ------------------------------------------------------------
-
 /**
  * Unit tests for {@link GitLogCommand}.
  *
@@ -72,6 +74,8 @@ public class GitLogCommandTest extends AbstractGitCommandTestBase
     assertEquals("86a6645eceefe8b9a247db5eb16e3d89a7e6e6d1", result.getChangesets().get(1).getId());
     assertEquals("592d797cd36432e591416e8b2b98154f4f163411", result.getChangesets().get(2).getId());
     assertEquals("435df2f061add3589cb326cc64be9b9c3897ceca", result.getChangesets().get(3).getId());
+    assertEquals("master", result.getBranchName());
+    assertTrue(result.getChangesets().stream().allMatch(r -> r.getBranches().isEmpty()));
 
     // set default branch and fetch again
     repository.setProperty(GitConstants.PROPERTY_DEFAULT_BRANCH, "test-branch");
@@ -79,10 +83,12 @@ public class GitLogCommandTest extends AbstractGitCommandTestBase
     result = createCommand().getChangesets(new LogCommandRequest());
 
     assertNotNull(result);
+    assertEquals("test-branch", result.getBranchName());
     assertEquals(3, result.getTotal());
     assertEquals("3f76a12f08a6ba0dc988c68b7f0b2cd190efc3c4", result.getChangesets().get(0).getId());
     assertEquals("592d797cd36432e591416e8b2b98154f4f163411", result.getChangesets().get(1).getId());
     assertEquals("435df2f061add3589cb326cc64be9b9c3897ceca", result.getChangesets().get(2).getId());
+    assertTrue(result.getChangesets().stream().allMatch(r -> r.getBranches().isEmpty()));
   }
 
   @Test
@@ -210,6 +216,32 @@ public class GitLogCommandTest extends AbstractGitCommandTestBase
     assertEquals("435df2f061add3589cb326cc64be9b9c3897ceca", c2.getId());
   }
 
+  @Test
+  public void shouldFindDefaultBranchFromHEAD() throws Exception {
+    setRepositoryHeadReference("ref: refs/heads/test-branch");
+
+    ChangesetPagingResult changesets = createCommand().getChangesets(new LogCommandRequest());
+
+    assertEquals("test-branch", changesets.getBranchName());
+  }
+
+  @Test
+  public void shouldFindMasterBranchWhenHEADisNoRef() throws Exception {
+    setRepositoryHeadReference("592d797cd36432e591416e8b2b98154f4f163411");
+
+    ChangesetPagingResult changesets = createCommand().getChangesets(new LogCommandRequest());
+
+    assertEquals("master", changesets.getBranchName());
+  }
+
+  private void setRepositoryHeadReference(String s) throws IOException {
+    Files.write(s, repositoryHeadReferenceFile(), defaultCharset());
+  }
+
+  private File repositoryHeadReferenceFile() {
+    return new File(repositoryDirectory, "HEAD");
+  }
+
   private GitLogCommand createCommand()
   {
     return new GitLogCommand(createContext(), repository);

scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgLogCommand.java

@@ -132,7 +132,11 @@ public class HgLogCommand extends AbstractCommand implements LogCommand
         List<Changeset> changesets = on(repository).rev(start + ":"
                                        + end).execute();
 
+        if (request.getBranch() == null) {
           result = new ChangesetPagingResult(total, changesets);
+        } else {
+          result = new ChangesetPagingResult(total, changesets, request.getBranch());
+        }
       }
       else
       {

scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/javahg/AbstractChangesetCommand.java

@@ -216,10 +216,7 @@ public abstract class AbstractChangesetCommand extends AbstractCommand
 
     String branch = in.textUpTo('\n');
 
-    if (!BRANCH_DEFAULT.equals(branch))
-    {
     changeset.getBranches().add(branch);
-    }
 
     String p1 = readId(in, changeset, PROPERTY_PARENT1_REVISION);
 

scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/spi/HgLogCommandTest.java

@@ -88,6 +88,21 @@ public class HgLogCommandTest extends AbstractHgCommandTestBase
       result.getChangesets().get(2).getId());
   }
 
+  @Test
+  public void testGetDefaultBranchInfo() {
+    LogCommandRequest request = new LogCommandRequest();
+
+    request.setPath("a.txt");
+
+    ChangesetPagingResult result = createComamnd().getChangesets(request);
+
+    assertNotNull(result);
+    assertEquals(1,
+      result.getChangesets().get(0).getBranches().size());
+    assertEquals("default",
+      result.getChangesets().get(0).getBranches().get(0));
+  }
+
   @Test
   public void testGetAllWithLimit() {
     LogCommandRequest request = new LogCommandRequest();

scm-ui-components/package.json

@@ -5,7 +5,7 @@
   "scripts": {
     "bootstrap": "lerna bootstrap",
     "link": "lerna exec -- yarn link",
-    "unlink": "lerna exec --no-bail -- yarn unlink"
+    "unlink": "lerna exec --no-bail -- yarn unlink || true"
   },
   "devDependencies": {
     "lerna": "^3.2.1"

scm-ui/src/repos/permissions/containers/Permissions.js

@@ -121,6 +121,7 @@ class Permissions extends React.Component<Props> {
                 {t("permission.group-permission")}
               </th>
               <th>{t("permission.type")}</th>
+              <th />
             </tr>
           </thead>
           <tbody>

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

@@ -0,0 +1,79 @@
+package sonia.scm.api.v2.resources;
+
+import com.webcohesion.enunciate.metadata.rs.ResponseCode;
+import com.webcohesion.enunciate.metadata.rs.StatusCodes;
+import org.hibernate.validator.constraints.NotEmpty;
+import sonia.scm.ReducedModelObject;
+import sonia.scm.group.GroupManager;
+import sonia.scm.user.UserManager;
+import sonia.scm.web.VndMediaType;
+
+import javax.inject.Inject;
+import javax.validation.constraints.Size;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+
+
+@Path(AutoCompleteResource.PATH)
+public class AutoCompleteResource {
+  public static final String PATH = "v2/autocomplete/";
+  public static final int MIN_SEARCHED_CHARS = 2;
+
+  public static final String PARAMETER_IS_REQUIRED = "The parameter is required.";
+  public static final String INVALID_PARAMETER_LENGTH = "Invalid parameter length.";
+
+
+  private ReducedObjectModelToDtoMapper mapper;
+
+  private UserManager userManager;
+  private GroupManager groupManager;
+
+  @Inject
+  public AutoCompleteResource(ReducedObjectModelToDtoMapper mapper, UserManager userManager, GroupManager groupManager) {
+    this.mapper = mapper;
+    this.userManager = userManager;
+    this.groupManager = groupManager;
+  }
+
+  @GET
+  @Path("users")
+  @Produces(VndMediaType.AUTOCOMPLETE)
+  @StatusCodes({
+    @ResponseCode(code = 200, condition = "success"),
+    @ResponseCode(code = 400, condition = "if the searched string contains less than 2 characters"),
+    @ResponseCode(code = 401, condition = "not authenticated / invalid credentials"),
+    @ResponseCode(code = 403, condition = "not authorized, the current user does not have the \"user:autocomplete\" privilege"),
+    @ResponseCode(code = 500, condition = "internal server error")
+  })
+  public List<ReducedObjectModelDto> searchUser(@NotEmpty(message = PARAMETER_IS_REQUIRED) @Size(min = MIN_SEARCHED_CHARS, message = INVALID_PARAMETER_LENGTH) @QueryParam("q") String filter) {
+    return map(userManager.autocomplete(filter));
+  }
+
+  @GET
+  @Path("groups")
+  @Produces(VndMediaType.AUTOCOMPLETE)
+  @StatusCodes({
+    @ResponseCode(code = 200, condition = "success"),
+    @ResponseCode(code = 400, condition = "if the searched string contains less than 2 characters"),
+    @ResponseCode(code = 401, condition = "not authenticated / invalid credentials"),
+    @ResponseCode(code = 403, condition = "not authorized, the current user does not have the \"group:autocomplete\" privilege"),
+    @ResponseCode(code = 500, condition = "internal server error")
+  })
+  public List<ReducedObjectModelDto> searchGroup(@NotEmpty(message = PARAMETER_IS_REQUIRED) @Size(min = MIN_SEARCHED_CHARS, message = INVALID_PARAMETER_LENGTH) @QueryParam("q") String filter) {
+    return map(groupManager.autocomplete(filter));
+  }
+
+  private <T extends ReducedModelObject> List<ReducedObjectModelDto> map(Collection<T> autocomplete) {
+    return autocomplete
+      .stream()
+      .map(mapper::map)
+      .collect(Collectors.toList());
+  }
+
+
+}

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

@@ -12,12 +12,12 @@ public class BranchChangesetCollectionToDtoMapper extends ChangesetCollectionToD
 
   @Inject
   public BranchChangesetCollectionToDtoMapper(ChangesetToChangesetDtoMapper changesetToChangesetDtoMapper, ResourceLinks resourceLinks) {
-    super(changesetToChangesetDtoMapper);
+    super(changesetToChangesetDtoMapper, resourceLinks);
     this.resourceLinks = resourceLinks;
   }
 
   public CollectionDto map(int pageNumber, int pageSize, PageResult<Changeset> pageResult, Repository repository, String branch) {
-    return this.map(pageNumber, pageSize, pageResult, repository, () -> createSelfLink(repository, branch));
+    return this.map(pageNumber, pageSize, pageResult, repository, () -> createSelfLink(repository, branch), branch);
   }
 
   private String createSelfLink(Repository repository, String branch) {

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

@@ -0,0 +1,19 @@
+package sonia.scm.api.v2.resources;
+
+import de.otto.edison.hal.HalRepresentation;
+import de.otto.edison.hal.Links;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@NoArgsConstructor @AllArgsConstructor @Getter @Setter
+public class BranchReferenceDto extends HalRepresentation {
+  private String name;
+
+  @Override
+  @SuppressWarnings("squid:S1185") // We want to have this method available in this package
+  protected HalRepresentation add(Links links) {
+    return super.add(links);
+  }
+}

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

@@ -12,10 +12,13 @@ public class ChangesetCollectionToDtoMapper extends ChangesetCollectionToDtoMapp
 
   @Inject
   public ChangesetCollectionToDtoMapper(ChangesetToChangesetDtoMapper changesetToChangesetDtoMapper, ResourceLinks resourceLinks) {
-    super(changesetToChangesetDtoMapper);
+    super(changesetToChangesetDtoMapper, resourceLinks);
     this.resourceLinks = resourceLinks;
   }
 
+  public CollectionDto map(int pageNumber, int pageSize, PageResult<Changeset> pageResult, Repository repository, String branchName) {
+    return super.map(pageNumber, pageSize, pageResult, repository, () -> createSelfLink(repository), branchName);
+  }
   public CollectionDto map(int pageNumber, int pageSize, PageResult<Changeset> pageResult, Repository repository) {
     return super.map(pageNumber, pageSize, pageResult, repository, () -> createSelfLink(repository));
   }

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

@@ -1,5 +1,6 @@
 package sonia.scm.api.v2.resources;
 
+import de.otto.edison.hal.Links;
 import sonia.scm.PageResult;
 import sonia.scm.repository.Changeset;
 import sonia.scm.repository.Repository;
@@ -10,14 +11,28 @@ import java.util.function.Supplier;
 class ChangesetCollectionToDtoMapperBase extends PagedCollectionToDtoMapper<Changeset, ChangesetDto> {
 
   private final ChangesetToChangesetDtoMapper changesetToChangesetDtoMapper;
+  private final ResourceLinks resourceLinks;
 
-  ChangesetCollectionToDtoMapperBase(ChangesetToChangesetDtoMapper changesetToChangesetDtoMapper) {
+  ChangesetCollectionToDtoMapperBase(ChangesetToChangesetDtoMapper changesetToChangesetDtoMapper, ResourceLinks resourceLinks) {
     super("changesets");
     this.changesetToChangesetDtoMapper = changesetToChangesetDtoMapper;
+    this.resourceLinks = resourceLinks;
   }
 
   CollectionDto map(int pageNumber, int pageSize, PageResult<Changeset> pageResult, Repository repository, Supplier<String> selfLinkSupplier) {
     return super.map(pageNumber, pageSize, pageResult, selfLinkSupplier.get(), Optional.empty(), changeset -> changesetToChangesetDtoMapper.map(changeset, repository));
   }
-}
 
+  CollectionDto map(int pageNumber, int pageSize, PageResult<Changeset> pageResult, Repository repository, Supplier<String> selfLinkSupplier, String branchName) {
+    CollectionDto collectionDto = this.map(pageNumber, pageSize, pageResult, repository, selfLinkSupplier);
+    collectionDto.withEmbedded("branch", createBranchReferenceDto(repository, branchName));
+    return collectionDto;
+  }
+
+  private BranchReferenceDto createBranchReferenceDto(Repository repository, String branchName) {
+    BranchReferenceDto branchReferenceDto = new BranchReferenceDto();
+    branchReferenceDto.setName(branchName);
+    branchReferenceDto.add(Links.linkingTo().self(resourceLinks.branch().self(repository.getNamespaceAndName(), branchName)).build());
+    return branchReferenceDto;
+  }
+}

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

@@ -67,7 +67,11 @@ public class ChangesetRootResource {
         .getChangesets();
       if (changesets != null && changesets.getChangesets() != null) {
         PageResult<Changeset> pageResult = new PageResult<>(changesets.getChangesets(), changesets.getTotal());
+        if (changesets.getBranchName() != null) {
+          return Response.ok(changesetCollectionToDtoMapper.map(page, pageSize, pageResult, repository, changesets.getBranchName())).build();
+        } else {
           return Response.ok(changesetCollectionToDtoMapper.map(page, pageSize, pageResult, repository)).build();
+        }
       } else {
         return Response.ok().build();
       }

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

@@ -15,4 +15,9 @@ class CollectionDto extends HalRepresentation {
   CollectionDto(Links links, Embedded embedded) {
     super(links, embedded);
   }
+
+  @Override
+  protected HalRepresentation withEmbedded(String rel, HalRepresentation embeddedItem) {
+    return super.withEmbedded(rel, embeddedItem);
+  }
 }

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

@@ -13,7 +13,7 @@ public class FileHistoryCollectionToDtoMapper extends ChangesetCollectionToDtoMa
 
   @Inject
   public FileHistoryCollectionToDtoMapper(ChangesetToChangesetDtoMapper changesetToChangesetDtoMapper, ResourceLinks resourceLinks) {
-    super(changesetToChangesetDtoMapper);
+    super(changesetToChangesetDtoMapper, resourceLinks);
     this.resourceLinks = resourceLinks;
   }
 

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

@@ -1,5 +1,7 @@
 package sonia.scm.api.v2.resources;
 
+import com.google.common.collect.Lists;
+import de.otto.edison.hal.Link;
 import de.otto.edison.hal.Links;
 import org.apache.shiro.SecurityUtils;
 import sonia.scm.SCMContextProvider;
@@ -8,6 +10,7 @@ import sonia.scm.group.GroupPermissions;
 import sonia.scm.user.UserPermissions;
 
 import javax.inject.Inject;
+import java.util.List;
 
 import static de.otto.edison.hal.Link.link;
 
@@ -24,6 +27,7 @@ public class IndexDtoGenerator {
 
   public IndexDto generate() {
     Links.Builder builder = Links.linkingTo();
+    List<Link> autoCompleteLinks = Lists.newArrayList();
     builder.self(resourceLinks.index().self());
     builder.single(link("uiPlugins", resourceLinks.uiPluginCollection().self()));
     if (SecurityUtils.getSubject().isAuthenticated()) {
@@ -34,6 +38,13 @@ public class IndexDtoGenerator {
       if (UserPermissions.list().isPermitted()) {
         builder.single(link("users", resourceLinks.userCollection().self()));
       }
+      if (UserPermissions.autocomplete().isPermitted()) {
+        autoCompleteLinks.add(Link.linkBuilder("autocomplete", resourceLinks.autoComplete().users()).withName("users").build());
+      }
+      if (GroupPermissions.autocomplete().isPermitted()) {
+        autoCompleteLinks.add(Link.linkBuilder("autocomplete", resourceLinks.autoComplete().groups()).withName("groups").build());
+      }
+      builder.array(autoCompleteLinks);
       if (GroupPermissions.list().isPermitted()) {
         builder.single(link("groups", resourceLinks.groupCollection().self()));
       }

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

@@ -37,6 +37,8 @@ public class MapperModule extends AbstractModule {
     bind(FileObjectToFileObjectDtoMapper.class).to(Mappers.getMapper(FileObjectToFileObjectDtoMapper.class).getClass());
     bind(ModificationsToDtoMapper.class).to(Mappers.getMapper(ModificationsToDtoMapper.class).getClass());
 
+    bind(ReducedObjectModelToDtoMapper.class).to(Mappers.getMapper(ReducedObjectModelToDtoMapper.class).getClass());
+
     // no mapstruct required
     bind(UIPluginDtoMapper.class);
     bind(UIPluginDtoCollectionMapper.class);

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

@@ -0,0 +1,16 @@
+package sonia.scm.api.v2.resources;
+
+import de.otto.edison.hal.HalRepresentation;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class ReducedObjectModelDto extends HalRepresentation {
+
+  private String id;
+
+  private String displayName;
+}

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

@@ -0,0 +1,13 @@
+package sonia.scm.api.v2.resources;
+
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import sonia.scm.ReducedModelObject;
+
+@Mapper
+public abstract class ReducedObjectModelToDtoMapper {
+
+  @Mapping(target = "attributes", ignore = true) // We do not map HAL attributes
+  public abstract ReducedObjectModelDto map(ReducedModelObject modelObject);
+
+}

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

@@ -142,6 +142,26 @@ class ResourceLinks {
     }
   }
 
+  AutoCompleteLinks autoComplete() {
+    return new AutoCompleteLinks (scmPathInfoStore.get());
+  }
+
+  static class AutoCompleteLinks  {
+    private final LinkBuilder linkBuilder;
+
+    AutoCompleteLinks (ScmPathInfo pathInfo) {
+      linkBuilder = new LinkBuilder(pathInfo, AutoCompleteResource.class);
+    }
+
+    String users() {
+      return linkBuilder.method("searchUser").parameters().href();
+    }
+
+    String groups() {
+      return linkBuilder.method("searchGroup").parameters().href();
+    }
+  }
+
   ConfigLinks config() {
     return new ConfigLinks(scmPathInfoStore.get());
   }

scm-webapp/src/main/java/sonia/scm/group/DefaultGroupManager.java

@@ -242,6 +242,13 @@ public class DefaultGroupManager extends AbstractGroupManager
     return group;
   }
 
+  @Override
+  public Collection<Group> autocomplete(String filter) {
+    GroupPermissions.autocomplete().check();
+    SearchRequest searchRequest = new SearchRequest(filter, true, DEFAULT_LIMIT);
+    return SearchUtil.search(searchRequest, groupDAO.getAll(), group -> matches(searchRequest,group)?group:null);
+  }
+
   /**
    * Method description
    *

scm-webapp/src/main/java/sonia/scm/security/DefaultAuthorizationCollector.java

@@ -52,9 +52,11 @@ import org.slf4j.LoggerFactory;
 import sonia.scm.cache.Cache;
 import sonia.scm.cache.CacheManager;
 import sonia.scm.group.GroupNames;
+import sonia.scm.group.GroupPermissions;
 import sonia.scm.plugin.Extension;
 import sonia.scm.repository.Repository;
 import sonia.scm.repository.RepositoryDAO;
+import sonia.scm.repository.RepositoryPermissions;
 import sonia.scm.user.User;
 import sonia.scm.user.UserPermissions;
 import sonia.scm.util.Util;
@@ -256,6 +258,8 @@ public class DefaultAuthorizationCollector implements AuthorizationCollector
       collectGlobalPermissions(builder, user, groups);
       collectRepositoryPermissions(builder, user, groups);
       builder.add(canReadOwnUser(user));
+      builder.add(getUserAutocompletePermission());
+      builder.add(getGroupAutocompletePermission());
       permissions = builder.build();
     }
 
@@ -264,6 +268,14 @@ public class DefaultAuthorizationCollector implements AuthorizationCollector
     return info;
   }
 
+  private String getGroupAutocompletePermission() {
+    return GroupPermissions.autocomplete().asShiroString();
+  }
+
+  private String getUserAutocompletePermission() {
+    return UserPermissions.autocomplete().asShiroString();
+  }
+
   private String canReadOwnUser(User user) {
     return UserPermissions.read(user.getName()).asShiroString();
   }

scm-webapp/src/main/java/sonia/scm/user/DefaultUserManager.java

@@ -229,6 +229,13 @@ public class DefaultUserManager extends AbstractUserManager
     fresh.copyProperties(user);
   }
 
+  @Override
+  public Collection<User> autocomplete(String filter) {
+    UserPermissions.autocomplete().check();
+    SearchRequest searchRequest = new SearchRequest(filter, true, DEFAULT_LIMIT);
+    return SearchUtil.search(searchRequest, userDAO.getAll(), user -> matches(searchRequest,user)?user:null);
+  }
+
   /**
    * Method description
    *

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

@@ -0,0 +1,263 @@
+package sonia.scm.api.v2.resources;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.sdorra.shiro.ShiroRule;
+import com.github.sdorra.shiro.SubjectAware;
+import org.apache.shiro.util.ThreadContext;
+import org.assertj.core.util.Lists;
+import org.jboss.resteasy.core.Dispatcher;
+import org.jboss.resteasy.mock.MockHttpRequest;
+import org.jboss.resteasy.mock.MockHttpResponse;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+import sonia.scm.Manager;
+import sonia.scm.group.DefaultGroupManager;
+import sonia.scm.group.Group;
+import sonia.scm.group.GroupManager;
+import sonia.scm.group.xml.XmlGroupDAO;
+import sonia.scm.store.ConfigurationStore;
+import sonia.scm.store.ConfigurationStoreFactory;
+import sonia.scm.user.DefaultUserManager;
+import sonia.scm.user.User;
+import sonia.scm.user.UserManager;
+import sonia.scm.user.xml.XmlUserDAO;
+import sonia.scm.web.VndMediaType;
+import sonia.scm.xml.XmlDatabase;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+import static org.mockito.MockitoAnnotations.initMocks;
+import static sonia.scm.api.v2.resources.DispatcherMock.createDispatcher;
+
+@SubjectAware(configuration = "classpath:sonia/scm/shiro-002.ini")
+@RunWith(MockitoJUnitRunner.Silent.class)
+public class AutoCompleteResourceTest {
+
+  @Rule
+  public final ShiroRule shiroRule = new ShiroRule();
+
+  public static final String URL = "/" + AutoCompleteResource.PATH;
+  private final Integer defaultLimit = Manager.DEFAULT_LIMIT;
+  private Dispatcher dispatcher;
+
+  private XmlUserDAO userDao;
+  private XmlGroupDAO groupDao;
+  private XmlDatabase xmlDB;
+  private ObjectMapper jsonObjectMapper = new ObjectMapper();
+
+  @Before
+  public void prepareEnvironment() {
+    initMocks(this);
+    ConfigurationStoreFactory storeFactory = mock(ConfigurationStoreFactory.class);
+    ConfigurationStore<Object> storeConfig = mock(ConfigurationStore.class);
+    xmlDB = mock(XmlDatabase.class);
+    when(storeConfig.get()).thenReturn(xmlDB);
+    when(storeFactory.getStore(any(), any())).thenReturn(storeConfig);
+    XmlUserDAO userDao = new XmlUserDAO(storeFactory);
+    this.userDao = spy(userDao);
+    XmlGroupDAO groupDAO = new XmlGroupDAO(storeFactory);
+    groupDao = spy(groupDAO);
+    ReducedObjectModelToDtoMapperImpl mapper = new ReducedObjectModelToDtoMapperImpl();
+    UserManager userManager = new DefaultUserManager(this.userDao);
+    GroupManager groupManager = new DefaultGroupManager(groupDao);
+    AutoCompleteResource autoCompleteResource = new AutoCompleteResource(mapper, userManager, groupManager);
+    dispatcher = createDispatcher(autoCompleteResource);
+  }
+
+  @After
+  public void cleanupContext() {
+    ThreadContext.unbindSubject();
+  }
+
+  @Test
+  public void shouldGet400IfParameterLengthLessThan2CharsForUserSearch() throws Exception {
+    MockHttpRequest request = MockHttpRequest
+      .get("/" + AutoCompleteResource.PATH + "users?q=a")
+      .contentType(VndMediaType.AUTOCOMPLETE)
+      .accept(VndMediaType.AUTOCOMPLETE);
+    MockHttpResponse response = new MockHttpResponse();
+
+    dispatcher.invoke(request, response);
+
+    assertEquals(400, response.getStatus());
+  }
+
+  @Test
+  @SubjectAware(username = "trillian", password = "secret")
+  public void shouldGet400OnFailedParameterForUserSearch() throws Exception {
+    MockHttpRequest request = MockHttpRequest
+      .get("/" + AutoCompleteResource.PATH + "users")
+      .contentType(VndMediaType.AUTOCOMPLETE)
+      .accept(VndMediaType.AUTOCOMPLETE);
+    MockHttpResponse response = new MockHttpResponse();
+
+    dispatcher.invoke(request, response);
+
+    assertEquals(400, response.getStatus());
+  }
+
+  @Test
+  @SubjectAware(username = "trillian", password = "secret")
+  public void shouldSearchUsers() throws Exception {
+    ArrayList<User> users = Lists.newArrayList(createMockUser("YuCantFindMe", "ha ha"), createMockUser("user1", "User 1"), createMockUser("user2", "User 2"));
+    String searched = "user";
+    when(xmlDB.values()).thenReturn(users);
+    MockHttpRequest request = MockHttpRequest
+      .get("/" + AutoCompleteResource.PATH + "users?q=" + searched)
+      .contentType(VndMediaType.AUTOCOMPLETE)
+      .accept(VndMediaType.AUTOCOMPLETE);
+    MockHttpResponse response = new MockHttpResponse();
+
+    dispatcher.invoke(request, response);
+
+    assertEquals(HttpServletResponse.SC_OK, response.getStatus());
+
+    assertResultSize(response, 2);
+    assertTrue(response.getContentAsString().contains("\"id\":\"user1\""));
+    assertTrue(response.getContentAsString().contains("\"displayName\":\"User 1\""));
+    assertTrue(response.getContentAsString().contains("\"id\":\"user2\""));
+    assertTrue(response.getContentAsString().contains("\"displayName\":\"User 2\""));
+  }
+
+  @Test
+  @SubjectAware(username = "user_without_autocomplete_permission", password = "secret")
+  public void shouldGet403OnAutoCompleteUsers() throws Exception {
+    MockHttpRequest request = MockHttpRequest
+      .get("/" + AutoCompleteResource.PATH + "users?q=user" )
+      .contentType(VndMediaType.AUTOCOMPLETE)
+      .accept(VndMediaType.AUTOCOMPLETE);
+    MockHttpResponse response = new MockHttpResponse();
+
+    dispatcher.invoke(request, response);
+
+    assertEquals(HttpServletResponse.SC_FORBIDDEN, response.getStatus());
+  }
+
+
+  @Test
+  @SubjectAware(username = "trillian", password = "secret")
+  public void shouldSearchUsersWithDefaultLimitLength() throws Exception {
+    List<User> userList = IntStream.range(0, 10).boxed().map(i -> createMockUser("user" + i, "User " + i)).collect(Collectors.toList());
+    when(xmlDB.values()).thenReturn(userList);
+    MockHttpRequest request = MockHttpRequest
+      .get("/" + AutoCompleteResource.PATH + "users?q=user")
+      .contentType(VndMediaType.AUTOCOMPLETE)
+      .accept(VndMediaType.AUTOCOMPLETE);
+    MockHttpResponse response = new MockHttpResponse();
+
+    dispatcher.invoke(request, response);
+
+    assertEquals(HttpServletResponse.SC_OK, response.getStatus());
+    assertResultSize(response, defaultLimit);
+  }
+
+  @Test
+  @SubjectAware(username = "trillian", password = "secret")
+  public void shouldGet400OnFailedParameterForGroupSearch() throws Exception {
+    MockHttpRequest request = MockHttpRequest
+      .get("/" + AutoCompleteResource.PATH + "groups")
+      .contentType(VndMediaType.AUTOCOMPLETE)
+      .accept(VndMediaType.AUTOCOMPLETE);
+    MockHttpResponse response = new MockHttpResponse();
+
+    dispatcher.invoke(request, response);
+
+    assertEquals(400, response.getStatus());
+  }
+
+  @Test
+  @SubjectAware(username = "trillian", password = "secret")
+  public void shouldGet400IfParameterLengthLessThan2CharsForGroupSearch() throws Exception {
+    MockHttpRequest request = MockHttpRequest
+      .get("/" + AutoCompleteResource.PATH + "groups?q=a")
+      .contentType(VndMediaType.AUTOCOMPLETE)
+      .accept(VndMediaType.AUTOCOMPLETE);
+    MockHttpResponse response = new MockHttpResponse();
+
+    dispatcher.invoke(request, response);
+
+    assertEquals(400, response.getStatus());
+  }
+
+  @Test
+  @SubjectAware(username = "trillian", password = "secret")
+  public void shouldSearchGroups() throws Exception {
+    ArrayList<Group> groups = Lists.newArrayList(createMockGroup("YuCantFindMe"), createMockGroup("group_1"), createMockGroup("group_2"));
+    String searched = "group";
+    when(xmlDB.values()).thenReturn(groups);
+    MockHttpRequest request = MockHttpRequest
+      .get("/" + AutoCompleteResource.PATH + "groups?q=" + searched)
+      .contentType(VndMediaType.AUTOCOMPLETE)
+      .accept(VndMediaType.AUTOCOMPLETE);
+    MockHttpResponse response = new MockHttpResponse();
+
+    dispatcher.invoke(request, response);
+
+    assertEquals(HttpServletResponse.SC_OK, response.getStatus());
+    assertResultSize(response, 2);
+    assertTrue(response.getContentAsString().contains("\"id\":\"group_1\""));
+    assertTrue(response.getContentAsString().contains("\"displayName\":\"group_1\""));
+    assertTrue(response.getContentAsString().contains("\"id\":\"group_2\""));
+    assertTrue(response.getContentAsString().contains("\"displayName\":\"group_2\""));
+  }
+
+  @Test
+  @SubjectAware(username = "user_without_autocomplete_permission", password = "secret")
+  public void shouldGet403OnAutoCompleteGroups() throws Exception {
+    MockHttpRequest request = MockHttpRequest
+      .get("/" + AutoCompleteResource.PATH + "groups?q=user" )
+      .contentType(VndMediaType.AUTOCOMPLETE)
+      .accept(VndMediaType.AUTOCOMPLETE);
+    MockHttpResponse response = new MockHttpResponse();
+
+    dispatcher.invoke(request, response);
+
+    assertEquals(HttpServletResponse.SC_FORBIDDEN, response.getStatus());
+  }
+
+  @Test
+  @SubjectAware(username = "trillian", password = "secret")
+  public void shouldSearchGroupsWithDefaultLimitLength() throws Exception {
+    List<Group> groups = IntStream.range(0, 10).boxed().map(i -> createMockGroup("group_" + i)).collect(Collectors.toList());
+    when(xmlDB.values()).thenReturn(groups);
+    MockHttpRequest request = MockHttpRequest
+      .get("/" + AutoCompleteResource.PATH + "groups?q=group")
+      .contentType(VndMediaType.AUTOCOMPLETE)
+      .accept(VndMediaType.AUTOCOMPLETE);
+    MockHttpResponse response = new MockHttpResponse();
+
+    dispatcher.invoke(request, response);
+
+    assertEquals(HttpServletResponse.SC_OK, response.getStatus());
+    assertResultSize(response, defaultLimit);
+  }
+
+  private User createMockUser(String id, String name) {
+    return new User(id, name, "em@l.de");
+  }
+
+  private Group createMockGroup(String name) {
+    Group group = new Group("type", name);
+    group.setDescription(name);
+    return group;
+  }
+
+  private void assertResultSize(MockHttpResponse response, int size) throws java.io.IOException {
+    ReducedObjectModelDto[] reducedObjectModelDtos = jsonObjectMapper.readValue(response.getContentAsString(), ReducedObjectModelDto[].class);
+    assertEquals(reducedObjectModelDtos.length, size);
+  }
+}

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

@@ -0,0 +1,61 @@
+package sonia.scm.api.v2.resources;
+
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
+import sonia.scm.PageResult;
+import sonia.scm.repository.Changeset;
+import sonia.scm.repository.Repository;
+
+import java.net.URI;
+
+import static java.util.Arrays.asList;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+public class ChangesetCollectionToDtoMapperTest {
+
+  public static final Repository REPOSITORY = new Repository("", "git", "space", "name");
+  public static final Changeset CHANGESET = new Changeset();
+  private final ChangesetToChangesetDtoMapper changesetToChangesetDtoMapper = mock(ChangesetToChangesetDtoMapper.class);
+
+  private final ChangesetCollectionToDtoMapper changesetCollectionToDtoMapper = new ChangesetCollectionToDtoMapper(changesetToChangesetDtoMapper, ResourceLinksMock.createMock(URI.create("/")));
+
+  @Test
+  public void shouldMapCollectionEntries() {
+    ChangesetDto expectedChangesetDto = new ChangesetDto();
+    when(changesetToChangesetDtoMapper.map(CHANGESET, REPOSITORY)).thenReturn(expectedChangesetDto);
+
+    CollectionDto collectionDto = changesetCollectionToDtoMapper.map(0, 1, new PageResult<>(asList(CHANGESET), 1), REPOSITORY);
+
+    assertThat(collectionDto.getEmbedded().hasItem("changesets")).isTrue();
+    assertThat(collectionDto.getEmbedded().getItemsBy("changesets")).containsExactly(expectedChangesetDto);
+    assertThat(collectionDto.getEmbedded().hasItem("branch")).isFalse();
+  }
+
+  @Test
+  public void shouldNotEmbedBranchIfNotSpecified() {
+    ChangesetDto expectedChangesetDto = new ChangesetDto();
+    when(changesetToChangesetDtoMapper.map(CHANGESET, REPOSITORY)).thenReturn(expectedChangesetDto);
+
+    CollectionDto collectionDto = changesetCollectionToDtoMapper.map(0, 1, new PageResult<>(asList(CHANGESET), 1), REPOSITORY);
+
+    assertThat(collectionDto.getEmbedded().hasItem("branch")).isFalse();
+  }
+
+  @Test
+  public void shouldEmbedBranchIfSpecified() {
+    ChangesetDto expectedChangesetDto = new ChangesetDto();
+    when(changesetToChangesetDtoMapper.map(CHANGESET, REPOSITORY)).thenReturn(expectedChangesetDto);
+
+    CollectionDto collectionDto = changesetCollectionToDtoMapper.map(0, 1, new PageResult<>(asList(CHANGESET), 1), REPOSITORY, "someBranch");
+
+    assertThat(collectionDto.getEmbedded().hasItem("branch")).isTrue();
+    assertThat(collectionDto.getEmbedded().getItemsBy("branch"))
+      .hasSize(1)
+      .first().matches(b -> b.getLinks().getLinkBy("self").isPresent())
+      .extracting(b -> b.getLinks().getLinkBy("self").get().getHref()).first().isEqualTo("/v2/repositories/space/name/branches/someBranch");
+    assertThat(collectionDto.getEmbedded().getItemsBy("branch"))
+      .first().extracting("name").first().isEqualTo("someBranch");
+  }
+}

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

@@ -13,7 +13,7 @@ import java.util.Optional;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-@SubjectAware(configuration = "classpath:sonia/scm/shiro-001.ini")
+@SubjectAware(configuration = "classpath:sonia/scm/shiro-002.ini")
 public class IndexResourceTest {
 
   @Rule
@@ -94,6 +94,26 @@ public class IndexResourceTest {
     Assertions.assertThat(index.getLinks().getLinkBy("config")).matches(o -> !o.isPresent());
   }
 
+  @Test
+  @SubjectAware(username = "trillian", password = "secret")
+  public void shouldRenderAutoCompleteLinks() {
+    IndexDto index = indexResource.getIndex();
+
+    Assertions.assertThat(index.getLinks().getLinksBy("autocomplete"))
+      .extracting("name")
+      .containsExactlyInAnyOrder("users", "groups");
+  }
+
+  @Test
+  @SubjectAware(username = "user_without_autocomplete_permission", password = "secret")
+  public void userWithoutAutocompletePermissionShouldNotSeeAutoCompleteLinks() {
+    IndexDto index = indexResource.getIndex();
+
+    Assertions.assertThat(index.getLinks().getLinksBy("autocomplete"))
+      .extracting("name")
+      .doesNotContainSequence("users", "groups");
+  }
+
   @Test
   @SubjectAware(username = "dent", password = "secret")
   public void shouldRenderAdminLinksIfAuthorized() {

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

@@ -16,6 +16,7 @@ public class ResourceLinksMock {
     when(resourceLinks.user()).thenReturn(userLinks);
     when(resourceLinks.me()).thenReturn(new ResourceLinks.MeLinks(uriInfo,userLinks));
     when(resourceLinks.userCollection()).thenReturn(new ResourceLinks.UserCollectionLinks(uriInfo));
+    when(resourceLinks.autoComplete()).thenReturn(new ResourceLinks.AutoCompleteLinks(uriInfo));
     when(resourceLinks.group()).thenReturn(new ResourceLinks.GroupLinks(uriInfo));
     when(resourceLinks.groupCollection()).thenReturn(new ResourceLinks.GroupCollectionLinks(uriInfo));
     when(resourceLinks.repository()).thenReturn(new ResourceLinks.RepositoryLinks(uriInfo));

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

@@ -23,7 +23,6 @@ import javax.servlet.http.HttpServletResponse;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
-import java.text.MessageFormat;
 
 import static java.util.Collections.singletonList;
 import static org.junit.Assert.assertEquals;

scm-webapp/src/test/java/sonia/scm/security/DefaultAuthorizationCollectorTest.java

@@ -161,8 +161,8 @@ public class DefaultAuthorizationCollectorTest {
     
     AuthorizationInfo authInfo = collector.collect();
     assertThat(authInfo.getRoles(), Matchers.contains(Role.USER));
-    assertThat(authInfo.getStringPermissions(), hasSize(1));
-    assertThat(authInfo.getStringPermissions(), contains("user:read:trillian"));
+    assertThat(authInfo.getStringPermissions(), hasSize(3));
+    assertThat(authInfo.getStringPermissions(), containsInAnyOrder("user:autocomplete", "group:autocomplete", "user:read:trillian"));
     assertThat(authInfo.getObjectPermissions(), nullValue());
   }
   
@@ -209,7 +209,7 @@ public class DefaultAuthorizationCollectorTest {
     AuthorizationInfo authInfo = collector.collect();
     assertThat(authInfo.getRoles(), Matchers.containsInAnyOrder(Role.USER));
     assertThat(authInfo.getObjectPermissions(), nullValue());
-    assertThat(authInfo.getStringPermissions(), containsInAnyOrder("repository:read,pull:one", "repository:read,pull,push:two", "user:read:trillian"));
+    assertThat(authInfo.getStringPermissions(), containsInAnyOrder("user:autocomplete", "group:autocomplete", "repository:read,pull:one", "repository:read,pull,push:two", "user:read:trillian"));
   }
   
   /**
@@ -230,7 +230,7 @@ public class DefaultAuthorizationCollectorTest {
     AuthorizationInfo authInfo = collector.collect();
     assertThat(authInfo.getRoles(), Matchers.containsInAnyOrder(Role.USER));
     assertThat(authInfo.getObjectPermissions(), nullValue());
-    assertThat(authInfo.getStringPermissions(), containsInAnyOrder("one:one", "two:two", "user:read:trillian"));
+    assertThat(authInfo.getStringPermissions(), containsInAnyOrder("one:one", "two:two", "user:read:trillian", "user:autocomplete" , "group:autocomplete" ));
   }
   
   private void authenticate(User user, String group, String... groups) {

scm-webapp/src/test/resources/sonia/scm/shiro-002.ini

@@ -0,0 +1,9 @@
+[users]
+user_without_autocomplete_permission = secret
+trillian = secret, user_ac, group_ac
+dent = secret, admin
+
+[roles]
+admin = *
+user_ac = user:autocomplete
+group_ac = group:autocomplete