Skip to content

Commit ab66f12

Browse files
alcroitoalcroito
committed
Port plugin core functionality to Gerrit v3.1.4 API
Change-Id: I1c8aa86dbc86ff6fd91075b239e888a704179b5b Reviewed-by: Jukka Jokiniva <[email protected]>
1 parent 96c094f commit ab66f12

18 files changed

+193
-189
lines changed

‎src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtAbandon.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88
import com.google.gerrit.extensions.api.changes.AbandonInput;
99
import com.google.gerrit.extensions.common.ChangeInfo;
1010
import com.google.gerrit.extensions.restapi.ResourceConflictException;
11+
import com.google.gerrit.extensions.restapi.Response;
1112
import com.google.gerrit.extensions.restapi.RestApiException;
1213
import com.google.gerrit.extensions.webui.UiAction;
13-
import com.google.gerrit.reviewdb.client.Change;
14+
import com.google.gerrit.entities.Change;
1415
import com.google.gerrit.server.ChangeMessagesUtil;
1516
import com.google.gerrit.server.ChangeUtil;
1617
import com.google.gerrit.server.PatchSetUtil;
@@ -52,7 +53,7 @@ public class QtAbandon extends RetryingRestModifyView<ChangeResource, AbandonInp
5253
}
5354

5455
@Override
55-
protected ChangeInfo applyImpl(
56+
protected Response<ChangeInfo> applyImpl(
5657
BatchUpdate.Factory updateFactory, ChangeResource rsrc, AbandonInput input)
5758
throws RestApiException, UpdateException, PermissionBackendException, IOException {
5859
Change change = rsrc.getChange();
@@ -85,7 +86,7 @@ protected ChangeInfo applyImpl(
8586
logger.atInfo().log("qtcodereview: abandoned %s", change);
8687

8788
change = op.getChange();
88-
return json.noOptions().format(change);
89+
return Response.ok(json.noOptions().format(change));
8990
}
9091

9192
@Override

‎src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtBuildFailedSender.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
package com.googlesource.gerrit.plugins.qtcodereview;
66

77
import com.google.gerrit.exceptions.EmailException;
8-
import com.google.gerrit.reviewdb.client.Change;
9-
import com.google.gerrit.reviewdb.client.Project;
8+
import com.google.gerrit.entities.Change;
9+
import com.google.gerrit.entities.Project;
1010
import com.google.gerrit.server.account.ProjectWatches.NotifyType;
1111
import com.google.gerrit.server.mail.send.EmailArguments;
1212
import com.google.gerrit.server.mail.send.ReplyToChangeSender;

‎src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtChangeMessageModifier.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
package com.googlesource.gerrit.plugins.qtcodereview;
66

7-
import com.google.gerrit.reviewdb.client.Branch;
7+
import com.google.gerrit.entities.BranchNameKey;
88
import com.google.gerrit.server.git.ChangeMessageModifier;
99
import com.google.inject.Singleton;
1010
import org.eclipse.jgit.revwalk.RevCommit;
@@ -15,7 +15,7 @@ public class QtChangeMessageModifier implements ChangeMessageModifier {
1515
// Remove extra commit message footers
1616
@Override
1717
public String onSubmit(
18-
String commitMessage, RevCommit original, RevCommit mergeTip, Branch.NameKey destination) {
18+
String commitMessage, RevCommit original, RevCommit mergeTip, BranchNameKey destination) {
1919
StringBuilder stringBuilder = new StringBuilder("");
2020
String[] lines = commitMessage.split("\n");
2121

‎src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtChangeStagedEvent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package com.googlesource.gerrit.plugins.qtcodereview;
66

77
import com.google.common.base.Supplier;
8-
import com.google.gerrit.reviewdb.client.Change;
8+
import com.google.gerrit.entities.Change;
99
import com.google.gerrit.server.data.AccountAttribute;
1010
import com.google.gerrit.server.events.PatchSetEvent;
1111

‎src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtChangeUnStagedEvent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package com.googlesource.gerrit.plugins.qtcodereview;
66

77
import com.google.common.base.Supplier;
8-
import com.google.gerrit.reviewdb.client.Change;
8+
import com.google.gerrit.entities.Change;
99
import com.google.gerrit.server.data.AccountAttribute;
1010
import com.google.gerrit.server.events.PatchSetEvent;
1111

‎src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtChangeUpdateOp.java

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
import com.google.common.flogger.FluentLogger;
1111
import com.google.gerrit.common.Nullable;
1212
import com.google.gerrit.extensions.restapi.ResourceConflictException;
13-
import com.google.gerrit.reviewdb.client.Change;
14-
import com.google.gerrit.reviewdb.client.ChangeMessage;
15-
import com.google.gerrit.reviewdb.client.LabelId;
16-
import com.google.gerrit.reviewdb.client.PatchSet;
17-
import com.google.gerrit.reviewdb.client.PatchSetApproval;
13+
import com.google.gerrit.entities.Change;
14+
import com.google.gerrit.entities.ChangeMessage;
15+
import com.google.gerrit.entities.LabelId;
16+
import com.google.gerrit.entities.PatchSet;
17+
import com.google.gerrit.entities.PatchSetApproval;
1818
import com.google.gerrit.server.ApprovalsUtil;
1919
import com.google.gerrit.server.ChangeMessagesUtil;
2020
import com.google.gerrit.server.change.LabelNormalizer;
@@ -139,57 +139,57 @@ private LabelNormalizer.Result approve(ChangeContext ctx, ChangeUpdate update)
139139
for (PatchSetApproval psa :
140140
approvalsUtil.byPatchSet(
141141
ctx.getNotes(), psId, ctx.getRevWalk(), ctx.getRepoView().getConfig())) {
142-
byKey.put(psa.getKey(), psa);
142+
byKey.put(psa.key(), psa);
143143
}
144144

145145
submitter =
146-
ApprovalsUtil.newApproval(psId, ctx.getUser(), LabelId.legacySubmit(), 1, ctx.getWhen());
147-
byKey.put(submitter.getKey(), submitter);
146+
ApprovalsUtil.newApproval(psId, ctx.getUser(), LabelId.legacySubmit(), 1, ctx.getWhen()).build();
147+
byKey.put(submitter.key(), submitter);
148148

149149
LabelNormalizer.Result normalized = labelNormalizer.normalize(ctx.getNotes(), byKey.values());
150-
update.putApproval(submitter.getLabel(), submitter.getValue());
150+
update.putApproval(submitter.label(), submitter.value());
151151
saveApprovals(normalized, update, false);
152152
return normalized;
153153
}
154154

155155
private void saveApprovals(
156156
LabelNormalizer.Result normalized, ChangeUpdate update, boolean includeUnchanged) {
157157
for (PatchSetApproval psa : normalized.updated()) {
158-
update.putApprovalFor(psa.getAccountId(), psa.getLabel(), psa.getValue());
158+
update.putApprovalFor(psa.accountId(), psa.label(), psa.value());
159159
}
160160
for (PatchSetApproval psa : normalized.deleted()) {
161-
update.removeApprovalFor(psa.getAccountId(), psa.getLabel());
161+
update.removeApprovalFor(psa.accountId(), psa.label());
162162
}
163163

164164
for (PatchSetApproval psa : normalized.unchanged()) {
165165
if (includeUnchanged || psa.isLegacySubmit()) {
166166
logger.atFine().log("Adding submit label %s", psa);
167-
update.putApprovalFor(psa.getAccountId(), psa.getLabel(), psa.getValue());
167+
update.putApprovalFor(psa.accountId(), psa.label(), psa.value());
168168
}
169169
}
170170
}
171171

172172
private Function<PatchSetApproval, PatchSetApproval> convertPatchSet(final PatchSet.Id psId) {
173173
return psa -> {
174-
if (psa.getPatchSetId().equals(psId)) {
174+
if (psa.patchSetId().equals(psId)) {
175175
return psa;
176176
}
177-
return new PatchSetApproval(psId, psa);
177+
return psa.copyWithPatchSet(psId);
178178
};
179179
}
180180

181-
private Iterable<PatchSetApproval> convertPatchSet(
182-
Iterable<PatchSetApproval> approvals, PatchSet.Id psId) {
183-
return Iterables.transform(approvals, convertPatchSet(psId));
184-
}
185-
186-
private Iterable<PatchSetApproval> zero(Iterable<PatchSetApproval> approvals) {
187-
return Iterables.transform(
188-
approvals,
189-
a -> {
190-
PatchSetApproval copy = new PatchSetApproval(a.getPatchSetId(), a);
191-
copy.setValue((short) 0);
192-
return copy;
193-
});
194-
}
181+
// private Iterable<PatchSetApproval> convertPatchSet(
182+
// Iterable<PatchSetApproval> approvals, PatchSet.Id psId) {
183+
// return Iterables.transform(approvals, convertPatchSet(psId));
184+
// }
185+
//
186+
// private Iterable<PatchSetApproval> zero(Iterable<PatchSetApproval> approvals) {
187+
// return Iterables.transform(
188+
// approvals,
189+
// a -> {
190+
// PatchSetApproval copy = new PatchSetApproval(a.getPatchSetId(), a);
191+
// copy.setValue((short) 0);
192+
// return copy;
193+
// });
194+
// }
195195
}

‎src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCherryPickPatch.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
package com.googlesource.gerrit.plugins.qtcodereview;
66

77
import com.google.common.flogger.FluentLogger;
8-
import com.google.gerrit.reviewdb.client.Change;
9-
import com.google.gerrit.reviewdb.client.Project;
8+
import com.google.gerrit.entities.Change;
9+
import com.google.gerrit.entities.Project;
1010
import com.google.gerrit.server.IdentifiedUser;
1111
import com.google.gerrit.server.git.CodeReviewCommit;
1212
import com.google.gerrit.server.git.CodeReviewCommit.CodeReviewRevWalk;
@@ -100,7 +100,7 @@ public CodeReviewCommit cherryPickPatch(
100100
PersonIdent committerIdent =
101101
new PersonIdent(commitToCherryPick.getCommitterIdent(), new Date());
102102

103-
commitToCherryPick.setPatchsetId(changeData.currentPatchSet().getId());
103+
commitToCherryPick.setPatchsetId(changeData.currentPatchSet().id());
104104
commitToCherryPick.setNotes(changeData.notes());
105105

106106
CodeReviewCommit cherryPickCommit;

‎src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandAdminChangeStatus.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import com.google.gerrit.common.data.GlobalCapability;
99
import com.google.gerrit.extensions.annotations.RequiresCapability;
1010
import com.google.gerrit.extensions.restapi.RestApiException;
11-
import com.google.gerrit.reviewdb.client.Change;
12-
import com.google.gerrit.reviewdb.client.Project;
11+
import com.google.gerrit.entities.Change;
12+
import com.google.gerrit.entities.Project;
1313
import com.google.gerrit.server.query.change.ChangeData;
1414
import com.google.gerrit.server.query.change.InternalChangeQuery;
1515
import com.google.gerrit.server.update.BatchUpdate;

‎src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandBuildApprove.java

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
import com.google.gerrit.extensions.restapi.AuthException;
99
import com.google.gerrit.extensions.restapi.BadRequestException;
1010
import com.google.gerrit.extensions.restapi.RestApiException;
11-
import com.google.gerrit.reviewdb.client.Branch;
12-
import com.google.gerrit.reviewdb.client.Change;
13-
import com.google.gerrit.reviewdb.client.PatchSet;
14-
import com.google.gerrit.reviewdb.client.Project;
11+
import com.google.gerrit.entities.BranchNameKey;
12+
import com.google.gerrit.entities.Change;
13+
import com.google.gerrit.entities.PatchSet;
14+
import com.google.gerrit.entities.Project;
1515
import com.google.gerrit.server.ChangeMessagesUtil;
1616
import com.google.gerrit.server.ChangeUtil;
1717
import com.google.gerrit.server.change.PatchSetInserter;
@@ -130,10 +130,10 @@ class QtCommandBuildApprove extends SshCommand {
130130
private static final String STDIN_MESSAGE = "-";
131131

132132
private Project.NameKey projectKey;
133-
private Branch.NameKey buildBranchKey;
134-
private Branch.NameKey destBranchKey;
135-
private Branch.NameKey stagingBranchKey;
136-
private Branch.NameKey destBranchShortKey;
133+
private BranchNameKey buildBranchKey;
134+
private BranchNameKey destBranchKey;
135+
private BranchNameKey stagingBranchKey;
136+
private BranchNameKey destBranchShortKey;
137137

138138
private List<Entry<ChangeData, RevCommit>> affectedChanges = null;
139139

@@ -158,21 +158,21 @@ protected void run() throws UnloggedFailure {
158158
permissionBackend
159159
.user(user)
160160
.project(projectKey)
161-
.ref(destBranchKey.get())
161+
.ref(destBranchKey.branch())
162162
.check(RefPermission.UPDATE);
163163
permissionBackend
164164
.user(user)
165165
.project(projectKey)
166-
.ref(stagingBranchKey.get())
166+
.ref(stagingBranchKey.branch())
167167
.check(RefPermission.UPDATE);
168168
permissionBackend
169169
.user(user)
170170
.project(projectKey)
171-
.ref(buildBranchKey.get())
171+
.ref(buildBranchKey.branch())
172172
.check(RefPermission.READ);
173173

174-
if (git.resolve(destBranchKey.get()) == null) throw die("branch not found");
175-
if (git.resolve(buildBranchKey.get()) == null) throw die("build not found");
174+
if (git.resolve(destBranchKey.branch()) == null) throw die("branch not found");
175+
if (git.resolve(buildBranchKey.branch()) == null) throw die("build not found");
176176

177177
// Initialize and populate open changes list.
178178
affectedChanges = qtUtil.listChangesNotMerged(git, buildBranchKey, destBranchKey);
@@ -223,7 +223,7 @@ private void approveBuildChanges()
223223
RestApiException, ConfigInvalidException {
224224
if (message == null) message = String.format("Change merged into branch %s", destBranchKey);
225225

226-
ObjectId oldId = git.resolve(destBranchKey.get());
226+
ObjectId oldId = git.resolve(destBranchKey.branch());
227227

228228
Result result =
229229
QtUtil.mergeBranches(user.asIdentifiedUser(), git, buildBranchKey, destBranchKey);
@@ -241,11 +241,11 @@ private void approveBuildChanges()
241241
logger.atInfo().log(
242242
"qtcodereview: staging-approve build %s merged into branch %s", buildBranch, destBranchKey);
243243

244-
ObjectId newId = git.resolve(destBranchKey.get());
244+
ObjectId newId = git.resolve(destBranchKey.branch());
245245
// send ref updated event only if there are changes to build
246246
if (!newId.equals(oldId)) {
247247
referenceUpdated.fire(
248-
projectKey, destBranchKey.get(), oldId, newId, user.asIdentifiedUser().state());
248+
projectKey, destBranchKey.branch(), oldId, newId, user.asIdentifiedUser().state());
249249
}
250250
}
251251

@@ -291,9 +291,9 @@ private void updateChanges(
291291
Change change = cd.change();
292292
if (change.getStatus() == oldStatus) {
293293
if (newStatus == Change.Status.MERGED) {
294-
ObjectId obj = git.resolve(cd.currentPatchSet().getRevision().get());
294+
ObjectId obj = git.resolve(cd.currentPatchSet().commitId().name());
295295
CodeReviewCommit currCommit = new CodeReviewCommit(obj);
296-
currCommit.setPatchsetId(cd.currentPatchSet().getId());
296+
currCommit.setPatchsetId(cd.currentPatchSet().id());
297297
CodeReviewCommit newCommit = new CodeReviewCommit(item.getValue());
298298
Change.Id changeId = insertPatchSet(u, git, cd.notes(), newCommit);
299299
if (!changeId.equals(cd.getId())) {
@@ -346,7 +346,7 @@ private void sendMergeEvent(ChangeData changeData) {
346346

347347
PatchSet ps = changeData.currentPatchSet();
348348
changeMerged.fire(
349-
changeData.change(), ps, user.asIdentifiedUser().state(), ps.getRevision().get(), ts);
349+
changeData.change(), ps, user.asIdentifiedUser().state(), ps.commitId().name(), ts);
350350

351351
// logger.atInfo().log("qtcodereview: staging-approve sending merge event failed for %s",
352352
// changeData.change());

‎src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandListStaging.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
import com.google.common.flogger.FluentLogger;
88
import com.google.gerrit.extensions.restapi.AuthException;
9-
import com.google.gerrit.reviewdb.client.Branch;
10-
import com.google.gerrit.reviewdb.client.Change;
11-
import com.google.gerrit.reviewdb.client.Project;
9+
import com.google.gerrit.entities.BranchNameKey;
10+
import com.google.gerrit.entities.Change;
11+
import com.google.gerrit.entities.Project;
1212
import com.google.gerrit.server.git.GitRepositoryManager;
1313
import com.google.gerrit.server.permissions.PermissionBackend;
1414
import com.google.gerrit.server.permissions.PermissionBackendException;
@@ -69,9 +69,9 @@ protected void run() throws UnloggedFailure {
6969

7070
final PrintWriter stdout = toPrintWriter(out);
7171

72-
Project.NameKey projectKey = new Project.NameKey(project);
73-
Branch.NameKey aBranchKey = new Branch.NameKey(projectKey, branch);
74-
Branch.NameKey destBranchShortKey =
72+
Project.NameKey projectKey = Project.nameKey(project);
73+
BranchNameKey aBranchKey = BranchNameKey.create(projectKey, branch);
74+
BranchNameKey destBranchShortKey =
7575
QtUtil.getNameKeyShort(project, QtUtil.R_HEADS, destination);
7676

7777
try {
@@ -80,15 +80,15 @@ protected void run() throws UnloggedFailure {
8080
permissionBackend
8181
.user(user)
8282
.project(projectKey)
83-
.ref(aBranchKey.get())
83+
.ref(aBranchKey.branch())
8484
.check(RefPermission.READ);
8585
permissionBackend
8686
.user(user)
8787
.project(projectKey)
88-
.ref(destBranchShortKey.get())
88+
.ref(destBranchShortKey.branch())
8989
.check(RefPermission.READ);
9090

91-
if (git.resolve(aBranchKey.get()) == null) {
91+
if (git.resolve(aBranchKey.branch()) == null) {
9292
throw die("branch ref not found");
9393
}
9494

‎src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandNewBuild.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
import com.google.common.flogger.FluentLogger;
88
import com.google.gerrit.extensions.restapi.AuthException;
99
import com.google.gerrit.extensions.restapi.RestApiException;
10-
import com.google.gerrit.reviewdb.client.Branch;
11-
import com.google.gerrit.reviewdb.client.Change;
12-
import com.google.gerrit.reviewdb.client.Project;
10+
import com.google.gerrit.entities.BranchNameKey;
11+
import com.google.gerrit.entities.Change;
12+
import com.google.gerrit.entities.Project;
1313
import com.google.gerrit.server.git.GitRepositoryManager;
1414
import com.google.gerrit.server.permissions.PermissionBackend;
1515
import com.google.gerrit.server.permissions.PermissionBackendException;
@@ -79,26 +79,26 @@ protected void run() throws UnloggedFailure {
7979
"qtcodereview: staging-new-build -p %s -s %s -i %s", project, stagingBranch, build);
8080

8181
try {
82-
Project.NameKey projectKey = new Project.NameKey(project);
82+
Project.NameKey projectKey = Project.nameKey(project);
8383
git = gitManager.openRepository(projectKey);
8484

85-
Branch.NameKey buildBranchKey = QtUtil.getNameKeyLong(project, QtUtil.R_BUILDS, build);
86-
Branch.NameKey stagingBranchKey =
85+
BranchNameKey buildBranchKey = QtUtil.getNameKeyLong(project, QtUtil.R_BUILDS, build);
86+
BranchNameKey stagingBranchKey =
8787
QtUtil.getNameKeyLong(project, QtUtil.R_STAGING, stagingBranch);
88-
Branch.NameKey destBranchShortKey =
88+
BranchNameKey destBranchShortKey =
8989
QtUtil.getNameKeyShort(project, QtUtil.R_STAGING, stagingBranch);
90-
Branch.NameKey destinationKey = QtUtil.getNameKeyLong(project, QtUtil.R_HEADS, stagingBranch);
90+
BranchNameKey destinationKey = QtUtil.getNameKeyLong(project, QtUtil.R_HEADS, stagingBranch);
9191

9292
// Check required permissions
9393
permissionBackend
9494
.user(user)
9595
.project(projectKey)
96-
.ref(destinationKey.get())
96+
.ref(destinationKey.branch())
9797
.check(RefPermission.UPDATE);
9898
permissionBackend
9999
.user(user)
100100
.project(projectKey)
101-
.ref(buildBranchKey.get())
101+
.ref(buildBranchKey.branch())
102102
.check(RefPermission.CREATE);
103103

104104
if (QtUtil.branchExists(git, buildBranchKey) == true) {

0 commit comments

Comments
 (0)