remove throwables.propagate

jboulter · jboulter · commit ede2132436a2 · 2019-01-10T14:54:56.000-05:00
diff --git a/src/main/java/com/hubspot/jinjava/doc/JinjavaDocFactory.java b/src/main/java/com/hubspot/jinjava/doc/JinjavaDocFactory.java
@@ -9,7 +9,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Throwables;
 import com.hubspot.jinjava.Jinjava;
 import com.hubspot.jinjava.doc.annotations.JinjavaMetaValue;
 import com.hubspot.jinjava.doc.annotations.JinjavaParam;
@@ -79,7 +78,7 @@ private void addFnDocs(JinjavaDoc doc) {
           try {
             realMethod = (Method) realMethod.getDeclaringClass().getField("delegate").get(null);
           } catch (Exception e) {
-            throw Throwables.propagate(e);
+            throw new RuntimeException(e);
           }
         }
 
diff --git a/src/main/java/com/hubspot/jinjava/el/ext/AbstractCallableMethod.java b/src/main/java/com/hubspot/jinjava/el/ext/AbstractCallableMethod.java
@@ -22,7 +22,8 @@ public abstract class AbstractCallableMethod {
     try {
       EVAL_METHOD = AbstractCallableMethod.class.getMethod("evaluate", Object[].class);
     } catch (Exception e) {
-      throw Throwables.propagate(e);
+      Throwables.throwIfUnchecked(e);
+      throw new RuntimeException(e);
     }
   }
 
diff --git a/src/main/java/com/hubspot/jinjava/el/ext/ExtendedScanner.java b/src/main/java/com/hubspot/jinjava/el/ext/ExtendedScanner.java
@@ -4,8 +4,6 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
-import com.google.common.base.Throwables;
-
 import de.odysseus.el.tree.impl.Scanner;
 
 public class ExtendedScanner extends Scanner {
@@ -57,23 +55,23 @@ protected boolean isWhitespace(char c) {
       POSITION_FIELD = Scanner.class.getDeclaredField("position");
       POSITION_FIELD.setAccessible(true);
     } catch (NoSuchFieldException | SecurityException | NoSuchMethodException e) {
-      throw Throwables.propagate(e);
+      throw new RuntimeException(e);
     }
   }
 
   protected static void addKeyToken(Token token) {
     try {
       ADD_KEY_TOKEN_METHOD.invoke(null, token);
     } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
-      throw Throwables.propagate(e);
+      throw new RuntimeException(e);
     }
   }
 
   protected void setToken(Token token) {
     try {
       TOKEN_FIELD.set(this, token);
     } catch (IllegalArgumentException | IllegalAccessException e) {
-      throw Throwables.propagate(e);
+      throw new RuntimeException(e);
     }
   }
 
@@ -82,7 +80,7 @@ protected void incrPosition(int n) {
     try {
       POSITION_FIELD.set(this, getPosition() + n);
     } catch (IllegalArgumentException | IllegalAccessException e) {
-      throw Throwables.propagate(e);
+      throw new RuntimeException(e);
     }
   }
 
diff --git a/src/main/java/com/hubspot/jinjava/lib/SimpleLibrary.java b/src/main/java/com/hubspot/jinjava/lib/SimpleLibrary.java
@@ -71,7 +71,8 @@ public final List<T> registerClasses(Class<? extends T>... itemClass) {
 
       return instances;
     } catch (Exception e) {
-      throw Throwables.propagate(e);
+      Throwables.throwIfUnchecked(e);
+      throw new RuntimeException(e);
     }
   }
 
diff --git a/src/main/java/com/hubspot/jinjava/lib/filter/UrlEncodeFilter.java b/src/main/java/com/hubspot/jinjava/lib/filter/UrlEncodeFilter.java
@@ -9,7 +9,6 @@
 
 import org.apache.commons.lang3.StringUtils;
 
-import com.google.common.base.Throwables;
 import com.hubspot.jinjava.doc.annotations.JinjavaDoc;
 import com.hubspot.jinjava.doc.annotations.JinjavaSnippet;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
@@ -61,7 +60,7 @@ private String urlEncode(String s) {
     try {
       return URLEncoder.encode(s, "UTF-8");
     } catch (UnsupportedEncodingException e) {
-      throw Throwables.propagate(e);
+      throw new RuntimeException(e);
     }
   }
 
diff --git a/src/main/java/com/hubspot/jinjava/lib/fn/ELFunctionDefinition.java b/src/main/java/com/hubspot/jinjava/lib/fn/ELFunctionDefinition.java
@@ -23,7 +23,8 @@ private static Method resolveMethod(Class<?> methodClass, String methodName, Cla
       m.setAccessible(true);
       return m;
     } catch (Exception e) {
-      throw Throwables.propagate(e);
+      Throwables.throwIfUnchecked(e);
+      throw new RuntimeException(e);
     }
   }
 
diff --git a/src/main/java/com/hubspot/jinjava/lib/fn/InjectedContextFunctionProxy.java b/src/main/java/com/hubspot/jinjava/lib/fn/InjectedContextFunctionProxy.java
@@ -5,15 +5,15 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 
+import com.google.common.base.Throwables;
+
 import javassist.ClassPool;
 import javassist.CtClass;
 import javassist.CtField;
 import javassist.CtMethod;
 import javassist.CtNewMethod;
 import javassist.bytecode.AccessFlag;
 
-import com.google.common.base.Throwables;
-
 public class InjectedContextFunctionProxy {
 
   public static ELFunctionDefinition defineProxy(String namespace, String name, Method m, Object injectedInstance)
@@ -69,7 +69,8 @@ public static ELFunctionDefinition defineProxy(String namespace, String name, Me
       return new ELFunctionDefinition(namespace, name, staticMethod);
     } catch (Throwable e) {
       ENGINE_LOG.error("Error creating injected context function", e);
-      throw Throwables.propagate(e);
+      Throwables.throwIfUnchecked(e);
+      throw new RuntimeException(e);
     }
   }
 
diff --git a/src/test/java/com/hubspot/jinjava/el/ExtendedSyntaxBuilderTest.java b/src/test/java/com/hubspot/jinjava/el/ExtendedSyntaxBuilderTest.java
@@ -13,7 +13,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.google.common.base.Throwables;
 import com.google.common.collect.Lists;
 import com.google.common.io.Resources;
 import com.hubspot.jinjava.Jinjava;
@@ -213,7 +212,7 @@ private String fixture(String name) {
       return Resources.toString(
           Resources.getResource(String.format("el/dict/%s.fixture", name)), StandardCharsets.UTF_8);
     } catch (IOException e) {
-      throw Throwables.propagate(e);
+      throw new RuntimeException(e);
     }
   }
 
diff --git a/src/test/java/com/hubspot/jinjava/lib/filter/BatchFilterTest.java b/src/test/java/com/hubspot/jinjava/lib/filter/BatchFilterTest.java
@@ -11,7 +11,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.common.io.Resources;
@@ -68,7 +67,7 @@ private String render(String template, Map<String, Object> context) {
     try {
       return jinjava.render(Resources.toString(Resources.getResource(String.format("filter/%s.jinja", template)), StandardCharsets.UTF_8), context);
     } catch (Exception e) {
-      throw Throwables.propagate(e);
+      throw new RuntimeException(e);
     }
   }
 
diff --git a/src/test/java/com/hubspot/jinjava/lib/filter/TruncateHtmlFilterTest.java b/src/test/java/com/hubspot/jinjava/lib/filter/TruncateHtmlFilterTest.java
@@ -1,15 +1,14 @@
 package com.hubspot.jinjava.lib.filter;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.*;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 
 import org.junit.Before;
 import org.junit.Test;
 
-import com.google.common.base.Throwables;
 import com.google.common.io.Resources;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
 
@@ -43,7 +42,7 @@ private static String fixture(String name) {
     try {
       return Resources.toString(Resources.getResource(name), StandardCharsets.UTF_8);
     } catch (IOException e) {
-      throw Throwables.propagate(e);
+      throw new RuntimeException(e);
     }
   }
 }
diff --git a/src/test/java/com/hubspot/jinjava/lib/tag/CallTagTest.java b/src/test/java/com/hubspot/jinjava/lib/tag/CallTagTest.java
@@ -11,7 +11,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.google.common.base.Throwables;
 import com.google.common.io.Resources;
 import com.hubspot.jinjava.Jinjava;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
@@ -42,7 +41,7 @@ private String fixture(String name) {
     try {
       return Resources.toString(Resources.getResource(String.format("tags/calltag/%s.jinja", name)), StandardCharsets.UTF_8);
     } catch (IOException e) {
-      throw Throwables.propagate(e);
+      throw new RuntimeException(e);
     }
   }
 
diff --git a/src/test/java/com/hubspot/jinjava/lib/tag/FromTagTest.java b/src/test/java/com/hubspot/jinjava/lib/tag/FromTagTest.java
@@ -11,7 +11,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.google.common.base.Throwables;
 import com.google.common.io.Resources;
 import com.hubspot.jinjava.Jinjava;
 import com.hubspot.jinjava.interpret.Context;
@@ -75,7 +74,7 @@ private String fixture(String name) {
       return interpreter.renderFlat(Resources.toString(
           Resources.getResource(String.format("tags/macrotag/%s.jinja", name)), StandardCharsets.UTF_8));
     } catch (IOException e) {
-      throw Throwables.propagate(e);
+      throw new RuntimeException(e);
     }
   }
 
diff --git a/src/test/java/com/hubspot/jinjava/lib/tag/IfTagTest.java b/src/test/java/com/hubspot/jinjava/lib/tag/IfTagTest.java
@@ -12,7 +12,6 @@
 import org.mockito.InjectMocks;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import com.google.common.base.Throwables;
 import com.google.common.collect.Lists;
 import com.google.common.io.Resources;
 import com.hubspot.jinjava.Jinjava;
@@ -131,7 +130,7 @@ private TagNode fixture(String name) {
           Resources.getResource(String.format("tags/iftag/%s.jinja", name)), StandardCharsets.UTF_8))
           .buildTree().getChildren().getFirst();
     } catch (IOException e) {
-      throw Throwables.propagate(e);
+      throw new RuntimeException(e);
     }
   }
 
diff --git a/src/test/java/com/hubspot/jinjava/lib/tag/ImportTagTest.java b/src/test/java/com/hubspot/jinjava/lib/tag/ImportTagTest.java
@@ -11,7 +11,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.google.common.base.Throwables;
 import com.google.common.io.Resources;
 import com.hubspot.jinjava.Jinjava;
 import com.hubspot.jinjava.interpret.Context;
@@ -107,7 +106,7 @@ private String fixture(String name) {
       return interpreter.renderFlat(Resources.toString(
           Resources.getResource(String.format("tags/macrotag/%s.jinja", name)), StandardCharsets.UTF_8));
     } catch (IOException e) {
-      throw Throwables.propagate(e);
+      throw new RuntimeException(e);
     }
   }
 
diff --git a/src/test/java/com/hubspot/jinjava/lib/tag/MacroTagTest.java b/src/test/java/com/hubspot/jinjava/lib/tag/MacroTagTest.java
@@ -15,7 +15,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.common.io.Resources;
@@ -197,7 +196,7 @@ private String fixtureText(String name) {
     try {
       return Resources.toString(Resources.getResource(String.format("tags/macrotag/%s.jinja", name)), StandardCharsets.UTF_8);
     } catch (IOException e) {
-      throw Throwables.propagate(e);
+      throw new RuntimeException(e);
     }
   }
 
diff --git a/src/test/java/com/hubspot/jinjava/lib/tag/RawTagTest.java b/src/test/java/com/hubspot/jinjava/lib/tag/RawTagTest.java
@@ -11,7 +11,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.google.common.base.Throwables;
 import com.google.common.io.Resources;
 import com.hubspot.jinjava.Jinjava;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
@@ -103,7 +102,7 @@ private LinkedList<Node> fixtures(String name) {
           Resources.getResource(String.format("tags/rawtag/%s.jinja", name)), StandardCharsets.UTF_8))
           .buildTree().getChildren();
     } catch (IOException e) {
-      throw Throwables.propagate(e);
+      throw new RuntimeException(e);
     }
   }
 
diff --git a/src/test/java/com/hubspot/jinjava/lib/tag/SetTagTest.java b/src/test/java/com/hubspot/jinjava/lib/tag/SetTagTest.java
@@ -15,7 +15,6 @@
 import org.mockito.InjectMocks;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import com.google.common.base.Throwables;
 import com.google.common.collect.Lists;
 import com.google.common.io.Resources;
 import com.hubspot.jinjava.Jinjava;
@@ -200,7 +199,7 @@ private Node fixture(String name) {
           Resources.getResource(String.format("tags/settag/%s.jinja", name)), StandardCharsets.UTF_8))
               .buildTree().getChildren().getFirst();
     } catch (IOException e) {
-      throw Throwables.propagate(e);
+      throw new RuntimeException(e);
     }
   }
 
diff --git a/src/test/java/com/hubspot/jinjava/lib/tag/UnlessTagTest.java b/src/test/java/com/hubspot/jinjava/lib/tag/UnlessTagTest.java
@@ -8,7 +8,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.google.common.base.Throwables;
 import com.google.common.io.Resources;
 import com.hubspot.jinjava.Jinjava;
 import com.hubspot.jinjava.interpret.Context;
@@ -51,7 +50,7 @@ private TagNode fixture(String name) {
           Resources.getResource(String.format("tags/iftag/%s.jinja", name)), StandardCharsets.UTF_8))
           .buildTree().getChildren().getFirst();
     } catch (IOException e) {
-      throw Throwables.propagate(e);
+      throw new RuntimeException(e);
     }
   }
 
diff --git a/src/test/java/com/hubspot/jinjava/tree/ExpressionNodeTest.java b/src/test/java/com/hubspot/jinjava/tree/ExpressionNodeTest.java
@@ -8,7 +8,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.google.common.base.Throwables;
 import com.google.common.io.Resources;
 import com.hubspot.jinjava.Jinjava;
 import com.hubspot.jinjava.JinjavaConfig;
@@ -198,7 +197,7 @@ private ExpressionNode fixture(String name) {
     try {
       return parse(Resources.toString(Resources.getResource(String.format("varblocks/%s.html", name)), StandardCharsets.UTF_8));
     } catch (Exception e) {
-      throw Throwables.propagate(e);
+      throw new RuntimeException(e);
     }
   }
 
diff --git a/src/test/java/com/hubspot/jinjava/tree/TreeParserTest.java b/src/test/java/com/hubspot/jinjava/tree/TreeParserTest.java
@@ -7,7 +7,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.google.common.base.Throwables;
 import com.google.common.io.Resources;
 import com.hubspot.jinjava.Jinjava;
 import com.hubspot.jinjava.JinjavaConfig;
@@ -92,7 +91,7 @@ Node parse(String fixture) {
       return new TreeParser(interpreter, Resources.toString(
           Resources.getResource(fixture), StandardCharsets.UTF_8)).buildTree();
     } catch (Exception e) {
-      throw Throwables.propagate(e);
+      throw new RuntimeException(e);
     }
   }
 
diff --git a/src/test/java/com/hubspot/jinjava/tree/parse/TokenWhitespaceTest.java b/src/test/java/com/hubspot/jinjava/tree/parse/TokenWhitespaceTest.java
@@ -8,7 +8,6 @@
 
 import org.junit.Test;
 
-import com.google.common.base.Throwables;
 import com.google.common.collect.Lists;
 import com.google.common.io.Resources;
 import com.hubspot.jinjava.JinjavaConfig;
@@ -26,7 +25,7 @@ private List<Token> scanTokens(String srcPath, JinjavaConfig config) {
       return Lists.newArrayList(new TokenScanner(
           Resources.toString(Resources.getResource(srcPath), StandardCharsets.UTF_8), config));
     } catch (IOException e) {
-      throw Throwables.propagate(e);
+      throw new RuntimeException(e);
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@`
`9`	`9`	`import org.slf4j.Logger;`
`10`	`10`	`import org.slf4j.LoggerFactory;`
`11`	`11`
`12`		`-import com.google.common.base.Throwables;`
`13`	`12`	`import com.hubspot.jinjava.Jinjava;`
`14`	`13`	`import com.hubspot.jinjava.doc.annotations.JinjavaMetaValue;`
`15`	`14`	`import com.hubspot.jinjava.doc.annotations.JinjavaParam;`
`@@ -79,7 +78,7 @@ private void addFnDocs(JinjavaDoc doc) {`
`79`	`78`	`try {`
`80`	`79`	`realMethod = (Method) realMethod.getDeclaringClass().getField("delegate").get(null);`
`81`	`80`	`} catch (Exception e) {`
`82`		`- throw Throwables.propagate(e);`
	`81`	`+ throw new RuntimeException(e);`
`83`	`82`	`}`
`84`	`83`	`}`
`85`	`84`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,8 @@ public abstract class AbstractCallableMethod {`
`22`	`22`	`try {`
`23`	`23`	`EVAL_METHOD = AbstractCallableMethod.class.getMethod("evaluate", Object[].class);`
`24`	`24`	`} catch (Exception e) {`
`25`		`- throw Throwables.propagate(e);`
	`25`	`+ Throwables.throwIfUnchecked(e);`
	`26`	`+ throw new RuntimeException(e);`
`26`	`27`	`}`
`27`	`28`	`}`
`28`	`29`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,6 @@`
`4`	`4`	`import java.lang.reflect.InvocationTargetException;`
`5`	`5`	`import java.lang.reflect.Method;`
`6`	`6`
`7`		`-import com.google.common.base.Throwables;`
`8`		`-`
`9`	`7`	`import de.odysseus.el.tree.impl.Scanner;`
`10`	`8`
`11`	`9`	`public class ExtendedScanner extends Scanner {`
`@@ -57,23 +55,23 @@ protected boolean isWhitespace(char c) {`
`57`	`55`	`POSITION_FIELD = Scanner.class.getDeclaredField("position");`
`58`	`56`	`POSITION_FIELD.setAccessible(true);`
`59`	`57`	`} catch (NoSuchFieldException \| SecurityException \| NoSuchMethodException e) {`
`60`		`- throw Throwables.propagate(e);`
	`58`	`+ throw new RuntimeException(e);`
`61`	`59`	`}`
`62`	`60`	`}`
`63`	`61`
`64`	`62`	`protected static void addKeyToken(Token token) {`
`65`	`63`	`try {`
`66`	`64`	`ADD_KEY_TOKEN_METHOD.invoke(null, token);`
`67`	`65`	`} catch (IllegalAccessException \| IllegalArgumentException \| InvocationTargetException e) {`
`68`		`- throw Throwables.propagate(e);`
	`66`	`+ throw new RuntimeException(e);`
`69`	`67`	`}`
`70`	`68`	`}`
`71`	`69`
`72`	`70`	`protected void setToken(Token token) {`
`73`	`71`	`try {`
`74`	`72`	`TOKEN_FIELD.set(this, token);`
`75`	`73`	`} catch (IllegalArgumentException \| IllegalAccessException e) {`
`76`		`- throw Throwables.propagate(e);`
	`74`	`+ throw new RuntimeException(e);`
`77`	`75`	`}`
`78`	`76`	`}`
`79`	`77`
`@@ -82,7 +80,7 @@ protected void incrPosition(int n) {`
`82`	`80`	`try {`
`83`	`81`	`POSITION_FIELD.set(this, getPosition() + n);`
`84`	`82`	`} catch (IllegalArgumentException \| IllegalAccessException e) {`
`85`		`- throw Throwables.propagate(e);`
	`83`	`+ throw new RuntimeException(e);`
`86`	`84`	`}`
`87`	`85`	`}`
`88`	`86`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,8 @@ public final List<T> registerClasses(Class<? extends T>... itemClass) {`
`71`	`71`
`72`	`72`	`return instances;`
`73`	`73`	`} catch (Exception e) {`
`74`		`- throw Throwables.propagate(e);`
	`74`	`+ Throwables.throwIfUnchecked(e);`
	`75`	`+ throw new RuntimeException(e);`
`75`	`76`	`}`
`76`	`77`	`}`
`77`	`78`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,8 @@ private static Method resolveMethod(Class<?> methodClass, String methodName, Cla`
`23`	`23`	`m.setAccessible(true);`
`24`	`24`	`return m;`
`25`	`25`	`} catch (Exception e) {`
`26`		`- throw Throwables.propagate(e);`
	`26`	`+ Throwables.throwIfUnchecked(e);`
	`27`	`+ throw new RuntimeException(e);`
`27`	`28`	`}`
`28`	`29`	`}`
`29`	`30`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@`
`13`	`13`	`import org.junit.Before;`
`14`	`14`	`import org.junit.Test;`
`15`	`15`
`16`		`-import com.google.common.base.Throwables;`
`17`	`16`	`import com.google.common.collect.Lists;`
`18`	`17`	`import com.google.common.io.Resources;`
`19`	`18`	`import com.hubspot.jinjava.Jinjava;`
`@@ -213,7 +212,7 @@ private String fixture(String name) {`
`213`	`212`	`return Resources.toString(`
`214`	`213`	`Resources.getResource(String.format("el/dict/%s.fixture", name)), StandardCharsets.UTF_8);`
`215`	`214`	`} catch (IOException e) {`
`216`		`- throw Throwables.propagate(e);`
	`215`	`+ throw new RuntimeException(e);`
`217`	`216`	`}`
`218`	`217`	`}`
`219`	`218`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@`
`11`	`11`	`import org.junit.Before;`
`12`	`12`	`import org.junit.Test;`
`13`	`13`
`14`		`-import com.google.common.base.Throwables;`
`15`	`14`	`import com.google.common.collect.ImmutableMap;`
`16`	`15`	`import com.google.common.collect.Lists;`
`17`	`16`	`import com.google.common.io.Resources;`
`@@ -68,7 +67,7 @@ private String render(String template, Map<String, Object> context) {`
`68`	`67`	`try {`
`69`	`68`	`return jinjava.render(Resources.toString(Resources.getResource(String.format("filter/%s.jinja", template)), StandardCharsets.UTF_8), context);`
`70`	`69`	`} catch (Exception e) {`
`71`		`- throw Throwables.propagate(e);`
	`70`	`+ throw new RuntimeException(e);`
`72`	`71`	`}`
`73`	`72`	`}`
`74`	`73`