From c30e1f980714d74bdaab76e4835f3b879d8b8455 Mon Sep 17 00:00:00 2001 From: Dave Borowitz Date: Tue, 15 Jan 2019 19:26:06 -0800 Subject: [PATCH] Remove StorageException catch clauses from Prolog predicates Change-Id: I1fbc1e51b8e6a1da09af5adb4f1aefa81e238dff --- java/gerrit/PRED__load_commit_labels_1.java | 35 ++++++++----------- .../gerrit/PRED_get_legacy_label_types_1.java | 9 +---- java/gerrit/PRED_pure_revert_1.java | 9 +---- .../PRED_unresolved_comments_count_1.java | 12 ++----- 4 files changed, 19 insertions(+), 46 deletions(-) diff --git a/java/gerrit/PRED__load_commit_labels_1.java b/java/gerrit/PRED__load_commit_labels_1.java index 08a3b7792d..693c89e4d6 100644 --- a/java/gerrit/PRED__load_commit_labels_1.java +++ b/java/gerrit/PRED__load_commit_labels_1.java @@ -4,11 +4,9 @@ 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.googlecode.prolog_cafe.exceptions.JavaException; import com.googlecode.prolog_cafe.exceptions.PrologException; import com.googlecode.prolog_cafe.lang.IntegerTerm; import com.googlecode.prolog_cafe.lang.ListTerm; @@ -36,27 +34,22 @@ class PRED__load_commit_labels_1 extends Predicate.P1 { Term a1 = arg1.dereference(); Term listHead = Prolog.Nil; - try { - ChangeData cd = StoredValues.CHANGE_DATA.get(engine); - LabelTypes types = cd.getLabelTypes(); + ChangeData cd = StoredValues.CHANGE_DATA.get(engine); + LabelTypes types = cd.getLabelTypes(); - for (PatchSetApproval a : cd.currentApprovals()) { - LabelType t = types.byLabel(a.getLabelId()); - if (t == null) { - continue; - } - - StructureTerm labelTerm = - new StructureTerm( - sym_label, SymbolTerm.intern(t.getName()), new IntegerTerm(a.getValue())); - - StructureTerm userTerm = - new StructureTerm(sym_user, new IntegerTerm(a.getAccountId().get())); - - listHead = new ListTerm(new StructureTerm(sym_commit_label, labelTerm, userTerm), listHead); + for (PatchSetApproval a : cd.currentApprovals()) { + LabelType t = types.byLabel(a.getLabelId()); + if (t == null) { + continue; } - } catch (StorageException err) { - throw new JavaException(this, 1, err); + + StructureTerm labelTerm = + new StructureTerm( + sym_label, SymbolTerm.intern(t.getName()), new IntegerTerm(a.getValue())); + + StructureTerm userTerm = new StructureTerm(sym_user, new IntegerTerm(a.getAccountId().get())); + + listHead = new ListTerm(new StructureTerm(sym_commit_label, labelTerm, userTerm), listHead); } if (!a1.unify(listHead, engine.trail)) { diff --git a/java/gerrit/PRED_get_legacy_label_types_1.java b/java/gerrit/PRED_get_legacy_label_types_1.java index 567415c1db..2f0c1eae56 100644 --- a/java/gerrit/PRED_get_legacy_label_types_1.java +++ b/java/gerrit/PRED_get_legacy_label_types_1.java @@ -16,9 +16,7 @@ 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.googlecode.prolog_cafe.exceptions.JavaException; import com.googlecode.prolog_cafe.exceptions.PrologException; import com.googlecode.prolog_cafe.lang.IntegerTerm; import com.googlecode.prolog_cafe.lang.ListTerm; @@ -53,12 +51,7 @@ class PRED_get_legacy_label_types_1 extends Predicate.P1 { public Operation exec(Prolog engine) throws PrologException { engine.setB0(); Term a1 = arg1.dereference(); - List list; - try { - list = StoredValues.CHANGE_DATA.get(engine).getLabelTypes().getLabelTypes(); - } catch (StorageException err) { - throw new JavaException(this, 1, err); - } + List list = StoredValues.CHANGE_DATA.get(engine).getLabelTypes().getLabelTypes(); Term head = Prolog.Nil; for (int idx = list.size() - 1; 0 <= idx; idx--) { head = new ListTerm(export(list.get(idx)), head); diff --git a/java/gerrit/PRED_pure_revert_1.java b/java/gerrit/PRED_pure_revert_1.java index 4a631e2773..6300a668b7 100644 --- a/java/gerrit/PRED_pure_revert_1.java +++ b/java/gerrit/PRED_pure_revert_1.java @@ -14,9 +14,7 @@ package gerrit; -import com.google.gerrit.exceptions.StorageException; import com.google.gerrit.server.rules.StoredValues; -import com.googlecode.prolog_cafe.exceptions.JavaException; import com.googlecode.prolog_cafe.exceptions.PrologException; import com.googlecode.prolog_cafe.lang.IntegerTerm; import com.googlecode.prolog_cafe.lang.Operation; @@ -36,12 +34,7 @@ public class PRED_pure_revert_1 extends Predicate.P1 { engine.setB0(); Term a1 = arg1.dereference(); - Boolean isPureRevert; - try { - isPureRevert = StoredValues.CHANGE_DATA.get(engine).isPureRevert(); - } catch (StorageException e) { - throw new JavaException(this, 1, e); - } + Boolean isPureRevert = StoredValues.CHANGE_DATA.get(engine).isPureRevert(); if (!a1.unify(new IntegerTerm(Boolean.TRUE.equals(isPureRevert) ? 1 : 0), engine.trail)) { return engine.fail(); } diff --git a/java/gerrit/PRED_unresolved_comments_count_1.java b/java/gerrit/PRED_unresolved_comments_count_1.java index 6076b9eb98..d4abcc54c2 100644 --- a/java/gerrit/PRED_unresolved_comments_count_1.java +++ b/java/gerrit/PRED_unresolved_comments_count_1.java @@ -14,9 +14,7 @@ package gerrit; -import com.google.gerrit.exceptions.StorageException; import com.google.gerrit.server.rules.StoredValues; -import com.googlecode.prolog_cafe.exceptions.JavaException; import com.googlecode.prolog_cafe.exceptions.PrologException; import com.googlecode.prolog_cafe.lang.IntegerTerm; import com.googlecode.prolog_cafe.lang.Operation; @@ -35,13 +33,9 @@ public class PRED_unresolved_comments_count_1 extends Predicate.P1 { engine.setB0(); Term a1 = arg1.dereference(); - try { - Integer count = StoredValues.CHANGE_DATA.get(engine).unresolvedCommentCount(); - if (!a1.unify(new IntegerTerm(count != null ? count : 0), engine.trail)) { - return engine.fail(); - } - } catch (StorageException err) { - throw new JavaException(this, 1, err); + Integer count = StoredValues.CHANGE_DATA.get(engine).unresolvedCommentCount(); + if (!a1.unify(new IntegerTerm(count != null ? count : 0), engine.trail)) { + return engine.fail(); } return cont; }