cleanup uses of deprecated Guava APIs

Author: mikesamuel

src/main/java/org/owasp/html/AutoCloseableHtmlStreamRenderer.java

@@ -7,8 +7,6 @@
 
 import javax.annotation.WillCloseWhenClosed;
 
-import com.google.common.base.Throwables;
-
 final class AutoCloseableHtmlStreamRenderer extends HtmlStreamRenderer
   // This is available on JDK6 and makes this class extend AutoCloseable.
   implements Closeable {
@@ -83,8 +81,10 @@ static void closeIfAnyCloseable(Object closeable) throws IOException {
         Throwable tgt = ex.getTargetException();
         if (tgt instanceof IOException) {
           throw (IOException) tgt;
+        } else if (tgt instanceof RuntimeException) {
+          throw (RuntimeException) tgt;
         } else {
-          Throwables.propagate(tgt);
+          throw new AssertionError(null, tgt);
         }
       }
     }

src/main/java/org/owasp/html/Handler.java

@@ -28,8 +28,6 @@
 
 package org.owasp.html;
 
-import com.google.common.base.Throwables;
-
 /**
  * Receives notification of problems.
  *
@@ -57,7 +55,11 @@ public void handle(Object x) {
    */
   public static final Handler<Throwable> PROPAGATE = new Handler<Throwable>() {
     public void handle(Throwable th) {
-      Throwables.propagate(th);
+      if (th instanceof RuntimeException) {
+        throw (RuntimeException) th;
+      } else {
+        throw new AssertionError(null, th);
+      }
     }
   };
 }

src/main/java/org/owasp/html/examples/EbayPolicyExample.java

@@ -40,7 +40,6 @@
 
 import com.google.common.base.Charsets;
 import com.google.common.base.Predicate;
-import com.google.common.base.Throwables;
 import com.google.common.io.CharStreams;
 
 /**
@@ -217,7 +216,8 @@ public static void main(String[] args) throws IOException {
         // Receives notifications on a failure to write to the output.
         new Handler<IOException>() {
           public void handle(IOException ex) {
-            Throwables.propagate(ex);  // System.out suppresses IOExceptions
+            // System.out suppresses IOExceptions
+            throw new AssertionError(null, ex);
           }
         },
         // Our HTML parser is very lenient, but this receives notifications on
@@ -242,7 +242,7 @@ public boolean apply(String s) {
       // java.util.function.Predicate.
       // For some reason the default test method implementation that calls
       // through to apply is not assumed here.
-      @SuppressWarnings("unused")
+      @SuppressWarnings("all")
       public boolean test(String s) {
         return apply(s);
       }

src/main/java/org/owasp/html/examples/SlashdotPolicyExample.java

@@ -40,7 +40,6 @@
 
 import com.google.common.base.Charsets;
 import com.google.common.base.Function;
-import com.google.common.base.Throwables;
 import com.google.common.io.CharStreams;
 
 /**
@@ -108,7 +107,8 @@ public static void main(String[] args) throws IOException {
         // Receives notifications on a failure to write to the output.
         new Handler<IOException>() {
           public void handle(IOException ex) {
-            Throwables.propagate(ex);  // System.out suppresses IOExceptions
+            // System.out suppresses IOExceptions
+            throw new AssertionError(null, ex);
           }
         },
         // Our HTML parser is very lenient, but this receives notifications on

src/test/java/org/owasp/html/Benchmark.java

@@ -59,7 +59,7 @@ public class Benchmark {
    * specifies a benchmark to run and unspecified ones are not run.
    */
   public static void main(String[] args) throws Exception {
-    String html = Files.toString(new File(args[0]), Charsets.UTF_8);
+    String html = Files.asCharSource(new File(args[0]), Charsets.UTF_8).read();
 
     boolean timeLibhtmlparser = true;
     boolean timeSanitize = true;

src/test/java/org/owasp/html/ExamplesTest.java

@@ -34,8 +34,6 @@
 import java.io.PrintStream;
 import java.lang.reflect.Method;
 
-import com.google.common.base.Throwables;
-
 import org.junit.Test;
 import org.owasp.html.examples.EbayPolicyExample;
 
@@ -66,7 +64,11 @@ public static final void testExamplesRun() throws Exception {
         System.err.println(
             "Example " + exampleClass.getSimpleName() + "\n"
             + captured.toString("UTF-8"));
-        Throwables.propagate(ex);
+        if (ex instanceof RuntimeException) {
+          throw (RuntimeException) ex;
+        } else {
+          throw new AssertionError(null, ex);
+        }
       } finally {
         System.setIn(stdin);
         System.setOut(stdout);

src/test/java/org/owasp/html/HtmlSanitizerFuzzerTest.java

@@ -34,7 +34,6 @@
 import java.util.concurrent.TimeUnit;
 
 import com.google.common.base.Charsets;
-import com.google.common.base.Throwables;
 import com.google.common.io.Resources;
 
 /**
@@ -144,7 +143,11 @@ public void run() {
     assertTrue("seed=" + seed, executor.isTerminated());
     Throwable failure = failures.poll();
     if (failure != null) {
-      Throwables.propagate(failure);
+      if (failure instanceof RuntimeException) {
+        throw (RuntimeException) failure;
+      } else {
+        throw new AssertionError(null, failure);
+      }
     }
   }