Repository: flink Updated Branches: refs/heads/master b550ac67f -> 9198c93e5
[hotfix] Add generics to FutureUtils.toJava calls in ClusterClient Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/9198c93e Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/9198c93e Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/9198c93e Branch: refs/heads/master Commit: 9198c93e59d7b5bd916cabcf6bb8c52fd0bdfae2 Parents: 93d99fd Author: Till Rohrmann <[email protected]> Authored: Thu Mar 22 18:38:56 2018 +0100 Committer: Till Rohrmann <[email protected]> Committed: Thu Mar 22 19:04:22 2018 +0100 ---------------------------------------------------------------------- .../org/apache/flink/client/program/ClusterClient.java | 10 +++++----- .../org/apache/flink/runtime/concurrent/FutureUtils.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/9198c93e/flink-clients/src/main/java/org/apache/flink/client/program/ClusterClient.java ---------------------------------------------------------------------- diff --git a/flink-clients/src/main/java/org/apache/flink/client/program/ClusterClient.java b/flink-clients/src/main/java/org/apache/flink/client/program/ClusterClient.java index b0c50e5..166d977 100644 --- a/flink-clients/src/main/java/org/apache/flink/client/program/ClusterClient.java +++ b/flink-clients/src/main/java/org/apache/flink/client/program/ClusterClient.java @@ -602,7 +602,7 @@ public abstract class ClusterClient<T> { Future<Object> response = jobManager.ask(JobManagerMessages.getRequestJobStatus(jobId), timeout); - CompletableFuture<Object> javaFuture = FutureUtils.toJava(response); + CompletableFuture<Object> javaFuture = FutureUtils.<Object>toJava(response); return javaFuture.thenApply((responseMessage) -> { if (responseMessage instanceof JobManagerMessages.CurrentJobStatus) { @@ -707,9 +707,9 @@ public abstract class ClusterClient<T> { public CompletableFuture<String> triggerSavepoint(JobID jobId, @Nullable String savepointDirectory) throws FlinkException { final ActorGateway jobManager = getJobManagerGateway(); - Future<Object> response = jobManager.ask(new JobManagerMessages.TriggerSavepoint(jobId, Option.apply(savepointDirectory)), + Future<Object> response = jobManager.ask(new JobManagerMessages.TriggerSavepoint(jobId, Option.<String>apply(savepointDirectory)), new FiniteDuration(1, TimeUnit.HOURS)); - CompletableFuture<Object> responseFuture = FutureUtils.toJava(response); + CompletableFuture<Object> responseFuture = FutureUtils.<Object>toJava(response); return responseFuture.thenApply((responseMessage) -> { if (responseMessage instanceof JobManagerMessages.TriggerSavepointSuccess) { @@ -729,7 +729,7 @@ public abstract class ClusterClient<T> { final ActorGateway jobManager = getJobManagerGateway(); Object msg = new JobManagerMessages.DisposeSavepoint(savepointPath); - CompletableFuture<Object> responseFuture = FutureUtils.toJava( + CompletableFuture<Object> responseFuture = FutureUtils.<Object>toJava( jobManager.ask( msg, FutureUtils.toFiniteDuration(timeout))); @@ -768,7 +768,7 @@ public abstract class ClusterClient<T> { final ActorGateway jobManager = getJobManagerGateway(); Future<Object> response = jobManager.ask(new RequestJobDetails(true, false), timeout); - CompletableFuture<Object> responseFuture = FutureUtils.toJava(response); + CompletableFuture<Object> responseFuture = FutureUtils.<Object>toJava(response); return responseFuture.thenApply((responseMessage) -> { if (responseMessage instanceof MultipleJobsDetails) { http://git-wip-us.apache.org/repos/asf/flink/blob/9198c93e/flink-runtime/src/main/java/org/apache/flink/runtime/concurrent/FutureUtils.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/concurrent/FutureUtils.java b/flink-runtime/src/main/java/org/apache/flink/runtime/concurrent/FutureUtils.java index a2d0710..e0164a9 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/concurrent/FutureUtils.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/concurrent/FutureUtils.java @@ -750,7 +750,7 @@ public class FutureUtils { scalaFuture.onComplete(new OnComplete<T>() { @Override - public void onComplete(Throwable failure, T success) throws Throwable { + public void onComplete(Throwable failure, T success) { if (failure != null) { result.completeExceptionally(failure); } else {
