Turn a bunch more exceptions into RuntimeException instead of checked in Ssurgeon

Author: AngledLuffa

src/edu/stanford/nlp/semgraph/semgrex/ssurgeon/SsurgeonPattern.java

@@ -118,7 +118,7 @@ public String toString() {
    * @param sg SemanticGraph to operate over (NOT destroyed/modified).
    * @return True if a match was found and executed, otherwise false.
    */
-  public Collection<SemanticGraph> execute(SemanticGraph sg) throws Exception {
+  public Collection<SemanticGraph> execute(SemanticGraph sg) {
     Collection<SemanticGraph> generated = new ArrayList<>();
     SemgrexMatcher matcher = semgrexPattern.matcher(sg);
     nextMatch:

src/edu/stanford/nlp/semgraph/semgrex/ssurgeon/SsurgeonRuntimeException.java

@@ -0,0 +1,21 @@
+package edu.stanford.nlp.semgraph.semgrex.ssurgeon;
+
+/**
+ * A runtime exception that indicates something went wrong executing a
+ * Ssurgeon expression.
+ *
+ * @author John Bauer
+ */
+public class SsurgeonRuntimeException extends RuntimeException {
+
+  private static final long serialVersionUID = -278683457698L;
+
+  public SsurgeonRuntimeException(String message) {
+    super(message);
+  }
+
+  public SsurgeonRuntimeException(String message, Throwable cause) {
+    super(message, cause);
+  }
+
+}

src/edu/stanford/nlp/semgraph/semgrex/ssurgeon/pred/NodeTest.java

@@ -15,13 +15,13 @@ public abstract class NodeTest implements SsurgPred {
 
   public NodeTest(String matchName) { this.matchName = matchName; }
 
-  public boolean test(SemgrexMatcher matcher) throws Exception { return evaluate(matcher.getNode(matchName)); }
+  public boolean test(SemgrexMatcher matcher) { return evaluate(matcher.getNode(matchName)); }
 
   // This is the custom routine to implement
-  protected abstract boolean evaluate(IndexedWord node) throws Exception;
+  protected abstract boolean evaluate(IndexedWord node);
 
   // Use this for debugging, and dual re-use of the code outside of Ssurgeon
-  public boolean test(IndexedWord node) throws Exception {
+  public boolean test(IndexedWord node) {
     return evaluate(node);
   }
 

src/edu/stanford/nlp/semgraph/semgrex/ssurgeon/pred/SsurgAndPred.java

@@ -13,7 +13,7 @@ public class SsurgAndPred extends ArrayList<SsurgPred> implements SsurgPred {
    */
   private static final long serialVersionUID = 760573332472162149L;
 
-  public boolean test(SemgrexMatcher matcher) throws Exception {
+  public boolean test(SemgrexMatcher matcher) {
     for (SsurgPred term : this) {
       if (term.test(matcher) == false)
         return false;

src/edu/stanford/nlp/semgraph/semgrex/ssurgeon/pred/SsurgOrPred.java

@@ -12,7 +12,7 @@ public class SsurgOrPred extends ArrayList<SsurgPred> implements SsurgPred {
    */
   private static final long serialVersionUID = 4581463857927967518L;
 
-  public boolean test(SemgrexMatcher matcher) throws Exception {
+  public boolean test(SemgrexMatcher matcher) {
     for (SsurgPred term : this) {
       if (term.test(matcher))
         return true;

src/edu/stanford/nlp/semgraph/semgrex/ssurgeon/pred/SsurgPred.java

@@ -4,5 +4,5 @@
 
 public interface SsurgPred {
   // Given the current setup (each of the args in place), what is the truth value?  
-  public boolean test(SemgrexMatcher matched) throws Exception;
+  public boolean test(SemgrexMatcher matched);
 }

src/edu/stanford/nlp/semgraph/semgrex/ssurgeon/pred/SsurgTestManager.java

@@ -2,6 +2,7 @@
 
 import java.util.*;
 
+import edu.stanford.nlp.semgraph.semgrex.ssurgeon.SsurgeonRuntimeException;
 import edu.stanford.nlp.util.Generics;
 
 /**
@@ -39,8 +40,12 @@ public void registerNodeTest(NodeTest nodeTestObj) {
    * of the given NodeTest, otherwise throws an exception if not available.
    * @throws Exception
    */
-  public NodeTest getNodeTest(String id, String matchName) throws Exception {
-    NodeTest test = (NodeTest) nodeTests.get(id).getConstructor(String.class).newInstance(matchName);
-    return test;
+  public NodeTest getNodeTest(String id, String matchName) {
+    try {
+      NodeTest test = (NodeTest) nodeTests.get(id).getConstructor(String.class).newInstance(matchName);
+      return test;
+    } catch (ReflectiveOperationException e) {
+      throw new SsurgeonRuntimeException("Could not create a new instance of test " + id, e);
+    }
   }
 }

src/edu/stanford/nlp/semgraph/semgrex/ssurgeon/pred/WordlistTest.java

@@ -2,6 +2,7 @@
 
 import edu.stanford.nlp.ling.IndexedWord;
 import edu.stanford.nlp.semgraph.semgrex.ssurgeon.Ssurgeon;
+import edu.stanford.nlp.semgraph.semgrex.ssurgeon.SsurgeonRuntimeException;
 import edu.stanford.nlp.semgraph.semgrex.ssurgeon.SsurgeonWordlist;
 
 public class WordlistTest extends NodeTest {
@@ -23,10 +24,10 @@ public WordlistTest(String myID, String resourceID, String type, String matchNam
    * Checks to see if the given node's field matches the resource
    */
   @Override
-  protected boolean evaluate(IndexedWord node) throws Exception {
+  protected boolean evaluate(IndexedWord node) {
     SsurgeonWordlist wl = Ssurgeon.inst().getResource(resourceID);
     if (wl == null) {
-      throw new Exception("No wordlist resource with ID="+resourceID);
+      throw new SsurgeonRuntimeException("No wordlist resource with ID="+resourceID);
     }
     if (type == TYPE.lemma)
       return wl.contains(node.lemma().toLowerCase());

test/src/edu/stanford/nlp/semgraph/semgrex/ssurgeon/SsurgeonTest.java

@@ -20,7 +20,7 @@ public class SsurgeonTest {
    * semgrex match.
    */
   @Test
-  public void simpleTest() throws Exception {
+  public void simpleTest() {
     SemanticGraph sg = SemanticGraph.valueOf("[mixed/VBN nsubj>[Joe/NNP appos>[bartender/NN det>the/DT]]  obj>[drink/NN det>a/DT]]");
     SemgrexPattern semgrexPattern = SemgrexPattern.compile("{}=a1 >appos=e1 {}=a2 <nsubj=e2 {}=a3");
     SsurgeonPattern pattern = new SsurgeonPattern(semgrexPattern);