opendev/gerrit
Code Issues Proposed changes

Rename OrmException to StorageException and move to exceptions package

Browse Source 
Subclasses are also renamed:
 * OrmDuplicateKeyException -> DuplicateKeyException
 * OrmRuntimeException -> StorageRuntimeException

Change-Id: I0e934f177e98667ec7cb9912f246ac649a4efd99
This commit is contained in:
Dave Borowitz
2019-01-15 18:45:22 -08:00
parent 9dd73c8a71
commit 62f32fcfd6
500 changed files with 1973 additions and 1941 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/gerrit/BUILD
View File

@@ -4,10 +4,10 @@ java_library(
visibility = ["//visibility:public"],
deps = [
"//java/com/google/gerrit/common:server",
"//java/com/google/gerrit/exceptions",
"//java/com/google/gerrit/extensions:api",
"//java/com/google/gerrit/reviewdb:server",
"//java/com/google/gerrit/server",
"//java/com/google/gwtorm",
"//lib/flogger:api",
"//lib/jgit/org.eclipse.jgit:jgit",
"//lib/prolog:runtime",

4
java/gerrit/PRED__load_commit_labels_1.java
View File

@@ -4,10 +4,10 @@ package gerrit;
import com.google.gerrit.common.data.LabelType;
import com.google.gerrit.common.data.LabelTypes;
import com.google.gerrit.exceptions.StorageException;
import com.google.gerrit.reviewdb.client.PatchSetApproval;
import com.google.gerrit.server.query.change.ChangeData;
import com.google.gerrit.server.rules.StoredValues;
import com.google.gwtorm.server.OrmException;
import com.googlecode.prolog_cafe.exceptions.JavaException;
import com.googlecode.prolog_cafe.exceptions.PrologException;
import com.googlecode.prolog_cafe.lang.IntegerTerm;
@@ -55,7 +55,7 @@ class PRED__load_commit_labels_1 extends Predicate.P1 {
listHead = new ListTerm(new StructureTerm(sym_commit_label, labelTerm, userTerm), listHead);
}
} catch (OrmException err) {
} catch (StorageException err) {
throw new JavaException(this, 1, err);
}

4
java/gerrit/PRED_get_legacy_label_types_1.java
View File

@@ -16,8 +16,8 @@ package gerrit;
import com.google.gerrit.common.data.LabelType;
import com.google.gerrit.common.data.LabelValue;
import com.google.gerrit.exceptions.StorageException;
import com.google.gerrit.server.rules.StoredValues;
import com.google.gwtorm.server.OrmException;
import com.googlecode.prolog_cafe.exceptions.JavaException;
import com.googlecode.prolog_cafe.exceptions.PrologException;
import com.googlecode.prolog_cafe.lang.IntegerTerm;
@@ -56,7 +56,7 @@ class PRED_get_legacy_label_types_1 extends Predicate.P1 {
List<LabelType> list;
try {
list = StoredValues.CHANGE_DATA.get(engine).getLabelTypes().getLabelTypes();
} catch (OrmException err) {
} catch (StorageException err) {
throw new JavaException(this, 1, err);
}
Term head = Prolog.Nil;

4
java/gerrit/PRED_pure_revert_1.java
View File

@@ -14,8 +14,8 @@
package gerrit;
import com.google.gerrit.exceptions.StorageException;
import com.google.gerrit.server.rules.StoredValues;
import com.google.gwtorm.server.OrmException;
import com.googlecode.prolog_cafe.exceptions.JavaException;
import com.googlecode.prolog_cafe.exceptions.PrologException;
import com.googlecode.prolog_cafe.lang.IntegerTerm;
@@ -39,7 +39,7 @@ public class PRED_pure_revert_1 extends Predicate.P1 {
Boolean isPureRevert;
try {
isPureRevert = StoredValues.CHANGE_DATA.get(engine).isPureRevert();
} catch (OrmException e) {
} catch (StorageException e) {
throw new JavaException(this, 1, e);
}
if (!a1.unify(new IntegerTerm(Boolean.TRUE.equals(isPureRevert) ? 1 : 0), engine.trail)) {

4
java/gerrit/PRED_unresolved_comments_count_1.java
View File

@@ -14,8 +14,8 @@
package gerrit;
import com.google.gerrit.exceptions.StorageException;
import com.google.gerrit.server.rules.StoredValues;
import com.google.gwtorm.server.OrmException;
import com.googlecode.prolog_cafe.exceptions.JavaException;
import com.googlecode.prolog_cafe.exceptions.PrologException;
import com.googlecode.prolog_cafe.lang.IntegerTerm;
@@ -40,7 +40,7 @@ public class PRED_unresolved_comments_count_1 extends Predicate.P1 {
if (!a1.unify(new IntegerTerm(count != null ? count : 0), engine.trail)) {
return engine.fail();
}
} catch (OrmException err) {
} catch (StorageException err) {
throw new JavaException(this, 1, err);
}
return cont;