From 2dfffba1ee2a35d6aaf6b95787b735841f630a5f Mon Sep 17 00:00:00 2001 From: kak Date: Mon, 2 May 2016 11:57:40 -0700 Subject: [PATCH] Inline remaining usages of Throwables.propagate. We are removing all calls in preparation for deleting the method. More information: [] Tested: $ [] test //third_party/java_src/gtld/javatests/google/registry/bigquery:BigqueryUtilsTest //third_party/java_src/gtld/javatests/google/registry/cron:CommitLogFanoutActionTest //third_party/java_src/gtld/javatests/google/registry/dns:ReadDnsQueueActionTest //third_party/java_src/gtld/javatests/google/registry/documentation:FlowExceptionsTest //third_party/java_src/gtld/javatests/google/registry/export:BigqueryPollJobActionTest //third_party/java_src/gtld/javatests/google/registry/export:DatastoreBackupServiceTest //third_party/java_src/gtld/javatests/google/registry/export:ExportSnapshotServletTest //third_party/java_src/gtld/javatests/google/registry/export:SyncGroupMembersActionTest //third_party/java_src/gtld/javatests/google/registry/export:UpdateSnapshotViewActionTest //third_party/java_src/gtld/javatests/google/registry/flows:EppConsoleAsAdminServletTest //third_party/java_src/gtld/javatests/google/registry/flows:EppControllerTest //third_party/java_src/gtld/javatests/google/registry/flows:EppTlsServletTest //third_party/java_src/gtld/javatests/google/registry/flows:contact/ContactCheckFlowTest //third_party/java_src/gtld/javatests/google/registry/flows:contact/ContactTransferCancelFlowTest //third_party/java_src/gtld/javatests/google/registry/flows:domain/DomainAllocateFlowTest //third_party/java_src/gtld/javatests/google/registry/flows:domain/DomainApplicationDeleteFlowTest //third_party/java_src/gtld/javatests/google/registry/flows:domain/DomainDeleteFlowTest //third_party/java_src/gtld/javatests/google/registry/flows:domain/DomainRestoreRequestFlowTest //third_party/java_src/gtld/javatests/google/registry/flows:domain/DomainTransferApproveFlowTest //third_party/java_src/gtld/javatests/google/registry/flows:host/HostCreateFlowTest //third_party/java_src/gtld/javatests/google/registry/flows:session/LoginFlowViaTlsTest //third_party/java_src/gtld/javatests/google/registry/flows:session/LogoutFlowTest //third_party/java_src/gtld/javatests/google/registry/[]/inputs:EppResourceInputsTest //third_party/java_src/gtld/javatests/google/registry/model:CreateAutoTimestampTest //third_party/java_src/gtld/javatests/google/registry/model:RoidSuffixesTest //third_party/java_src/gtld/javatests/google/registry/model:UpdateAutoTimestampTest //third_party/java_src/gtld/javatests/google/registry/model:billing/BillingEventTest //third_party/java_src/gtld/javatests/google/registry/model:contact/ContactResourceTest //third_party/java_src/gtld/javatests/google/registry/model:domain/DomainApplicationTest //third_party/java_src/gtld/javatests/google/registry/model:domain/DomainResourceTest //third_party/java_src/gtld/javatests/google/registry/model:export/LogsExportCursorTest //third_party/java_src/gtld/javatests/google/registry/model:ofy/OfyCommitLogTest //third_party/java_src/gtld/javatests/google/registry/model:ofy/OfyTest //third_party/java_src/gtld/javatests/google/registry/model:poll/PollMessageExternalKeyConverterTest //third_party/java_src/gtld/javatests/google/registry/model:rde/RdeNamingUtilsTest //third_party/java_src/gtld/javatests/google/registry/model:registry/RegistryCursorTest //third_party/java_src/gtld/javatests/google/registry/model:registry/label/PremiumListTest //third_party/java_src/gtld/javatests/google/registry/model:registry/label/ReservedListTest //third_party/java_src/gtld/javatests/google/registry/model:server/LockTest //third_party/java_src/gtld/javatests/google/registry/model:smd/SignedMarkRevocationListTest //third_party/java_src/gtld/javatests/google/registry/model:tmch/ClaimsListShardTest //third_party/java_src/gtld/javatests/google/registry/monitoring/blackbox:EppClientConnectionTest //third_party/java_src/gtld/javatests/google/registry/monitoring/blackbox:EppRunnableProberTest //third_party/java_src/gtld/javatests/google/registry/monitoring/blackbox:WhoisQueryTest //third_party/java_src/gtld/javatests/google/registry/rdap:RdapActionBaseTest //third_party/java_src/gtld/javatests/google/registry/rdap:RdapJsonFormatterTest //third_party/java_src/gtld/javatests/google/registry/rdap:RdapSearchPatternTest //third_party/java_src/gtld/javatests/google/registry/rde:DomainResourceToXjcConverterTest //third_party/java_src/gtld/javatests/google/registry/request:JsonResponseTest //third_party/java_src/gtld/javatests/google/registry/tmch:NordnVerifyActionTest //third_party/java_src/gtld/javatests/google/registry/tmch:TmchCrlActionTest //third_party/java_src/gtld/javatests/google/registry/tools/params:DurationParameterTest //third_party/java_src/gtld/javatests/google/registry/tools/params:MoneyParameterTest //third_party/java_src/gtld/javatests/google/registry/tools/params:PathParameterTest //third_party/java_src/gtld/javatests/google/registry/tools/server:CreateGroupsActionTest //third_party/java_src/gtld/javatests/google/registry/tools/server:DeleteEntityActionTest //third_party/java_src/gtld/javatests/google/registry/tools:CreateContactCommandTest //third_party/java_src/gtld/javatests/google/registry/tools:CreateCreditBalanceCommandTest //third_party/java_src/gtld/javatests/google/registry/tools:CreateReservedListCommandTest //third_party/java_src/gtld/javatests/google/registry/tools:CreateTldCommandTest //third_party/java_src/gtld/javatests/google/registry/tools:DeletePremiumListCommandTest //third_party/java_src/gtld/javatests/google/registry/tools:DomainApplicationInfoCommandTest //third_party/java_src/gtld/javatests/google/registry/tools:DomainCheckCommandTest //third_party/java_src/gtld/javatests/google/registry/tools:EncryptEscrowDepositCommandTest //third_party/java_src/gtld/javatests/google/registry/tools:GenerateAuctionDataCommandTest //third_party/java_src/gtld/javatests/google/registry/tools:GetDomainCommandTest //third_party/java_src/gtld/javatests/google/registry/tools:GetTldCommandTest //third_party/java_src/gtld/javatests/google/registry/tools:ListDomainsCommandTest //third_party/java_src/gtld/javatests/google/registry/tools:ListRegistrarsCommandTest //third_party/java_src/gtld/javatests/google/registry/tools:RegistryToolEnvironmentTest //third_party/java_src/gtld/javatests/google/registry/ui/server/registrar:RegistrarServletTest //third_party/java_src/gtld/javatests/google/registry/util:RetrierTest //third_party/java_src/gtld/javatests/google/registry/util:SendEmailUtilsTest //third_party/java_src/gtld/javatests/google/registry/util:UrlFetchUtilsTest //third_party/java_src/gtld/javatests/google/registry/xjc:XjcObjectTest [] ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=121294781 --- java/google/registry/util/Retrier.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/java/google/registry/util/Retrier.java b/java/google/registry/util/Retrier.java index 162d0b191..642c8f5b8 100644 --- a/java/google/registry/util/Retrier.java +++ b/java/google/registry/util/Retrier.java @@ -15,7 +15,7 @@ package google.registry.util; import static com.google.appengine.api.search.checkers.Preconditions.checkArgument; -import static com.google.common.base.Throwables.propagate; +import static com.google.common.base.Throwables.throwIfUnchecked; import static com.google.common.collect.Iterables.any; import static com.google.common.math.IntMath.pow; import static google.registry.util.PredicateUtils.supertypeOf; @@ -67,7 +67,8 @@ public class Retrier implements Serializable { return callable.call(); } catch (Throwable e) { if (++failures == attempts || !isRetryable.apply(e)) { - propagate(e); + throwIfUnchecked(e); + throw new RuntimeException(e); } logger.info(e, "Retrying transient error, attempt " + failures); try { @@ -77,7 +78,8 @@ public class Retrier implements Serializable { // Since we're not rethrowing InterruptedException, set the interrupt state on the thread // so the next blocking operation will know to abort the thread. Thread.currentThread().interrupt(); - propagate(e); + throwIfUnchecked(e); + throw new RuntimeException(e); } } }