diff options
Diffstat (limited to 'gerrit-server/src/main/java/com/google/gerrit/server/project/BranchResource.java')
-rw-r--r-- | gerrit-server/src/main/java/com/google/gerrit/server/project/BranchResource.java | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/BranchResource.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/BranchResource.java index db239679e1..2e81af3f15 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/BranchResource.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/BranchResource.java @@ -14,37 +14,35 @@ package com.google.gerrit.server.project; -import com.google.gerrit.extensions.api.projects.BranchInfo; import com.google.gerrit.extensions.restapi.RestView; import com.google.gerrit.reviewdb.client.Branch; import com.google.inject.TypeLiteral; +import org.eclipse.jgit.lib.Ref; public class BranchResource extends RefResource { public static final TypeLiteral<RestView<BranchResource>> BRANCH_KIND = new TypeLiteral<RestView<BranchResource>>() {}; - private final BranchInfo branchInfo; + private final String refName; + private final String revision; - public BranchResource(ProjectControl control, BranchInfo branchInfo) { + public BranchResource(ProjectControl control, Ref ref) { super(control); - this.branchInfo = branchInfo; - } - - public BranchInfo getBranchInfo() { - return branchInfo; + this.refName = ref.getName(); + this.revision = ref.getObjectId() != null ? ref.getObjectId().name() : null; } public Branch.NameKey getBranchKey() { - return new Branch.NameKey(getNameKey(), branchInfo.ref); + return new Branch.NameKey(getNameKey(), refName); } @Override public String getRef() { - return branchInfo.ref; + return refName; } @Override public String getRevision() { - return branchInfo.revision; + return revision; } } |