Adapt to changes on recent master
Change-Id: Ie1dee4631cef2d9d5f7de5165caa83b9cbbec3c4
diff --git a/owners-autoassign/src/main/java/com/googlesource/gerrit/owners/common/GitRefListener.java b/owners-autoassign/src/main/java/com/googlesource/gerrit/owners/common/GitRefListener.java
index e123534..09e087d 100644
--- a/owners-autoassign/src/main/java/com/googlesource/gerrit/owners/common/GitRefListener.java
+++ b/owners-autoassign/src/main/java/com/googlesource/gerrit/owners/common/GitRefListener.java
@@ -19,20 +19,19 @@
import static com.google.gerrit.extensions.client.DiffPreferencesInfo.Whitespace.IGNORE_NONE;
import com.google.common.collect.Sets;
+import com.google.gerrit.exceptions.StorageException;
import com.google.gerrit.extensions.annotations.Listen;
import com.google.gerrit.extensions.events.GitReferenceUpdatedListener;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.Project;
-import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.git.GitRepositoryManager;
+import com.google.gerrit.server.notedb.ChangeNotes;
import com.google.gerrit.server.patch.PatchList;
import com.google.gerrit.server.patch.PatchListCache;
import com.google.gerrit.server.patch.PatchListKey;
import com.google.gerrit.server.patch.PatchListNotAvailableException;
-import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
-import com.google.inject.Provider;
import java.io.IOException;
import java.util.Set;
import org.eclipse.jgit.lib.ObjectId;
@@ -46,26 +45,22 @@
private static final String CHANGES_REF = "refs/changes/";
- private final Provider<ReviewDb> db;
-
private final PatchListCache patchListCache;
-
private final GitRepositoryManager repositoryManager;
-
+ private final ChangeNotes.Factory notesFactory;
private final Accounts accounts;
-
private final ReviewerManager reviewerManager;
@Inject
public GitRefListener(
- Provider<ReviewDb> db,
PatchListCache patchListCache,
GitRepositoryManager repositoryManager,
+ ChangeNotes.Factory notesFactory,
Accounts accounts,
ReviewerManager reviewerManager) {
- this.db = db;
this.patchListCache = patchListCache;
this.repositoryManager = repositoryManager;
+ this.notesFactory = notesFactory;
this.accounts = accounts;
this.reviewerManager = reviewerManager;
}
@@ -89,11 +84,11 @@
private void processEvent(Repository repository, Event event) {
if (event.getRefName().startsWith(CHANGES_REF)) {
Change.Id id = Change.Id.fromRef(event.getRefName());
- ReviewDb reviewDb = db.get();
- // The provider injected by Gerrit is shared with other workers on the
- // same local thread and thus cannot be closed in this event listener.
try {
- Change change = reviewDb.changes().get(id);
+ Change change =
+ notesFactory
+ .createChecked(Project.NameKey.parse(event.getProjectName()), id)
+ .getChange();
if (change == null) {
return;
}
@@ -109,7 +104,7 @@
logger.debug("Autoassigned reviewers are: {}", allReviewers.toString());
reviewerManager.addReviewers(change, allReviewers);
}
- } catch (OrmException e) {
+ } catch (StorageException e) {
logger.warn("Could not open change: {}", id, e);
} catch (ReviewerManagerException e) {
logger.warn("Could not add reviewers for change: {}", id, e);
diff --git a/owners-autoassign/src/main/java/com/googlesource/gerrit/owners/common/ReviewerManager.java b/owners-autoassign/src/main/java/com/googlesource/gerrit/owners/common/ReviewerManager.java
index f62b8c7..28a5359 100644
--- a/owners-autoassign/src/main/java/com/googlesource/gerrit/owners/common/ReviewerManager.java
+++ b/owners-autoassign/src/main/java/com/googlesource/gerrit/owners/common/ReviewerManager.java
@@ -16,6 +16,7 @@
package com.googlesource.gerrit.owners.common;
+import com.google.gerrit.exceptions.StorageException;
import com.google.gerrit.extensions.api.GerritApi;
import com.google.gerrit.extensions.api.changes.AddReviewerInput;
import com.google.gerrit.extensions.api.changes.ReviewInput;
@@ -24,7 +25,6 @@
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.server.util.ManualRequestContext;
import com.google.gerrit.server.util.OneOffRequestContext;
-import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import java.util.ArrayList;
@@ -58,7 +58,7 @@
in.reviewers.add(addReviewerInput);
}
gApi.changes().id(change.getId().get()).current().review(in);
- } catch (RestApiException | OrmException e) {
+ } catch (RestApiException | StorageException e) {
log.error("Couldn't add reviewers to the change", e);
throw new ReviewerManagerException(e);
}
diff --git a/owners-common/src/main/java/com/googlesource/gerrit/owners/common/AccountsImpl.java b/owners-common/src/main/java/com/googlesource/gerrit/owners/common/AccountsImpl.java
index d427ef9..49772f6 100644
--- a/owners-common/src/main/java/com/googlesource/gerrit/owners/common/AccountsImpl.java
+++ b/owners-common/src/main/java/com/googlesource/gerrit/owners/common/AccountsImpl.java
@@ -17,6 +17,7 @@
import static com.google.gerrit.server.account.externalids.ExternalId.SCHEME_GERRIT;
import static com.google.gerrit.server.account.externalids.ExternalId.SCHEME_MAILTO;
+import com.google.gerrit.exceptions.StorageException;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.Account.Id;
import com.google.gerrit.reviewdb.client.AccountGroup;
@@ -30,7 +31,6 @@
import com.google.gerrit.server.project.NoSuchProjectException;
import com.google.gerrit.server.util.ManualRequestContext;
import com.google.gerrit.server.util.OneOffRequestContext;
-import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import java.io.IOException;
import java.util.Collections;
@@ -85,9 +85,7 @@
}
try {
- return groupMembers
- .listAccounts(group.get().getGroupUUID(), null)
- .stream()
+ return groupMembers.listAccounts(group.get().getGroupUUID(), null).stream()
.map(Account::getId)
.collect(Collectors.toSet());
} catch (NoSuchProjectException | IOException e) {
@@ -98,7 +96,7 @@
private Set<Account.Id> findUserOrEmail(String nameOrEmail) {
try (ManualRequestContext ctx = oneOffRequestContext.open()) {
- Set<Id> accountIds = resolver.findAll(nameOrEmail);
+ Set<Id> accountIds = resolver.resolve(nameOrEmail).asIdSet();
if (accountIds.isEmpty()) {
log.warn("User '{}' does not resolve to any account.", nameOrEmail);
return accountIds;
@@ -116,8 +114,7 @@
}
Set<Id> fulllyMatchedAccountIds =
- activeAccountIds
- .stream()
+ activeAccountIds.stream()
.filter(id -> isFullMatch(id, nameOrEmail))
.collect(Collectors.toSet());
if (fulllyMatchedAccountIds.isEmpty()) {
@@ -130,7 +127,7 @@
}
return accountIds;
- } catch (OrmException | IOException | ConfigInvalidException e) {
+ } catch (StorageException | IOException | ConfigInvalidException e) {
log.error("Error trying to resolve user " + nameOrEmail, e);
return Collections.emptySet();
}
@@ -145,10 +142,7 @@
Account account = accountState.get().getAccount();
return isFullNameMatch(account, nameOrEmail)
|| nameOrEmail.equalsIgnoreCase(account.getPreferredEmail())
- || accountState
- .get()
- .getExternalIds()
- .stream()
+ || accountState.get().getExternalIds().stream()
.anyMatch(eid -> isEMailMatch(eid, nameOrEmail) || isUsernameMatch(eid, nameOrEmail));
}
diff --git a/owners-common/src/test/java/com/googlesource/gerrit/owners/common/Config.java b/owners-common/src/test/java/com/googlesource/gerrit/owners/common/Config.java
index e6e1e91..a5df462 100644
--- a/owners-common/src/test/java/com/googlesource/gerrit/owners/common/Config.java
+++ b/owners-common/src/test/java/com/googlesource/gerrit/owners/common/Config.java
@@ -20,7 +20,6 @@
import com.google.common.base.Charsets;
import com.google.gerrit.reviewdb.client.Patch;
-import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.patch.PatchList;
import com.google.gerrit.server.patch.PatchListEntry;
import java.io.IOException;
@@ -34,7 +33,6 @@
@Ignore
public abstract class Config {
- protected ReviewDb db;
protected Repository repository;
protected PatchList patchList;
protected ConfigurationParser parser;
