Adapt to new StorageException class name and package
Change-Id: Ie80dcf943653b0ca6291c8a14c142e7b1e73c6ca
diff --git a/src/main/java/com/googlesource/gerrit/plugins/reviewers/PutReviewers.java b/src/main/java/com/googlesource/gerrit/plugins/reviewers/PutReviewers.java
index 4c1410e..5240bc8 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/reviewers/PutReviewers.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/reviewers/PutReviewers.java
@@ -17,6 +17,7 @@
import static com.googlesource.gerrit.plugins.reviewers.ModifyReviewersConfigCapability.MODIFY_REVIEWERS_CONFIG;
import com.google.common.flogger.FluentLogger;
+import com.google.gerrit.exceptions.StorageException;
import com.google.gerrit.extensions.annotations.PluginName;
import com.google.gerrit.extensions.api.access.PluginPermission;
import com.google.gerrit.extensions.restapi.AuthException;
@@ -35,7 +36,6 @@
import com.google.gerrit.server.permissions.ProjectPermission;
import com.google.gerrit.server.project.ProjectCache;
import com.google.gerrit.server.project.ProjectResource;
-import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
@@ -160,7 +160,7 @@
throw new ResourceNotFoundException(
"Account or group '" + reviewer + "' not found\n" + accountException.getMessage());
}
- } catch (OrmException | IOException | ConfigInvalidException e) {
+ } catch (StorageException | IOException | ConfigInvalidException e) {
logger.atSevere().log("Failed to resolve account %s", reviewer);
}
}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/reviewers/Reviewers.java b/src/main/java/com/googlesource/gerrit/plugins/reviewers/Reviewers.java
index 9a3c0ec..e8a1a35 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/reviewers/Reviewers.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/reviewers/Reviewers.java
@@ -22,6 +22,7 @@
import com.google.common.collect.ImmutableSet;
import com.google.common.flogger.FluentLogger;
import com.google.gerrit.common.Nullable;
+import com.google.gerrit.exceptions.StorageException;
import com.google.gerrit.extensions.common.AccountInfo;
import com.google.gerrit.extensions.common.ChangeInfo;
import com.google.gerrit.extensions.events.ChangeEvent;
@@ -38,7 +39,6 @@
import com.google.gerrit.server.git.WorkQueue;
import com.google.gerrit.server.query.change.ChangeQueryBuilder;
import com.google.gerrit.server.query.change.InternalChangeQuery;
-import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
@@ -113,7 +113,7 @@
.map(a -> suggestedReviewer(a))
.collect(toSet());
}
- } catch (OrmException | QueryParseException x) {
+ } catch (StorageException | QueryParseException x) {
logger.atSevere().withCause(x).log(x.getMessage());
}
return ImmutableSet.of();
@@ -163,13 +163,13 @@
logger.atWarning().log(
"Could not add default reviewers for change %d of project %s, filter is invalid: %s",
changeNumber, projectName.get(), e.getMessage());
- } catch (OrmException x) {
+ } catch (StorageException x) {
logger.atSevere().withCause(x).log(x.getMessage());
}
}
private Set<String> findReviewers(int change, List<ReviewerFilterSection> sections)
- throws OrmException, QueryParseException {
+ throws StorageException, QueryParseException {
ImmutableSet.Builder<String> reviewers = ImmutableSet.builder();
List<ReviewerFilterSection> found = findReviewerSections(change, sections);
for (ReviewerFilterSection s : found) {
@@ -179,7 +179,8 @@
}
private List<ReviewerFilterSection> findReviewerSections(
- int change, List<ReviewerFilterSection> sections) throws OrmException, QueryParseException {
+ int change, List<ReviewerFilterSection> sections)
+ throws StorageException, QueryParseException {
ImmutableList.Builder<ReviewerFilterSection> found = ImmutableList.builder();
for (ReviewerFilterSection s : sections) {
if (Strings.isNullOrEmpty(s.getFilter()) || s.getFilter().equals("*")) {
@@ -191,7 +192,7 @@
return found.build();
}
- boolean filterMatch(int change, String filter) throws OrmException, QueryParseException {
+ boolean filterMatch(int change, String filter) throws StorageException, QueryParseException {
Preconditions.checkNotNull(filter);
ChangeQueryBuilder qb = queryBuilder.asUser(user.get());
return !queryProvider
diff --git a/src/main/java/com/googlesource/gerrit/plugins/reviewers/ReviewersResolver.java b/src/main/java/com/googlesource/gerrit/plugins/reviewers/ReviewersResolver.java
index 2f40504..7556553 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/reviewers/ReviewersResolver.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/reviewers/ReviewersResolver.java
@@ -20,6 +20,7 @@
import com.google.common.collect.Sets;
import com.google.common.flogger.FluentLogger;
import com.google.gerrit.common.Nullable;
+import com.google.gerrit.exceptions.StorageException;
import com.google.gerrit.extensions.common.AccountInfo;
import com.google.gerrit.extensions.restapi.UnprocessableEntityException;
import com.google.gerrit.reviewdb.client.Account;
@@ -28,7 +29,6 @@
import com.google.gerrit.server.account.GroupMembers;
import com.google.gerrit.server.group.GroupResolver;
import com.google.gerrit.server.project.NoSuchProjectException;
-import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
@@ -98,7 +98,7 @@
}
}
return false;
- } catch (OrmException | IOException | ConfigInvalidException e) {
+ } catch (StorageException | IOException | ConfigInvalidException e) {
logger.atSevere().withCause(e).log(
"For the change %d of project %s: failed to resolve account %s.",
changeNumber, project, accountName);
diff --git a/src/main/java/com/googlesource/gerrit/plugins/reviewers/SuggestProjectReviewers.java b/src/main/java/com/googlesource/gerrit/plugins/reviewers/SuggestProjectReviewers.java
index cef7e4f..5329f7c 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/reviewers/SuggestProjectReviewers.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/reviewers/SuggestProjectReviewers.java
@@ -14,6 +14,7 @@
package com.googlesource.gerrit.plugins.reviewers;
+import com.google.gerrit.exceptions.StorageException;
import com.google.gerrit.extensions.common.AccountVisibility;
import com.google.gerrit.extensions.common.SuggestedReviewerInfo;
import com.google.gerrit.extensions.restapi.BadRequestException;
@@ -27,7 +28,6 @@
import com.google.gerrit.server.restapi.change.ReviewersUtil;
import com.google.gerrit.server.restapi.change.ReviewersUtil.VisibilityControl;
import com.google.gerrit.server.restapi.change.SuggestReviewers;
-import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import java.io.IOException;
import java.util.List;
@@ -50,7 +50,7 @@
@Override
public List<SuggestedReviewerInfo> apply(ProjectResource rsrc)
- throws BadRequestException, OrmException, IOException, ConfigInvalidException,
+ throws BadRequestException, StorageException, IOException, ConfigInvalidException,
PermissionBackendException {
return reviewersUtil.suggestReviewers(
null, this, rsrc.getProjectState(), getVisibility(rsrc), true);
