Skip to content

Commit 00892a4

Browse files
jknackjknack
committed
Guava 25.1 #fix 933
1 parent a48faed commit 00892a4

5 files changed

Lines changed: 24 additions & 48 deletions

File tree

‎jooby/src/main/java/org/jooby/internal/ssl/SslContextProvider.java‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,13 @@
203203
*/
204204
package org.jooby.internal.ssl;
205205

206+
import com.typesafe.config.Config;
206207
import static java.util.Objects.requireNonNull;
208+
import org.jooby.funzy.Try;
207209

210+
import javax.inject.Inject;
211+
import javax.inject.Provider;
212+
import javax.net.ssl.SSLContext;
208213
import java.io.File;
209214
import java.io.FileNotFoundException;
210215
import java.io.IOException;
@@ -213,13 +218,6 @@
213218
import java.nio.file.Paths;
214219
import java.nio.file.StandardCopyOption;
215220

216-
import javax.inject.Inject;
217-
import javax.inject.Provider;
218-
import javax.net.ssl.SSLContext;
219-
220-
import com.google.common.base.Throwables;
221-
import com.typesafe.config.Config;
222-
223221
public class SslContextProvider implements Provider<SSLContext> {
224222

225223
private Config conf;
@@ -231,7 +229,7 @@ public SslContextProvider(final Config conf) {
231229

232230
@Override
233231
public SSLContext get() {
234-
try {
232+
return Try.apply(() -> {
235233
String tmpdir = conf.getString("application.tmpdir");
236234
File keyStoreCert = toFile(conf.getString("ssl.keystore.cert"), tmpdir);
237235
File keyStoreKey = toFile(conf.getString("ssl.keystore.key"), tmpdir);
@@ -245,9 +243,7 @@ public SSLContext get() {
245243
.newServerContextInternal(trustCert, keyStoreCert, keyStoreKey, keyStorePass,
246244
conf.getLong("ssl.session.cacheSize"), conf.getLong("ssl.session.timeout"))
247245
.context();
248-
} catch (IOException ex) {
249-
throw Throwables.propagate(ex);
250-
}
246+
}).get();
251247
}
252248

253249
private File toFile(final String path, final String tmpdir) throws IOException {

‎jooby/src/test/java/org/jooby/test/Client.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.jooby.test;
22

3-
import com.google.common.base.Throwables;
43
import org.apache.http.Header;
54
import org.apache.http.HttpEntity;
65
import org.apache.http.HttpRequest;
@@ -22,6 +21,7 @@
2221
import org.apache.http.protocol.HttpContext;
2322
import org.apache.http.ssl.SSLContexts;
2423
import org.apache.http.util.EntityUtils;
24+
import org.jooby.funzy.Try;
2525
import static org.junit.Assert.assertArrayEquals;
2626
import static org.junit.Assert.assertEquals;
2727
import static org.junit.Assert.assertNull;
@@ -383,15 +383,13 @@ public Request head(final String path) {
383383
private Executor executor() {
384384
if (executor == null) {
385385
if (this.host.startsWith("https://")) {
386-
try {
386+
Try.run(() -> {
387387
SSLContext sslContext = SSLContexts.custom()
388388
.loadTrustMaterial(null, (chain, authType) -> true)
389389
.build();
390390
builder.setSSLContext(sslContext);
391391
builder.setSSLHostnameVerifier(NoopHostnameVerifier.INSTANCE);
392-
} catch (Exception ex) {
393-
Throwables.propagate(ex);
394-
}
392+
}).throwException();
395393
}
396394
client = builder.build();
397395
executor = Executor.newInstance(client);

‎jooby/src/test/java/org/jooby/test/MockUnit.java‎

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
package org.jooby.test;
22

3+
import com.google.common.collect.ArrayListMultimap;
4+
import com.google.common.collect.Multimap;
5+
import com.google.common.primitives.Primitives;
36
import static java.util.Objects.requireNonNull;
7+
import org.easymock.Capture;
8+
import org.easymock.EasyMock;
49
import static org.easymock.EasyMock.createMock;
510
import static org.easymock.EasyMock.createStrictMock;
11+
import org.jooby.funzy.Try;
12+
import org.powermock.api.easymock.PowerMock;
613

714
import java.lang.reflect.Modifier;
815
import java.util.ArrayList;
@@ -14,15 +21,6 @@
1421
import java.util.Map;
1522
import java.util.Set;
1623

17-
import org.easymock.Capture;
18-
import org.easymock.EasyMock;
19-
import org.powermock.api.easymock.PowerMock;
20-
21-
import com.google.common.base.Throwables;
22-
import com.google.common.collect.ArrayListMultimap;
23-
import com.google.common.collect.Multimap;
24-
import com.google.common.primitives.Primitives;
25-
2624
/**
2725
* Utility test class for mocks. Internal use only.
2826
*
@@ -213,27 +211,16 @@ public MockUnit expect(final Block block) {
213211
public MockUnit run(final Block... blocks) throws Exception {
214212

215213
for (Block block : this.blocks) {
216-
try {
217-
block.run(this);
218-
} catch (Exception | AssertionError ex) {
219-
throw ex;
220-
} catch (Throwable ex) {
221-
Throwables.propagate(ex);
222-
}
214+
Try.run(() -> block.run(this))
215+
.throwException();
223216
}
224217

225218
mockClasses.forEach(PowerMock::replay);
226219
partialMocks.forEach(PowerMock::replay);
227220
mocks.forEach(EasyMock::replay);
228221

229222
for (Block main : blocks) {
230-
try {
231-
main.run(this);
232-
} catch (Exception | AssertionError ex) {
233-
throw ex;
234-
} catch (Throwable ex) {
235-
Throwables.propagate(ex);
236-
}
223+
Try.run(() -> main.run(this)).throwException();
237224
}
238225

239226
mocks.forEach(EasyMock::verify);

‎modules/jooby-assets-nodejs/src/main/java/org/jooby/assets/Nodejs.java‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,6 @@
206206
import com.eclipsesource.v8.NodeJS;
207207
import com.eclipsesource.v8.V8;
208208
import com.eclipsesource.v8.utils.MemoryManager;
209-
import com.google.common.base.Throwables;
210209
import com.google.common.collect.Maps;
211210
import static java.util.Objects.requireNonNull;
212211
import org.jooby.Route;
@@ -451,12 +450,8 @@ public static void run(final Throwing.Consumer<Nodejs> callback) {
451450
*/
452451
public static void run(final File basedir, final Throwing.Consumer<Nodejs> callback) {
453452
Nodejs node = new Nodejs(basedir);
454-
try {
455-
callback.accept(node);
456-
} catch (Throwable x) {
457-
throw Throwables.propagate(x);
458-
} finally {
459-
node.release();
460-
}
453+
Try.run(() -> callback.accept(node))
454+
.onComplete(node::release)
455+
.throwException();
461456
}
462457
}

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3052,7 +3052,7 @@ org.eclipse.jdt.apt.processorOptions/defaultOverwrite=true
30523052
<funzy.version>0.1.0</funzy.version>
30533053
<groovy.version>2.4.7</groovy.version>
30543054
<gson.version>2.8.2</gson.version>
3055-
<guava.version>21.0</guava.version> <!-- TODO: upgrade to =< 24.1.1 -->
3055+
<guava.version>25.1-jre</guava.version>
30563056
<guice.version>4.2.0</guice.version>
30573057
<h2.version>1.4.196</h2.version>
30583058
<handlebars.version>4.0.7</handlebars.version>

0 commit comments

Comments
 (0)