[FLINK-23085] Move FutureUtils to flink-core

* [FLINK-23085] Move FutureUtils to flink-core * +
liuyongvs · Jun 24, 2021 · ad47fe2 · ad47fe2
1 parent 4b62f21
commit ad47fe2
Show file tree

Hide file tree

Showing 254 changed files with 316 additions and 343 deletions.
diff --git a/...ients/src/main/java/org/apache/flink/client/deployment/ClusterClientJobClientAdapter.java b/...ients/src/main/java/org/apache/flink/client/deployment/ClusterClientJobClientAdapter.java
@@ -25,11 +25,11 @@
 import org.apache.flink.client.program.ClusterClientProvider;
 import org.apache.flink.client.program.ProgramInvocationException;
 import org.apache.flink.core.execution.JobClient;
-import org.apache.flink.runtime.concurrent.FutureUtils;
 import org.apache.flink.runtime.jobgraph.OperatorID;
 import org.apache.flink.runtime.operators.coordination.CoordinationRequest;
 import org.apache.flink.runtime.operators.coordination.CoordinationRequestGateway;
 import org.apache.flink.runtime.operators.coordination.CoordinationResponse;
+import org.apache.flink.util.concurrent.FutureUtils;
 
 import org.apache.commons.io.IOUtils;
 

diff --git a/...ain/java/org/apache/flink/client/deployment/application/ApplicationClusterEntryPoint.java b/...ain/java/org/apache/flink/client/deployment/application/ApplicationClusterEntryPoint.java
@@ -26,7 +26,6 @@
 import org.apache.flink.configuration.Configuration;
 import org.apache.flink.configuration.DeploymentOptions;
 import org.apache.flink.configuration.PipelineOptions;
-import org.apache.flink.runtime.concurrent.ScheduledExecutor;
 import org.apache.flink.runtime.dispatcher.ExecutionGraphInfoStore;
 import org.apache.flink.runtime.dispatcher.MemoryExecutionGraphInfoStore;
 import org.apache.flink.runtime.dispatcher.SessionDispatcherFactory;
@@ -36,6 +35,7 @@
 import org.apache.flink.runtime.entrypoint.component.DispatcherResourceManagerComponentFactory;
 import org.apache.flink.runtime.resourcemanager.ResourceManagerFactory;
 import org.apache.flink.runtime.rest.JobRestEndpointFactory;
+import org.apache.flink.util.concurrent.ScheduledExecutor;
 
 import java.io.IOException;
 import java.net.MalformedURLException;

diff --git a/...n/java/org/apache/flink/client/deployment/application/ApplicationDispatcherBootstrap.java b/...n/java/org/apache/flink/client/deployment/application/ApplicationDispatcherBootstrap.java
@@ -31,8 +31,6 @@
 import org.apache.flink.configuration.PipelineOptionsInternal;
 import org.apache.flink.core.execution.PipelineExecutorServiceLoader;
 import org.apache.flink.runtime.clusterframework.ApplicationStatus;
-import org.apache.flink.runtime.concurrent.FutureUtils;
-import org.apache.flink.runtime.concurrent.ScheduledExecutor;
 import org.apache.flink.runtime.dispatcher.DispatcherBootstrap;
 import org.apache.flink.runtime.dispatcher.DispatcherGateway;
 import org.apache.flink.runtime.jobgraph.JobGraph;
@@ -42,6 +40,8 @@
 import org.apache.flink.runtime.rpc.FatalErrorHandler;
 import org.apache.flink.util.ExceptionUtils;
 import org.apache.flink.util.FlinkException;
+import org.apache.flink.util.concurrent.FutureUtils;
+import org.apache.flink.util.concurrent.ScheduledExecutor;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...ients/src/main/java/org/apache/flink/client/deployment/application/EmbeddedJobClient.java b/...ients/src/main/java/org/apache/flink/client/deployment/application/EmbeddedJobClient.java
@@ -25,15 +25,15 @@
 import org.apache.flink.api.common.accumulators.AccumulatorHelper;
 import org.apache.flink.api.common.time.Time;
 import org.apache.flink.core.execution.JobClient;
-import org.apache.flink.runtime.concurrent.FutureUtils;
-import org.apache.flink.runtime.concurrent.ScheduledExecutor;
 import org.apache.flink.runtime.dispatcher.DispatcherGateway;
 import org.apache.flink.runtime.executiongraph.ArchivedExecutionGraph;
 import org.apache.flink.runtime.jobgraph.OperatorID;
 import org.apache.flink.runtime.operators.coordination.CoordinationRequest;
 import org.apache.flink.runtime.operators.coordination.CoordinationRequestGateway;
 import org.apache.flink.runtime.operators.coordination.CoordinationResponse;
 import org.apache.flink.util.SerializedValue;
+import org.apache.flink.util.concurrent.FutureUtils;
+import org.apache.flink.util.concurrent.ScheduledExecutor;
 
 import javax.annotation.Nullable;
 

diff --git a/...s/src/main/java/org/apache/flink/client/deployment/application/JobStatusPollingUtils.java b/...s/src/main/java/org/apache/flink/client/deployment/application/JobStatusPollingUtils.java
@@ -22,9 +22,9 @@
 import org.apache.flink.api.common.JobID;
 import org.apache.flink.api.common.JobStatus;
 import org.apache.flink.api.common.time.Time;
-import org.apache.flink.runtime.concurrent.ScheduledExecutor;
 import org.apache.flink.runtime.dispatcher.DispatcherGateway;
 import org.apache.flink.runtime.jobmaster.JobResult;
+import org.apache.flink.util.concurrent.ScheduledExecutor;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;

diff --git a/...ava/org/apache/flink/client/deployment/application/executors/EmbeddedExecutorFactory.java b/...ava/org/apache/flink/client/deployment/application/executors/EmbeddedExecutorFactory.java
@@ -26,8 +26,8 @@
 import org.apache.flink.configuration.Configuration;
 import org.apache.flink.core.execution.PipelineExecutor;
 import org.apache.flink.core.execution.PipelineExecutorFactory;
-import org.apache.flink.runtime.concurrent.ScheduledExecutor;
 import org.apache.flink.runtime.dispatcher.DispatcherGateway;
+import org.apache.flink.util.concurrent.ScheduledExecutor;
 
 import java.util.Collection;
 

diff --git a/...g/apache/flink/client/deployment/application/executors/EmbeddedExecutorServiceLoader.java b/...g/apache/flink/client/deployment/application/executors/EmbeddedExecutorServiceLoader.java
@@ -23,8 +23,8 @@
 import org.apache.flink.configuration.Configuration;
 import org.apache.flink.core.execution.PipelineExecutorFactory;
 import org.apache.flink.core.execution.PipelineExecutorServiceLoader;
-import org.apache.flink.runtime.concurrent.ScheduledExecutor;
 import org.apache.flink.runtime.dispatcher.DispatcherGateway;
+import org.apache.flink.util.concurrent.ScheduledExecutor;
 
 import java.util.Collection;
 import java.util.stream.Stream;

diff --git a/flink-clients/src/main/java/org/apache/flink/client/program/MiniClusterClient.java b/flink-clients/src/main/java/org/apache/flink/client/program/MiniClusterClient.java
@@ -24,7 +24,6 @@
 import org.apache.flink.api.common.accumulators.AccumulatorHelper;
 import org.apache.flink.configuration.Configuration;
 import org.apache.flink.runtime.client.JobStatusMessage;
-import org.apache.flink.runtime.concurrent.FutureUtils;
 import org.apache.flink.runtime.executiongraph.AccessExecutionGraph;
 import org.apache.flink.runtime.jobgraph.JobGraph;
 import org.apache.flink.runtime.jobgraph.OperatorID;
@@ -35,6 +34,7 @@
 import org.apache.flink.runtime.operators.coordination.CoordinationResponse;
 import org.apache.flink.util.ExceptionUtils;
 import org.apache.flink.util.SerializedValue;
+import org.apache.flink.util.concurrent.FutureUtils;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/flink-clients/src/main/java/org/apache/flink/client/program/rest/RestClusterClient.java b/flink-clients/src/main/java/org/apache/flink/client/program/rest/RestClusterClient.java
@@ -33,8 +33,6 @@
 import org.apache.flink.runtime.client.JobStatusMessage;
 import org.apache.flink.runtime.client.JobSubmissionException;
 import org.apache.flink.runtime.clusterframework.ApplicationStatus;
-import org.apache.flink.runtime.concurrent.FutureUtils;
-import org.apache.flink.runtime.concurrent.ScheduledExecutorServiceAdapter;
 import org.apache.flink.runtime.highavailability.ClientHighAvailabilityServices;
 import org.apache.flink.runtime.highavailability.HighAvailabilityServicesUtils;
 import org.apache.flink.runtime.jobgraph.JobGraph;
@@ -96,6 +94,8 @@
 import org.apache.flink.util.FlinkException;
 import org.apache.flink.util.SerializedValue;
 import org.apache.flink.util.concurrent.ExecutorThreadFactory;
+import org.apache.flink.util.concurrent.FutureUtils;
+import org.apache.flink.util.concurrent.ScheduledExecutorServiceAdapter;
 import org.apache.flink.util.function.CheckedSupplier;
 
 import org.apache.flink.shaded.netty4.io.netty.channel.ConnectTimeoutException;

diff --git a/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendSavepointTest.java b/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendSavepointTest.java
@@ -24,11 +24,11 @@
 import org.apache.flink.client.program.ClusterClient;
 import org.apache.flink.client.program.rest.RestClusterClient;
 import org.apache.flink.configuration.Configuration;
-import org.apache.flink.runtime.concurrent.FutureUtils;
 import org.apache.flink.runtime.messages.Acknowledge;
 import org.apache.flink.util.ExceptionUtils;
 import org.apache.flink.util.FlinkException;
 import org.apache.flink.util.Preconditions;
+import org.apache.flink.util.concurrent.FutureUtils;
 
 import org.hamcrest.Matchers;
 import org.junit.Rule;

diff --git a/...k-clients/src/test/java/org/apache/flink/client/cli/CliFrontendStopWithSavepointTest.java b/...k-clients/src/test/java/org/apache/flink/client/cli/CliFrontendStopWithSavepointTest.java
@@ -23,9 +23,9 @@
 import org.apache.flink.client.program.TestingClusterClient;
 import org.apache.flink.configuration.Configuration;
 import org.apache.flink.core.testutils.OneShotLatch;
-import org.apache.flink.runtime.concurrent.FutureUtils;
 import org.apache.flink.util.ExceptionUtils;
 import org.apache.flink.util.FlinkException;
+import org.apache.flink.util.concurrent.FutureUtils;
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;

diff --git a/...va/org/apache/flink/client/deployment/application/ApplicationDispatcherBootstrapTest.java b/...va/org/apache/flink/client/deployment/application/ApplicationDispatcherBootstrapTest.java
@@ -31,8 +31,6 @@
 import org.apache.flink.runtime.client.JobCancellationException;
 import org.apache.flink.runtime.client.JobExecutionException;
 import org.apache.flink.runtime.clusterframework.ApplicationStatus;
-import org.apache.flink.runtime.concurrent.ScheduledExecutor;
-import org.apache.flink.runtime.concurrent.ScheduledExecutorServiceAdapter;
 import org.apache.flink.runtime.dispatcher.DispatcherGateway;
 import org.apache.flink.runtime.jobmanager.HighAvailabilityMode;
 import org.apache.flink.runtime.jobmaster.JobResult;
@@ -45,6 +43,8 @@
 import org.apache.flink.util.FlinkRuntimeException;
 import org.apache.flink.util.SerializedThrowable;
 import org.apache.flink.util.TestLogger;
+import org.apache.flink.util.concurrent.ScheduledExecutor;
+import org.apache.flink.util.concurrent.ScheduledExecutorServiceAdapter;
 
 import org.junit.After;
 import org.junit.Test;

diff --git a/...c/test/java/org/apache/flink/client/deployment/application/JobStatusPollingUtilsTest.java b/...c/test/java/org/apache/flink/client/deployment/application/JobStatusPollingUtilsTest.java
@@ -21,11 +21,11 @@
 import org.apache.flink.api.common.JobID;
 import org.apache.flink.api.common.JobStatus;
 import org.apache.flink.runtime.clusterframework.ApplicationStatus;
-import org.apache.flink.runtime.concurrent.ScheduledExecutor;
-import org.apache.flink.runtime.concurrent.ScheduledExecutorServiceAdapter;
 import org.apache.flink.runtime.jobmaster.JobResult;
 import org.apache.flink.util.ExecutorUtils;
 import org.apache.flink.util.SerializedThrowable;
+import org.apache.flink.util.concurrent.ScheduledExecutor;
+import org.apache.flink.util.concurrent.ScheduledExecutorServiceAdapter;
 
 import org.junit.Test;
 

diff --git a/flink-clients/src/test/java/org/apache/flink/client/program/rest/RestClusterClientTest.java b/flink-clients/src/test/java/org/apache/flink/client/program/rest/RestClusterClientTest.java
@@ -32,7 +32,6 @@
 import org.apache.flink.configuration.RestOptions;
 import org.apache.flink.runtime.client.JobStatusMessage;
 import org.apache.flink.runtime.clusterframework.ApplicationStatus;
-import org.apache.flink.runtime.concurrent.FutureUtils;
 import org.apache.flink.runtime.dispatcher.DispatcherGateway;
 import org.apache.flink.runtime.jobgraph.JobGraph;
 import org.apache.flink.runtime.jobgraph.JobGraphTestUtils;
@@ -100,6 +99,7 @@
 import org.apache.flink.util.SerializedValue;
 import org.apache.flink.util.TestLogger;
 import org.apache.flink.util.concurrent.ExecutorThreadFactory;
+import org.apache.flink.util.concurrent.FutureUtils;
 
 import org.apache.flink.shaded.netty4.io.netty.handler.codec.http.HttpResponseStatus;
 

diff --git a/.../src/test/java/org/apache/flink/streaming/connectors/cassandra/CassandraSinkBaseTest.java b/.../src/test/java/org/apache/flink/streaming/connectors/cassandra/CassandraSinkBaseTest.java
@@ -19,11 +19,11 @@
 
 import org.apache.flink.configuration.Configuration;
 import org.apache.flink.core.testutils.CheckedThread;
-import org.apache.flink.queryablestate.FutureUtils;
 import org.apache.flink.streaming.api.operators.StreamSink;
 import org.apache.flink.streaming.util.OneInputStreamOperatorTestHarness;
 import org.apache.flink.util.ExceptionUtils;
 import org.apache.flink.util.Preconditions;
+import org.apache.flink.util.concurrent.FutureUtils;
 
 import com.datastax.driver.core.Cluster;
 import com.datastax.driver.core.ResultSet;
@@ -101,7 +101,7 @@ public void testThrowErrorOnClose() throws Exception {
         casSinkFunc.open(new Configuration());
 
         Exception cause = new RuntimeException();
-        casSinkFunc.enqueueCompletableFuture(FutureUtils.getFailedFuture(cause));
+        casSinkFunc.enqueueCompletableFuture(FutureUtils.completedExceptionally(cause));
         casSinkFunc.invoke("hello");
         try {
             casSinkFunc.close();
@@ -116,7 +116,7 @@ public void testThrowErrorOnClose() throws Exception {
     public void testThrowErrorOnInvoke() throws Exception {
         try (TestCassandraSink casSinkFunc = createOpenedTestCassandraSink()) {
             Exception cause = new RuntimeException();
-            casSinkFunc.enqueueCompletableFuture(FutureUtils.getFailedFuture(cause));
+            casSinkFunc.enqueueCompletableFuture(FutureUtils.completedExceptionally(cause));
 
             casSinkFunc.invoke("hello");
 
@@ -137,8 +137,8 @@ public void testIgnoreError() throws Exception {
 
         try (TestCassandraSink casSinkFunc = createOpenedTestCassandraSink(failureHandler)) {
 
-            casSinkFunc.enqueueCompletableFuture(FutureUtils.getFailedFuture(cause));
-            casSinkFunc.enqueueCompletableFuture(FutureUtils.getFailedFuture(cause));
+            casSinkFunc.enqueueCompletableFuture(FutureUtils.completedExceptionally(cause));
+            casSinkFunc.enqueueCompletableFuture(FutureUtils.completedExceptionally(cause));
 
             casSinkFunc.invoke("hello");
             casSinkFunc.invoke("world");
@@ -152,7 +152,7 @@ public void testThrowErrorOnSnapshot() throws Exception {
         try (OneInputStreamOperatorTestHarness<String, Object> testHarness =
                 createOpenedTestHarness(casSinkFunc)) {
             Exception cause = new RuntimeException();
-            casSinkFunc.enqueueCompletableFuture(FutureUtils.getFailedFuture(cause));
+            casSinkFunc.enqueueCompletableFuture(FutureUtils.completedExceptionally(cause));
 
             casSinkFunc.invoke("hello");
 

diff --git a/...rent/ExponentialBackoffRetryStrategy.java → ...rent/ExponentialBackoffRetryStrategy.java b/...rent/ExponentialBackoffRetryStrategy.java → ...rent/ExponentialBackoffRetryStrategy.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.runtime.concurrent;
+package org.apache.flink.util.concurrent;
 
 import org.apache.flink.util.Preconditions;
 

diff --git a/...untime/concurrent/FixedRetryStrategy.java → ...k/util/concurrent/FixedRetryStrategy.java b/...untime/concurrent/FixedRetryStrategy.java → ...k/util/concurrent/FixedRetryStrategy.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.runtime.concurrent;
+package org.apache.flink.util.concurrent;
 
 import org.apache.flink.util.Preconditions;
 

diff --git a/...flink/runtime/concurrent/FutureUtils.java → ...he/flink/util/concurrent/FutureUtils.java b/...flink/runtime/concurrent/FutureUtils.java → ...he/flink/util/concurrent/FutureUtils.java
@@ -16,14 +16,12 @@
  * limitations under the License.
  */
 
-package org.apache.flink.runtime.concurrent;
+package org.apache.flink.util.concurrent;
 
 import org.apache.flink.api.common.time.Deadline;
 import org.apache.flink.api.common.time.Time;
 import org.apache.flink.util.ExceptionUtils;
 import org.apache.flink.util.FatalExitExceptionHandler;
-import org.apache.flink.util.concurrent.ExecutorThreadFactory;
-import org.apache.flink.util.concurrent.Executors;
 import org.apache.flink.util.function.RunnableWithException;
 import org.apache.flink.util.function.SupplierWithException;
 

diff --git a/...ink/runtime/concurrent/RetryStrategy.java → .../flink/util/concurrent/RetryStrategy.java b/...ink/runtime/concurrent/RetryStrategy.java → .../flink/util/concurrent/RetryStrategy.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.runtime.concurrent;
+package org.apache.flink.util.concurrent;
 
 import java.time.Duration;
 

diff --git a/...runtime/concurrent/ScheduledExecutor.java → ...nk/util/concurrent/ScheduledExecutor.java b/...runtime/concurrent/ScheduledExecutor.java → ...nk/util/concurrent/ScheduledExecutor.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.runtime.concurrent;
+package org.apache.flink.util.concurrent;
 
 import java.util.concurrent.Callable;
 import java.util.concurrent.Executor;

diff --git a/...rent/ScheduledExecutorServiceAdapter.java → ...rent/ScheduledExecutorServiceAdapter.java b/...rent/ScheduledExecutorServiceAdapter.java → ...rent/ScheduledExecutorServiceAdapter.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.flink.runtime.concurrent;
+package org.apache.flink.util.concurrent;
 
 import org.apache.flink.util.Preconditions;
 

diff --git a/...-common/src/main/java/org/apache/flink/tests/util/flink/LocalStandaloneFlinkResource.java b/...-common/src/main/java/org/apache/flink/tests/util/flink/LocalStandaloneFlinkResource.java
@@ -20,7 +20,6 @@
 
 import org.apache.flink.api.common.JobID;
 import org.apache.flink.configuration.Configuration;
-import org.apache.flink.queryablestate.FutureUtils;
 import org.apache.flink.runtime.rest.RestClient;
 import org.apache.flink.runtime.rest.RestClientConfiguration;
 import org.apache.flink.runtime.rest.messages.EmptyMessageParameters;
@@ -30,6 +29,7 @@
 import org.apache.flink.tests.util.TestUtils;
 import org.apache.flink.util.ConfigurationException;
 import org.apache.flink.util.concurrent.Executors;
+import org.apache.flink.util.concurrent.FutureUtils;
 
 import org.junit.rules.TemporaryFolder;
 import org.slf4j.Logger;
@@ -213,7 +213,7 @@ public CompletableFuture<Void> closeAsync() {
                 distribution.stopFlinkCluster();
                 return CompletableFuture.completedFuture(null);
             } catch (IOException e) {
-                return FutureUtils.getFailedFuture(e);
+                return FutureUtils.completedExceptionally(e);
             }
         }
     }

diff --git a/...lability-test/src/test/java/org/apache/flink/metrics/tests/MetricsAvailabilityITCase.java b/...lability-test/src/test/java/org/apache/flink/metrics/tests/MetricsAvailabilityITCase.java
@@ -22,8 +22,6 @@
 import org.apache.flink.api.common.time.Time;
 import org.apache.flink.configuration.Configuration;
 import org.apache.flink.runtime.clusterframework.types.ResourceID;
-import org.apache.flink.runtime.concurrent.FutureUtils;
-import org.apache.flink.runtime.concurrent.ScheduledExecutorServiceAdapter;
 import org.apache.flink.runtime.rest.RestClient;
 import org.apache.flink.runtime.rest.RestClientConfiguration;
 import org.apache.flink.runtime.rest.messages.EmptyMessageParameters;
@@ -42,6 +40,8 @@
 import org.apache.flink.tests.util.flink.FlinkResourceSetup;
 import org.apache.flink.tests.util.flink.LocalStandaloneFlinkResourceFactory;
 import org.apache.flink.util.TestLogger;
+import org.apache.flink.util.concurrent.FutureUtils;
+import org.apache.flink.util.concurrent.ScheduledExecutorServiceAdapter;
 import org.apache.flink.util.function.SupplierWithException;
 
 import org.junit.AfterClass;

diff --git a/...kubernetes/src/main/java/org/apache/flink/kubernetes/KubernetesResourceManagerDriver.java b/...kubernetes/src/main/java/org/apache/flink/kubernetes/KubernetesResourceManagerDriver.java
@@ -37,7 +37,6 @@
 import org.apache.flink.runtime.clusterframework.ContaineredTaskManagerParameters;
 import org.apache.flink.runtime.clusterframework.TaskExecutorProcessSpec;
 import org.apache.flink.runtime.clusterframework.types.ResourceID;
-import org.apache.flink.runtime.concurrent.FutureUtils;
 import org.apache.flink.runtime.externalresource.ExternalResourceUtils;
 import org.apache.flink.runtime.resourcemanager.active.AbstractResourceManagerDriver;
 import org.apache.flink.runtime.resourcemanager.active.ResourceManagerDriver;
@@ -46,6 +45,7 @@
 import org.apache.flink.util.ExceptionUtils;
 import org.apache.flink.util.FlinkException;
 import org.apache.flink.util.Preconditions;
+import org.apache.flink.util.concurrent.FutureUtils;
 
 import javax.annotation.Nullable;
 

diff --git a/...bernetes/src/main/java/org/apache/flink/kubernetes/kubeclient/Fabric8FlinkKubeClient.java b/...bernetes/src/main/java/org/apache/flink/kubernetes/kubeclient/Fabric8FlinkKubeClient.java
@@ -32,11 +32,11 @@
 import org.apache.flink.kubernetes.kubeclient.resources.KubernetesWatch;
 import org.apache.flink.kubernetes.utils.Constants;
 import org.apache.flink.kubernetes.utils.KubernetesUtils;
-import org.apache.flink.runtime.concurrent.FutureUtils;
 import org.apache.flink.runtime.persistence.PossibleInconsistentStateException;
 import org.apache.flink.util.ExceptionUtils;
 import org.apache.flink.util.ExecutorUtils;
 import org.apache.flink.util.FlinkRuntimeException;
+import org.apache.flink.util.concurrent.FutureUtils;
 
 import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.fabric8.kubernetes.api.model.HasMetadata;

diff --git a/...rnetes/src/test/java/org/apache/flink/kubernetes/KubernetesResourceManagerDriverTest.java b/...rnetes/src/test/java/org/apache/flink/kubernetes/KubernetesResourceManagerDriverTest.java
@@ -31,10 +31,10 @@
 import org.apache.flink.kubernetes.utils.Constants;
 import org.apache.flink.runtime.clusterframework.TaskExecutorProcessSpec;
 import org.apache.flink.runtime.clusterframework.types.ResourceID;
-import org.apache.flink.runtime.concurrent.FutureUtils;
 import org.apache.flink.runtime.resourcemanager.active.ResourceManagerDriver;
 import org.apache.flink.runtime.resourcemanager.active.ResourceManagerDriverTestBase;
 import org.apache.flink.runtime.testutils.CommonTestUtils;
+import org.apache.flink.util.concurrent.FutureUtils;
 
 import io.fabric8.kubernetes.api.model.ResourceRequirements;
 import org.junit.Test;