diff --git a/cdap-client/src/main/java/io/cdap/cdap/client/MetricsClient.java b/cdap-client/src/main/java/io/cdap/cdap/client/MetricsClient.java index 4b21dd937b02..fdf3733faf50 100644 --- a/cdap-client/src/main/java/io/cdap/cdap/client/MetricsClient.java +++ b/cdap-client/src/main/java/io/cdap/cdap/client/MetricsClient.java @@ -17,7 +17,6 @@ package io.cdap.cdap.client; import com.google.common.base.Joiner; -import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; @@ -324,7 +323,7 @@ private long getTotalCounter(Map tags, String metricName) { // since it is totals, we know there's one value only return timeValues[0].getValue(); } catch (Exception e) { - throw Throwables.propagate(e); + throw new RuntimeException(e); } } diff --git a/cdap-client/src/main/java/io/cdap/cdap/client/ProgramClient.java b/cdap-client/src/main/java/io/cdap/cdap/client/ProgramClient.java index 68d4617170bb..d4f1973a57b5 100644 --- a/cdap-client/src/main/java/io/cdap/cdap/client/ProgramClient.java +++ b/cdap-client/src/main/java/io/cdap/cdap/client/ProgramClient.java @@ -407,7 +407,7 @@ public String call() throws Exception { Throwables.propagateIfPossible(e.getCause(), UnauthenticatedException.class); Throwables.propagateIfPossible(e.getCause(), ProgramNotFoundException.class); Throwables.propagateIfPossible(e.getCause(), IOException.class); - throw Throwables.propagate(e.getCause()); + throw new RuntimeException(e.getCause()); } } diff --git a/cdap-client/src/main/java/io/cdap/cdap/client/config/ConnectionConfig.java b/cdap-client/src/main/java/io/cdap/cdap/client/config/ConnectionConfig.java index b50f7b23f3d2..d82894ddcc0a 100644 --- a/cdap-client/src/main/java/io/cdap/cdap/client/config/ConnectionConfig.java +++ b/cdap-client/src/main/java/io/cdap/cdap/client/config/ConnectionConfig.java @@ -15,6 +15,7 @@ */ package io.cdap.cdap.client.config; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Preconditions; import io.cdap.cdap.common.conf.CConfiguration; @@ -137,7 +138,7 @@ public boolean equals(Object obj) { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("hostname", hostname) .add("port", port) .add("sslEnabled", sslEnabled) diff --git a/cdap-source-control/src/main/java/io/cdap/cdap/sourcecontrol/PatAuthenticationStrategy.java b/cdap-source-control/src/main/java/io/cdap/cdap/sourcecontrol/PatAuthenticationStrategy.java index afa336a149f6..81b006f20d57 100644 --- a/cdap-source-control/src/main/java/io/cdap/cdap/sourcecontrol/PatAuthenticationStrategy.java +++ b/cdap-source-control/src/main/java/io/cdap/cdap/sourcecontrol/PatAuthenticationStrategy.java @@ -16,7 +16,6 @@ package io.cdap.cdap.sourcecontrol; -import com.google.common.base.Throwables; import io.cdap.cdap.api.security.store.SecureStore; import io.cdap.cdap.proto.sourcecontrol.PatConfig; import io.cdap.cdap.proto.sourcecontrol.RepositoryConfig; @@ -79,7 +78,9 @@ public void refresh() throws IOException, AuthenticationConfigException { try { data = secureStore.getData(namespaceId, passwordKeyName); } catch (Exception e) { - Throwables.propagateIfInstanceOf(e, IOException.class); + if (e instanceof IOException){ + throw (IOException) e; + } throw new AuthenticationConfigException("Failed to get password from secure store", e); } if (data == null) { diff --git a/cdap-source-control/src/main/java/io/cdap/cdap/sourcecontrol/RepositoryManager.java b/cdap-source-control/src/main/java/io/cdap/cdap/sourcecontrol/RepositoryManager.java index 919ad38fac36..279609676308 100644 --- a/cdap-source-control/src/main/java/io/cdap/cdap/sourcecontrol/RepositoryManager.java +++ b/cdap-source-control/src/main/java/io/cdap/cdap/sourcecontrol/RepositoryManager.java @@ -19,7 +19,6 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Stopwatch; import com.google.common.base.Strings; -import com.google.common.base.Throwables; import com.google.common.collect.ImmutableMap; import io.cdap.cdap.api.metrics.MetricsCollectionService; import io.cdap.cdap.api.metrics.MetricsContext; @@ -204,8 +203,9 @@ public static void validateConfig(final SecureStore secureStore, "Failed to list remotes in remote repository: " + e.getMessage(), e); } catch (Exception e) { - Throwables.propagateIfInstanceOf(e, - RepositoryConfigValidationException.class); + if (e instanceof RepositoryConfigValidationException) { + throw (RepositoryConfigValidationException) e; + } throw new RemoteRepositoryValidationException( "Failed to list remotes in remote repository.", e); @@ -233,7 +233,7 @@ public > CommitResult commitAndPush( CommitMeta commitMeta, Collection filesChanged, BiFunction hashConsumer) throws NoChangesToPushException, GitAPIException { validateInitialized(); - final Stopwatch stopwatch = new Stopwatch().start(); + final Stopwatch stopwatch = Stopwatch.createUnstarted().start(); // if the status is clean skip Status preStageStatus = git.status().call(); @@ -275,7 +275,7 @@ public > CommitResult commitAndPush( metricsContext.event( SourceControlManagement.COMMIT_PUSH_LATENCY_MILLIS, - stopwatch.stop().elapsedTime(TimeUnit.MILLISECONDS)); + stopwatch.stop().elapsed(TimeUnit.MILLISECONDS)); return new CommitResult<>(commit.getName(), output); } @@ -318,10 +318,10 @@ public String cloneRemote() .setBranch(branch); } - final Stopwatch stopwatch = new Stopwatch().start(); + final Stopwatch stopwatch = Stopwatch.createUnstarted().start(); git = command.call(); final long cloneTimeMillis = stopwatch.stop() - .elapsedTime(TimeUnit.MILLISECONDS); + .elapsed(TimeUnit.MILLISECONDS); // Record the repository size metric. try { diff --git a/cdap-source-control/src/main/java/io/cdap/cdap/sourcecontrol/worker/SourceControlTask.java b/cdap-source-control/src/main/java/io/cdap/cdap/sourcecontrol/worker/SourceControlTask.java index b2a3066f10a8..09e9716ee27e 100644 --- a/cdap-source-control/src/main/java/io/cdap/cdap/sourcecontrol/worker/SourceControlTask.java +++ b/cdap-source-control/src/main/java/io/cdap/cdap/sourcecontrol/worker/SourceControlTask.java @@ -56,7 +56,7 @@ abstract class SourceControlTask implements RunnableTask { @Override public void run(RunnableTaskContext context) throws Exception { - inMemoryOperationRunner.startAndWait(); + inMemoryOperationRunner.startAsync().awaitRunning(); doRun(context); } diff --git a/cdap-test/src/main/java/io/cdap/cdap/test/MetricsManager.java b/cdap-test/src/main/java/io/cdap/cdap/test/MetricsManager.java index 82dc6b5e780b..6bdeb4651045 100644 --- a/cdap-test/src/main/java/io/cdap/cdap/test/MetricsManager.java +++ b/cdap-test/src/main/java/io/cdap/cdap/test/MetricsManager.java @@ -19,7 +19,6 @@ import com.google.common.base.Joiner; import com.google.common.base.Preconditions; import com.google.common.base.Stopwatch; -import com.google.common.base.Throwables; import io.cdap.cdap.api.dataset.lib.cube.AggregationFunction; import io.cdap.cdap.api.dataset.lib.cube.TimeValue; import io.cdap.cdap.api.metrics.MetricDataQuery; @@ -134,8 +133,8 @@ public void waitForTotalMetricCount(Map tags, String metricName, // Min sleep time is 10ms, max sleep time is 1 seconds long sleepMillis = Math.max(10, Math.min(timeoutUnit.toMillis(timeout) / 10, TimeUnit.SECONDS.toMillis(1))); - Stopwatch stopwatch = new Stopwatch().start(); - while (value < count && stopwatch.elapsedTime(timeoutUnit) < timeout) { + Stopwatch stopwatch = Stopwatch.createUnstarted().start(); + while (value < count && stopwatch.elapsed(timeoutUnit) < timeout) { TimeUnit.MILLISECONDS.sleep(sleepMillis); value = getTotalMetric(tags, metricName); } @@ -239,7 +238,7 @@ private long getSingleValueFromTotals(MetricDataQuery query) { // since it is totals, we know there's one value only return timeValues.get(0).getValue(); } catch (Exception e) { - throw Throwables.propagate(e); + throw new RuntimeException(e); } } }