Stop treating StorageException like it's checked
* Rely on Throwables#throwIfUnchecked instead of #isInstanceOf.
* Don't pass to checked variants of PluginSetContext#runEach, etc.
Change-Id: Ic3e5541b059b20c1ee2775496cfe30c1041f492a
diff --git a/java/com/google/gerrit/server/account/AccountsUpdate.java b/java/com/google/gerrit/server/account/AccountsUpdate.java
index 4aac8ea..20a1c97 100644
--- a/java/com/google/gerrit/server/account/AccountsUpdate.java
+++ b/java/com/google/gerrit/server/account/AccountsUpdate.java
@@ -427,7 +427,6 @@
Throwables.throwIfUnchecked(e);
Throwables.throwIfInstanceOf(e, IOException.class);
Throwables.throwIfInstanceOf(e, ConfigInvalidException.class);
- Throwables.throwIfInstanceOf(e, StorageException.class);
throw new StorageException(e);
}
}
diff --git a/java/com/google/gerrit/server/account/Emails.java b/java/com/google/gerrit/server/account/Emails.java
index d1e2959..426d6ea 100644
--- a/java/com/google/gerrit/server/account/Emails.java
+++ b/java/com/google/gerrit/server/account/Emails.java
@@ -108,7 +108,6 @@
ActionType.INDEX_QUERY, action, StorageException.class::isInstance);
} catch (Exception e) {
Throwables.throwIfUnchecked(e);
- Throwables.throwIfInstanceOf(e, StorageException.class);
throw new StorageException(e);
}
}
diff --git a/java/com/google/gerrit/server/change/ConsistencyChecker.java b/java/com/google/gerrit/server/change/ConsistencyChecker.java
index f64bf1f..80b7190 100644
--- a/java/com/google/gerrit/server/change/ConsistencyChecker.java
+++ b/java/com/google/gerrit/server/change/ConsistencyChecker.java
@@ -674,7 +674,7 @@
@Override
public boolean updateChange(ChangeContext ctx) throws PatchSetInfoNotAvailableException {
// Delete dangling key references.
- accountPatchReviewStore.run(s -> s.clearReviewed(psId), StorageException.class);
+ accountPatchReviewStore.run(s -> s.clearReviewed(psId));
// For NoteDb setting the state to deleted is sufficient to filter everything out.
ctx.getUpdate(psId).setPatchSetState(PatchSetState.DELETED);
diff --git a/java/com/google/gerrit/server/change/DeleteChangeOp.java b/java/com/google/gerrit/server/change/DeleteChangeOp.java
index 966efea..1324b7f 100644
--- a/java/com/google/gerrit/server/change/DeleteChangeOp.java
+++ b/java/com/google/gerrit/server/change/DeleteChangeOp.java
@@ -14,7 +14,6 @@
package com.google.gerrit.server.change;
-import com.google.gerrit.exceptions.StorageException;
import com.google.gerrit.extensions.restapi.MethodNotAllowedException;
import com.google.gerrit.extensions.restapi.ResourceConflictException;
import com.google.gerrit.extensions.restapi.RestApiException;
@@ -108,7 +107,7 @@
private void cleanUpReferences(ChangeContext ctx, Change.Id id, Collection<PatchSet> patchSets)
throws NoSuchChangeException {
for (PatchSet ps : patchSets) {
- accountPatchReviewStore.run(s -> s.clearReviewed(ps.getId()), StorageException.class);
+ accountPatchReviewStore.run(s -> s.clearReviewed(ps.getId()));
}
// Non-atomic operation on Accounts table; not much we can do to make it
diff --git a/java/com/google/gerrit/server/git/receive/ReceiveCommits.java b/java/com/google/gerrit/server/git/receive/ReceiveCommits.java
index 059d028..6ffad7b 100644
--- a/java/com/google/gerrit/server/git/receive/ReceiveCommits.java
+++ b/java/com/google/gerrit/server/git/receive/ReceiveCommits.java
@@ -3252,7 +3252,6 @@
ActionType.INDEX_QUERY, action, StorageException.class::isInstance);
} catch (Exception e) {
Throwables.throwIfUnchecked(e);
- Throwables.throwIfInstanceOf(e, StorageException.class);
throw new StorageException(e);
}
}
diff --git a/java/com/google/gerrit/server/project/ProjectsConsistencyChecker.java b/java/com/google/gerrit/server/project/ProjectsConsistencyChecker.java
index 5b0a5e6..32dbe1c 100644
--- a/java/com/google/gerrit/server/project/ProjectsConsistencyChecker.java
+++ b/java/com/google/gerrit/server/project/ProjectsConsistencyChecker.java
@@ -313,7 +313,6 @@
return autoCloseableChangesByBranch;
} catch (Exception e) {
Throwables.throwIfUnchecked(e);
- Throwables.throwIfInstanceOf(e, StorageException.class);
throw new StorageException(e);
}
}
diff --git a/java/com/google/gerrit/server/restapi/change/Files.java b/java/com/google/gerrit/server/restapi/change/Files.java
index c30c0ba..2a0cd58 100644
--- a/java/com/google/gerrit/server/restapi/change/Files.java
+++ b/java/com/google/gerrit/server/restapi/change/Files.java
@@ -19,7 +19,6 @@
import com.google.common.hash.Hasher;
import com.google.common.hash.Hashing;
import com.google.gerrit.common.Nullable;
-import com.google.gerrit.exceptions.StorageException;
import com.google.gerrit.extensions.common.FileInfo;
import com.google.gerrit.extensions.registration.DynamicMap;
import com.google.gerrit.extensions.restapi.AuthException;
@@ -232,9 +231,7 @@
Account.Id userId = user.getAccountId();
PatchSet patchSetId = resource.getPatchSet();
Optional<PatchSetWithReviewedFiles> o;
- o =
- accountPatchReviewStore.call(
- s -> s.findReviewed(patchSetId.getId(), userId), StorageException.class);
+ o = accountPatchReviewStore.call(s -> s.findReviewed(patchSetId.getId(), userId));
if (o.isPresent()) {
PatchSetWithReviewedFiles res = o.get();
@@ -317,8 +314,7 @@
}
accountPatchReviewStore.run(
- s -> s.markReviewed(resource.getPatchSet().getId(), userId, pathList),
- StorageException.class);
+ s -> s.markReviewed(resource.getPatchSet().getId(), userId, pathList));
return pathList;
}
}
diff --git a/java/com/google/gerrit/server/restapi/change/Reviewed.java b/java/com/google/gerrit/server/restapi/change/Reviewed.java
index 113ed82..4594503 100644
--- a/java/com/google/gerrit/server/restapi/change/Reviewed.java
+++ b/java/com/google/gerrit/server/restapi/change/Reviewed.java
@@ -14,7 +14,6 @@
package com.google.gerrit.server.restapi.change;
-import com.google.gerrit.exceptions.StorageException;
import com.google.gerrit.extensions.common.Input;
import com.google.gerrit.extensions.restapi.Response;
import com.google.gerrit.extensions.restapi.RestModifyView;
@@ -43,8 +42,7 @@
s.markReviewed(
resource.getPatchKey().getParentKey(),
resource.getAccountId(),
- resource.getPatchKey().getFileName()),
- StorageException.class);
+ resource.getPatchKey().getFileName()));
return reviewFlagUpdated ? Response.created("") : Response.ok("");
}
}
@@ -65,8 +63,7 @@
s.clearReviewed(
resource.getPatchKey().getParentKey(),
resource.getAccountId(),
- resource.getPatchKey().getFileName()),
- StorageException.class);
+ resource.getPatchKey().getFileName()));
return Response.none();
}
}
