[flink] 09/17: [hotfix] Make TestExecutorResource generic in the ExecutorService

[tr...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

trohrmann pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git

commit 848e6d80c08f81cede662951c9c0913539b8c6e9
Author: Till Rohrmann <tr...@apache.org>
AuthorDate: Mon Mar 15 18:04:11 2021 +0100

    [hotfix] Make TestExecutorResource generic in the ExecutorService
    
    Making the TestExecutorResource generic in the ExecutorService has the advantage that the resource
    can also manage and return SchedulerExecutorServices.
---
 .../taskexecutor/TaskExecutorPartitionLifecycleTest.java      |  4 ++--
 .../apache/flink/testutils/executor/TestExecutorResource.java | 11 +++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskExecutorPartitionLifecycleTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskExecutorPartitionLifecycleTest.java
index e858f7d..2d76738 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskExecutorPartitionLifecycleTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskExecutorPartitionLifecycleTest.java
@@ -118,8 +118,8 @@ public class TaskExecutorPartitionLifecycleTest extends TestLogger {
     @Rule public final TemporaryFolder tmp = new TemporaryFolder();
 
     @ClassRule
-    public static final TestExecutorResource TEST_EXECUTOR_SERVICE_RESOURCE =
-            new TestExecutorResource(() -> java.util.concurrent.Executors.newFixedThreadPool(1));
+    public static final TestExecutorResource<?> TEST_EXECUTOR_SERVICE_RESOURCE =
+            new TestExecutorResource<>(() -> java.util.concurrent.Executors.newFixedThreadPool(1));
 
     @Before
     public void setup() {
diff --git a/flink-test-utils-parent/flink-test-utils-junit/src/main/java/org/apache/flink/testutils/executor/TestExecutorResource.java b/flink-test-utils-parent/flink-test-utils-junit/src/main/java/org/apache/flink/testutils/executor/TestExecutorResource.java
index 011afe1..162aef0 100644
--- a/flink-test-utils-parent/flink-test-utils-junit/src/main/java/org/apache/flink/testutils/executor/TestExecutorResource.java
+++ b/flink-test-utils-parent/flink-test-utils-junit/src/main/java/org/apache/flink/testutils/executor/TestExecutorResource.java
@@ -19,18 +19,17 @@ package org.apache.flink.testutils.executor;
 
 import org.junit.rules.ExternalResource;
 
-import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 import java.util.function.Supplier;
 
 /** Resource which starts/stops an {@link ExecutorService} for testing purposes. */
-public class TestExecutorResource extends ExternalResource {
+public class TestExecutorResource<T extends ExecutorService> extends ExternalResource {
 
-    private final Supplier<ExecutorService> serviceFactory;
+    private final Supplier<T> serviceFactory;
 
-    private ExecutorService executorService;
+    private T executorService;
 
-    public TestExecutorResource(Supplier<ExecutorService> serviceFactory) {
+    public TestExecutorResource(Supplier<T> serviceFactory) {
         this.serviceFactory = serviceFactory;
     }
 
@@ -39,7 +38,7 @@ public class TestExecutorResource extends ExternalResource {
         executorService = serviceFactory.get();
     }
 
-    public Executor getExecutor() {
+    public T getExecutor() {
         // only return an Executor since this resource is in charge of the life cycle
         return executorService;
     }