Build with 3.0-SNAPSHOT API
Update bazlets to the latest master revision and switch to the
snapshot API version.
Change-Id: Ifbebee31a0284f813db4784b1337075cbca6e4ee
diff --git a/BUILD b/BUILD
index 6420f64..5164a47 100644
--- a/BUILD
+++ b/BUILD
@@ -5,7 +5,7 @@
srcs = glob(["src/main/java/**/*.java"]),
manifest_entries = [
"Gerrit-PluginName: task",
- "Gerrit-ApiVersion: 2.16",
+ "Gerrit-ApiVersion: 3.0-SNAPSHOT",
"Implementation-Title: Task Plugin",
"Implementation-URL: https://gerrit-review.googlesource.com/#/admin/projects/plugins/task",
"Gerrit-Module: com.googlesource.gerrit.plugins.task.Modules$Module",
diff --git a/WORKSPACE b/WORKSPACE
index 985b240..a0c7f04 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,24 +3,24 @@
load("//:bazlets.bzl", "load_bazlets")
load_bazlets(
- commit = "b084bd74743f4303971a2a057bcea4f3352ddf4e",
+ commit = "738ddb525810a50c792736d7115a1bb5289bd3d3",
#local_path = "/home/<user>/projects/bazlets",
)
# Release Plugin API
-load(
- "@com_googlesource_gerrit_bazlets//:gerrit_api.bzl",
- "gerrit_api",
-)
-
-# Snapshot Plugin API
#load(
-# "@com_googlesource_gerrit_bazlets//:gerrit_api_maven_local.bzl",
-# "gerrit_api_maven_local",
+# "@com_googlesource_gerrit_bazlets//:gerrit_api.bzl",
+# "gerrit_api",
#)
+# Snapshot Plugin API
+load(
+ "@com_googlesource_gerrit_bazlets//:gerrit_api_maven_local.bzl",
+ "gerrit_api_maven_local",
+)
+
# Load release Plugin API
-gerrit_api()
+#gerrit_api()
# Load snapshot Plugin API
-#gerrit_api_maven_local()
+gerrit_api_maven_local()
diff --git a/pom.xml b/pom.xml
index 41cf343..ed03985 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,12 +22,12 @@
<groupId>com.googlesource.gerrit.plugins.task</groupId>
<artifactId>task</artifactId>
<packaging>jar</packaging>
- <version>2.16</version>
+ <version>3.0-SNAPSHOT</version>
<name>task</name>
<properties>
<Gerrit-ApiType>plugin</Gerrit-ApiType>
- <Gerrit-ApiVersion>2.16</Gerrit-ApiVersion>
+ <Gerrit-ApiVersion>3.0-SNAPSHOT</Gerrit-ApiVersion>
</properties>
<build>
diff --git a/src/main/java/com/googlesource/gerrit/plugins/task/TaskTree.java b/src/main/java/com/googlesource/gerrit/plugins/task/TaskTree.java
index daefe23..fa8863c 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/task/TaskTree.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/task/TaskTree.java
@@ -14,6 +14,7 @@
package com.googlesource.gerrit.plugins.task;
+import com.google.gerrit.extensions.restapi.UnprocessableEntityException;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.Branch;
import com.google.gerrit.reviewdb.client.RefNames;
@@ -174,11 +175,13 @@
if (user == null) {
throw new ConfigInvalidException("External user not defined");
}
- Account acct = accountResolver.find(user);
- if (acct == null) {
+ Account.Id acct;
+ try {
+ acct = accountResolver.resolve(user).asUnique().getAccount().getId();
+ } catch (UnprocessableEntityException e) {
throw new ConfigInvalidException("Cannot resolve user: " + user);
}
- return new Branch.NameKey(allUsers.get(), RefNames.refsUsers(acct.getId()));
+ return new Branch.NameKey(allUsers.get(), RefNames.refsUsers(acct));
}
}
}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/task/cli/PatchSetArgument.java b/src/main/java/com/googlesource/gerrit/plugins/task/cli/PatchSetArgument.java
index a7e9063..62c3d04 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/task/cli/PatchSetArgument.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/task/cli/PatchSetArgument.java
@@ -16,7 +16,6 @@
import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.PatchSet;
-import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.PatchSetUtil;
import com.google.gerrit.server.notedb.ChangeNotes;
@@ -31,7 +30,6 @@
public static class Factory {
protected final PermissionBackend permissionBackend;
protected final ChangeNotes.Factory notesFactory;
- protected final ReviewDb reviewDb;
protected final PatchSetUtil psUtil;
protected final CurrentUser user;
@@ -39,12 +37,10 @@
protected Factory(
ChangeNotes.Factory notesFactory,
PermissionBackend permissionBackend,
- ReviewDb reviewDb,
PatchSetUtil psUtil,
CurrentUser user) {
this.notesFactory = notesFactory;
this.permissionBackend = permissionBackend;
- this.reviewDb = reviewDb;
this.psUtil = psUtil;
this.user = user;
}
@@ -55,11 +51,10 @@
ChangeNotes changeNotes = notesFactory.createChecked(patchSetId.getParentKey());
permissionBackend
.user(user)
- .database(reviewDb)
.change(changeNotes)
.check(ChangePermission.READ);
return new PatchSetArgument(
- changeNotes.getChange(), psUtil.get(reviewDb, changeNotes, patchSetId));
+ changeNotes.getChange(), psUtil.get(changeNotes, patchSetId));
} catch (PermissionBackendException | AuthException e) {
throw new IllegalArgumentException("database error", e);
} catch (UnloggedFailure e) {