Adapt to changes in 2.15 API
Change-Id: Ifac5eedca41c7ff622f09531bbddc411b5f025bf
diff --git a/owners-autoassign/src/main/java/com/vmware/gerrit/owners/common/GitRefListener.java b/owners-autoassign/src/main/java/com/vmware/gerrit/owners/common/GitRefListener.java
index aeb5960..67fdb1e 100644
--- a/owners-autoassign/src/main/java/com/vmware/gerrit/owners/common/GitRefListener.java
+++ b/owners-autoassign/src/main/java/com/vmware/gerrit/owners/common/GitRefListener.java
@@ -120,7 +120,7 @@
newId = ObjectId.fromString(event.getNewObjectId());
}
- PatchListKey plKey = new PatchListKey(null, newId, IGNORE_NONE);
+ PatchListKey plKey = PatchListKey.againstCommit(null, newId, IGNORE_NONE);
try {
return patchListCache.get(plKey, change.getProject());
} catch (PatchListNotAvailableException e) {
diff --git a/owners-common/BUILD b/owners-common/BUILD
index 0e2355f..8a4ea42 100644
--- a/owners-common/BUILD
+++ b/owners-common/BUILD
@@ -1,6 +1,5 @@
-load("//tools/bzl:gwt.bzl", "PLUGIN_DEPS_NEVERLINK")
load("//tools/bzl:junit.bzl", "junit_tests")
-load("//tools/bzl:plugin.bzl", "gerrit_plugin", "PLUGIN_DEPS", "PLUGIN_TEST_DEPS")
+load("//tools/bzl:plugin.bzl", "gerrit_plugin", "PLUGIN_DEPS", "PLUGIN_TEST_DEPS", "PLUGIN_DEPS_NEVERLINK")
load("//plugins/owners-common:common.bzl", "EXTERNAL_DEPS")
java_library(
diff --git a/owners-common/src/main/java/com/vmware/gerrit/owners/common/AccountsImpl.java b/owners-common/src/main/java/com/vmware/gerrit/owners/common/AccountsImpl.java
index ca64560..e28e8ba 100644
--- a/owners-common/src/main/java/com/vmware/gerrit/owners/common/AccountsImpl.java
+++ b/owners-common/src/main/java/com/vmware/gerrit/owners/common/AccountsImpl.java
@@ -18,13 +18,13 @@
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.Account.Id;
import com.google.gerrit.reviewdb.client.AccountGroup;
-import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.account.AccountCache;
import com.google.gerrit.server.account.AccountResolver;
import com.google.gerrit.server.account.AccountState;
import com.google.gerrit.server.account.GroupCache;
import com.google.gerrit.server.account.GroupMembers;
+import com.google.gerrit.server.group.InternalGroup;
import com.google.gerrit.server.project.NoSuchProjectException;
import com.google.gerrit.server.util.ManualRequestContext;
import com.google.gerrit.server.util.OneOffRequestContext;
@@ -35,13 +35,13 @@
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
+import org.eclipse.jgit.errors.ConfigInvalidException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class AccountsImpl implements Accounts {
private static final Logger log = LoggerFactory.getLogger(AccountsImpl.class);
- private final ReviewDb db;
private final AccountResolver resolver;
private final AccountCache byId;
private final GroupCache groupCache;
@@ -53,14 +53,12 @@
public AccountsImpl(
AccountResolver resolver,
AccountCache byId,
- ReviewDb db,
GroupCache groupCache,
GroupMembers.Factory groupMembersFactory,
OneOffRequestContext oneOffRequestContext,
IdentifiedUser.GenericFactory userFactory) {
this.resolver = resolver;
this.byId = byId;
- this.db = db;
this.groupCache = groupCache;
this.groupMembers = groupMembersFactory;
this.adminUser = userFactory.create(new Account.Id(1000000));
@@ -76,19 +74,22 @@
}
private Set<Id> findAccountsInGroup(String groupNameOrUUID) {
- AccountGroup group =
- Optional.ofNullable(groupCache.get(new AccountGroup.NameKey(groupNameOrUUID)))
+ Optional<InternalGroup> group =
+ groupCache
+ .get(new AccountGroup.NameKey(groupNameOrUUID))
+ .map(Optional::of)
.orElse(groupCache.get(new AccountGroup.UUID(groupNameOrUUID)));
- if (group == null) {
+ if (!group.isPresent()) {
log.warn("Group {} was not found", groupNameOrUUID);
+ return Collections.emptySet();
}
try (ManualRequestContext ctx = oneOffRequestContext.openAs(adminUser.getAccountId())) {
return groupMembers
.create(adminUser)
- .listAccounts(group.getGroupUUID(), null)
+ .listAccounts(group.get().getGroupUUID(), null)
.stream()
.map(Account::getId)
.collect(Collectors.toSet());
@@ -100,7 +101,7 @@
private Set<Account.Id> findUserOrEmail(String nameOrEmail) {
try {
- Set<Id> accountIds = resolver.findAll(db, nameOrEmail);
+ Set<Id> accountIds = resolver.findAll(nameOrEmail);
if (accountIds.isEmpty()) {
log.warn("User '{}' does not resolve to any account.", nameOrEmail);
return accountIds;
@@ -121,7 +122,7 @@
}
return accountIds;
- } catch (OrmException e) {
+ } catch (OrmException | IOException | ConfigInvalidException e) {
log.error("Error trying to resolve user " + nameOrEmail, e);
return Collections.emptySet();
}
diff --git a/owners/BUILD b/owners/BUILD
index f803af2..c5abc15 100644
--- a/owners/BUILD
+++ b/owners/BUILD
@@ -1,6 +1,5 @@
-load("//tools/bzl:gwt.bzl", "PLUGIN_DEPS_NEVERLINK")
load("//tools/bzl:junit.bzl", "junit_tests")
-load("//tools/bzl:plugin.bzl", "gerrit_plugin", "PLUGIN_DEPS", "PLUGIN_TEST_DEPS")
+load("//tools/bzl:plugin.bzl", "gerrit_plugin", "PLUGIN_DEPS", "PLUGIN_TEST_DEPS", "PLUGIN_DEPS_NEVERLINK")
load("//lib/prolog:prolog.bzl", "prolog_cafe_library")
load("//plugins/owners-common:common.bzl", "EXTERNAL_DEPS")
