Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-05-07 21:36:43 +02:00
Code Issues Packages Projects Releases Activity

Merged branch feature/branches_v2_endpoint

Browse Source
This commit is contained in:
Philipp Czora
2018-08-09 11:53:45 +02:00
parent 978ca63ecb efc72b21ec
commit 0199b2ccfb
83 changed files with 594 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
scm-core/src/main/java/sonia/scm/repository/api/BranchesCommandBuilder.java
View File

@@ -29,16 +29,11 @@
*
*/
package sonia.scm.repository.api;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.Objects;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sonia.scm.cache.Cache;
import sonia.scm.cache.CacheManager;
import sonia.scm.repository.Branch;
@@ -49,10 +44,9 @@ import sonia.scm.repository.RepositoryException;
import sonia.scm.repository.spi.BlameCommand;
import sonia.scm.repository.spi.BranchesCommand;
//~--- JDK imports ------------------------------------------------------------
import java.io.IOException;
/**
* The branches command list all repository branches.<br />
* <br />
@@ -139,10 +133,7 @@ public final class BranchesCommandBuilder
branches = getBranchesFromCommand();
if (branches != null)
{
cache.put(key, branches);
}
cache.put(key, branches);
}
else if (logger.isDebugEnabled())
{

2
scm-core/src/main/java/sonia/scm/web/VndMediaType.java
View File

@@ -16,9 +16,11 @@ public class VndMediaType {
public static final String USER = PREFIX + "user" + SUFFIX;
public static final String GROUP = PREFIX + "group" + SUFFIX;
public static final String REPOSITORY = PREFIX + "repository" + SUFFIX;
public static final String BRANCH = PREFIX + "branch" + SUFFIX;
public static final String USER_COLLECTION = PREFIX + "userCollection" + SUFFIX;
public static final String GROUP_COLLECTION = PREFIX + "groupCollection" + SUFFIX;
public static final String REPOSITORY_COLLECTION = PREFIX + "repositoryCollection" + SUFFIX;
public static final String BRANCH_COLLECTION = PREFIX + "branchCollection" + SUFFIX;
public static final String CONFIG = PREFIX + "config" + SUFFIX;
public static final String REPOSITORY_TYPE_COLLECTION = PREFIX + "repositoryTypeCollection" + SUFFIX;
public static final String REPOSITORY_TYPE = PREFIX + "repositoryType" + SUFFIX;