zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-28 16:30:12 +02:00
Code Issues Projects Releases Packages Wiki Activity

Replace Throwables.propagate and variants with Guava 20 versions

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=146250470
This commit is contained in:
cgoldfeder 2017-02-01 09:11:42 -08:00 • committed by Ben McIlwain
parent a061f74ee7
commit e2e37dc9f3
8 changed files with 25 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

8
javatests/google/registry/server/ServletWrapperDelegatorServlet.java
View file

@ -15,9 +15,9 @@
package google.registry.server;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Throwables.throwIfInstanceOf;
import static google.registry.util.TypeUtils.instantiate;
import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.util.concurrent.Uninterruptibles;
import java.io.IOException;
@ -86,9 +86,9 @@ public final class ServletWrapperDelegatorServlet extends HttpServlet {
try {
Uninterruptibles.getUninterruptibly(task);
} catch (ExecutionException e) {
Throwables.propagateIfInstanceOf(e.getCause(), ServletException.class);
Throwables.propagateIfInstanceOf(e.getCause(), IOException.class);
throw Throwables.propagate(e.getCause());
throwIfInstanceOf(e.getCause(), ServletException.class);
throwIfInstanceOf(e.getCause(), IOException.class);
throw new RuntimeException(e.getCause());
}
}
}

8
javatests/google/registry/server/TestServer.java
View file

@ -15,10 +15,10 @@
package google.registry.server;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Throwables.throwIfUnchecked;
import static com.google.common.util.concurrent.Runnables.doNothing;
import static google.registry.util.NetworkUtils.getCanonicalHostName;
import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.net.HostAndPort;
import com.google.common.util.concurrent.SimpleTimeLimiter;
@ -97,7 +97,8 @@ public final class TestServer {
try {
server.start();
} catch (Exception e) {
throw Throwables.propagate(e);
throwIfUnchecked(e);
throw new RuntimeException(e);
}
UrlChecker.waitUntilAvailable(getUrl("/healthz"), STARTUP_TIMEOUT_MS);
}
@ -135,7 +136,8 @@ public final class TestServer {
}
}, SHUTDOWN_TIMEOUT_MS, TimeUnit.MILLISECONDS, true);
} catch (Exception e) {
throw Throwables.propagate(e);
throwIfUnchecked(e);
throw new RuntimeException(e);
}
}

6
javatests/google/registry/server/UrlChecker.java
View file

@ -14,7 +14,8 @@
package google.registry.server;
import com.google.common.base.Throwables;
import static com.google.common.base.Throwables.throwIfUnchecked;
import com.google.common.util.concurrent.SimpleTimeLimiter;
import java.io.IOException;
import java.net.HttpURLConnection;
@ -45,7 +46,8 @@ final class UrlChecker {
}
}, timeoutMs, TimeUnit.MILLISECONDS, true);
} catch (Exception e) {
throw Throwables.propagate(e);
throwIfUnchecked(e);
throw new RuntimeException(e);
}
}