Guava 25.1 #fix 933

jknack · jknack · commit 00892a49d4ca · 2018-06-27T13:59:13.000-03:00
diff --git a/jooby/src/main/java/org/jooby/internal/ssl/SslContextProvider.java b/jooby/src/main/java/org/jooby/internal/ssl/SslContextProvider.java
@@ -203,8 +203,13 @@
  */
 package org.jooby.internal.ssl;
 
+import com.typesafe.config.Config;
 import static java.util.Objects.requireNonNull;
+import org.jooby.funzy.Try;
 
+import javax.inject.Inject;
+import javax.inject.Provider;
+import javax.net.ssl.SSLContext;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -213,13 +218,6 @@
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.net.ssl.SSLContext;
-
-import com.google.common.base.Throwables;
-import com.typesafe.config.Config;
-
 public class SslContextProvider implements Provider<SSLContext> {
 
   private Config conf;
@@ -231,7 +229,7 @@ public SslContextProvider(final Config conf) {
 
   @Override
   public SSLContext get() {
-    try {
+    return Try.apply(() -> {
       String tmpdir = conf.getString("application.tmpdir");
       File keyStoreCert = toFile(conf.getString("ssl.keystore.cert"), tmpdir);
       File keyStoreKey = toFile(conf.getString("ssl.keystore.key"), tmpdir);
@@ -245,9 +243,7 @@ public SSLContext get() {
           .newServerContextInternal(trustCert, keyStoreCert, keyStoreKey, keyStorePass,
               conf.getLong("ssl.session.cacheSize"), conf.getLong("ssl.session.timeout"))
           .context();
-    } catch (IOException ex) {
-      throw Throwables.propagate(ex);
-    }
+    }).get();
   }
 
   private File toFile(final String path, final String tmpdir) throws IOException {
diff --git a/jooby/src/test/java/org/jooby/test/Client.java b/jooby/src/test/java/org/jooby/test/Client.java
@@ -1,6 +1,5 @@
 package org.jooby.test;
 
-import com.google.common.base.Throwables;
 import org.apache.http.Header;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpRequest;
@@ -22,6 +21,7 @@
 import org.apache.http.protocol.HttpContext;
 import org.apache.http.ssl.SSLContexts;
 import org.apache.http.util.EntityUtils;
+import org.jooby.funzy.Try;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -383,15 +383,13 @@ public Request head(final String path) {
   private Executor executor() {
     if (executor == null) {
       if (this.host.startsWith("https://")) {
-        try {
+        Try.run(() -> {
           SSLContext sslContext = SSLContexts.custom()
               .loadTrustMaterial(null, (chain, authType) -> true)
               .build();
           builder.setSSLContext(sslContext);
           builder.setSSLHostnameVerifier(NoopHostnameVerifier.INSTANCE);
-        } catch (Exception ex) {
-          Throwables.propagate(ex);
-        }
+        }).throwException();
       }
       client = builder.build();
       executor = Executor.newInstance(client);
diff --git a/jooby/src/test/java/org/jooby/test/MockUnit.java b/jooby/src/test/java/org/jooby/test/MockUnit.java
@@ -1,8 +1,15 @@
 package org.jooby.test;
 
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.Multimap;
+import com.google.common.primitives.Primitives;
 import static java.util.Objects.requireNonNull;
+import org.easymock.Capture;
+import org.easymock.EasyMock;
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.createStrictMock;
+import org.jooby.funzy.Try;
+import org.powermock.api.easymock.PowerMock;
 
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
@@ -14,15 +21,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.easymock.Capture;
-import org.easymock.EasyMock;
-import org.powermock.api.easymock.PowerMock;
-
-import com.google.common.base.Throwables;
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.Multimap;
-import com.google.common.primitives.Primitives;
-
 /**
  * Utility test class for mocks. Internal use only.
  *
@@ -213,27 +211,16 @@ public MockUnit expect(final Block block) {
   public MockUnit run(final Block... blocks) throws Exception {
 
     for (Block block : this.blocks) {
-      try {
-        block.run(this);
-      } catch (Exception | AssertionError ex) {
-        throw ex;
-      } catch (Throwable ex) {
-        Throwables.propagate(ex);
-      }
+      Try.run(() -> block.run(this))
+          .throwException();
     }
 
     mockClasses.forEach(PowerMock::replay);
     partialMocks.forEach(PowerMock::replay);
     mocks.forEach(EasyMock::replay);
 
     for (Block main : blocks) {
-      try {
-        main.run(this);
-      } catch (Exception | AssertionError ex) {
-        throw ex;
-      } catch (Throwable ex) {
-        Throwables.propagate(ex);
-      }
+      Try.run(() -> main.run(this)).throwException();
     }
 
     mocks.forEach(EasyMock::verify);
diff --git a/modules/jooby-assets-nodejs/src/main/java/org/jooby/assets/Nodejs.java b/modules/jooby-assets-nodejs/src/main/java/org/jooby/assets/Nodejs.java
@@ -206,7 +206,6 @@
 import com.eclipsesource.v8.NodeJS;
 import com.eclipsesource.v8.V8;
 import com.eclipsesource.v8.utils.MemoryManager;
-import com.google.common.base.Throwables;
 import com.google.common.collect.Maps;
 import static java.util.Objects.requireNonNull;
 import org.jooby.Route;
@@ -451,12 +450,8 @@ public static void run(final Throwing.Consumer<Nodejs> callback) {
    */
   public static void run(final File basedir, final Throwing.Consumer<Nodejs> callback) {
     Nodejs node = new Nodejs(basedir);
-    try {
-      callback.accept(node);
-    } catch (Throwable x) {
-      throw Throwables.propagate(x);
-    } finally {
-      node.release();
-    }
+    Try.run(() -> callback.accept(node))
+        .onComplete(node::release)
+        .throwException();
   }
 }
diff --git a/pom.xml b/pom.xml
@@ -3052,7 +3052,7 @@ org.eclipse.jdt.apt.processorOptions/defaultOverwrite=true
     <funzy.version>0.1.0</funzy.version>
     <groovy.version>2.4.7</groovy.version>
     <gson.version>2.8.2</gson.version>
-    <guava.version>21.0</guava.version> <!-- TODO: upgrade to =< 24.1.1 -->
+    <guava.version>25.1-jre</guava.version>
     <guice.version>4.2.0</guice.version>
     <h2.version>1.4.196</h2.version>
     <handlebars.version>4.0.7</handlebars.version>
