Replace Throwables.propagate and variants with Guava 20 versions

-------------
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

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);
}
}