opendev/gerrit
Code Issues Proposed changes

Add REST endpoint for commit included in

Browse Source 
+ API and acceptance tests for {Change,Commit}IncludedIn

Change-Id: I5000cc90b8f0457e2b7594e86e9165f1a6cb8aa5
This commit is contained in:
Gustaf Lundh
2016-10-19 23:19:08 +02:00
committed by David Pursehouse
parent 0fd8d6c208
commit 1386d59c01
13 changed files with 340 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
gerrit-server/src/main/java/com/google/gerrit/server/change/IncludedIn.java
View File

@@ -16,20 +16,15 @@ package com.google.gerrit.server.change;
import com.google.common.collect.ListMultimap;
import com.google.common.collect.MultimapBuilder;
import com.google.gerrit.extensions.api.changes.IncludedInInfo;
import com.google.gerrit.extensions.config.ExternalIncludedIn;
import com.google.gerrit.extensions.registration.DynamicSet;
import com.google.gerrit.extensions.restapi.BadRequestException;
import com.google.gerrit.extensions.restapi.ResourceConflictException;
import com.google.gerrit.extensions.restapi.RestReadView;
import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.gerrit.extensions.restapi.RestApiException;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.PatchSetUtil;
import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.gerrit.server.project.ChangeControl;
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
import org.eclipse.jgit.errors.IncorrectObjectTypeException;
@@ -40,40 +35,27 @@ import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevWalk;
import java.io.IOException;
import java.util.Collection;
import java.util.Map;
@Singleton
class IncludedIn implements RestReadView<ChangeResource> {
private final Provider<ReviewDb> db;
public class IncludedIn {
private final GitRepositoryManager repoManager;
private final PatchSetUtil psUtil;
private final DynamicSet<ExternalIncludedIn> includedIn;
private final DynamicSet<ExternalIncludedIn> externalIncludedIn;
@Inject
IncludedIn(Provider<ReviewDb> db,
GitRepositoryManager repoManager,
PatchSetUtil psUtil,
DynamicSet<ExternalIncludedIn> includedIn) {
this.db = db;
IncludedIn(GitRepositoryManager repoManager,
DynamicSet<ExternalIncludedIn> externalIncludedIn) {
this.repoManager = repoManager;
this.psUtil = psUtil;
this.includedIn = includedIn;
this.externalIncludedIn = externalIncludedIn;
}
@Override
public IncludedInInfo apply(ChangeResource rsrc) throws BadRequestException,
ResourceConflictException, OrmException, IOException {
ChangeControl ctl = rsrc.getControl();
PatchSet ps = psUtil.current(db.get(), rsrc.getNotes());
Project.NameKey project = ctl.getProject().getNameKey();
public IncludedInInfo apply(Project.NameKey project, String revisionId)
throws RestApiException, IOException {
try (Repository r = repoManager.openRepository(project);
RevWalk rw = new RevWalk(r)) {
rw.setRetainBody(false);
RevCommit rev;
try {
rev = rw.parseCommit(ObjectId.fromString(ps.getRevision().get()));
rev = rw.parseCommit(ObjectId.fromString(revisionId));
} catch (IncorrectObjectTypeException err) {
throw new BadRequestException(err.getMessage());
} catch (MissingObjectException err) {
@@ -83,27 +65,15 @@ class IncludedIn implements RestReadView<ChangeResource> {
IncludedInResolver.Result d = IncludedInResolver.resolve(r, rw, rev);
ListMultimap<String, String> external =
MultimapBuilder.hashKeys().arrayListValues().build();
for (ExternalIncludedIn ext : includedIn) {
for (ExternalIncludedIn ext : externalIncludedIn) {
ListMultimap<String, String> extIncludedIns = ext.getIncludedIn(
project.get(), rev.name(), d.getTags(), d.getBranches());
if (extIncludedIns != null) {
external.putAll(extIncludedIns);
}
}
return new IncludedInInfo(d,
return new IncludedInInfo(d.getBranches(), d.getTags(),
(!external.isEmpty() ? external.asMap() : null));
}
}
static class IncludedInInfo {
Collection<String> branches;
Collection<String> tags;
Map<String, Collection<String>> external;
IncludedInInfo(IncludedInResolver.Result in, Map<String, Collection<String>> e) {
branches = in.getBranches();
tags = in.getTags();
external = e;
}
}
}