You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2021/10/06 07:43:11 UTC
[flink] 03/05: [FLINK-24275][rest] Simplify HandlerRequest generics
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit b86b57a1b1630e63442fe7b46e78a84d01b57cf5
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Mon Oct 4 14:51:24 2021 +0200
[FLINK-24275][rest] Simplify HandlerRequest generics
---
.../RestClusterClientSavepointTriggerTest.java | 8 ++----
.../client/program/rest/RestClusterClientTest.java | 32 ++++++++--------------
.../webmonitor/handlers/JarDeleteHandler.java | 2 +-
.../webmonitor/handlers/JarListHandler.java | 3 +-
.../webmonitor/handlers/JarPlanHandler.java | 2 +-
.../runtime/webmonitor/handlers/JarRunHandler.java | 5 ++--
.../webmonitor/handlers/JarUploadHandler.java | 2 +-
.../webmonitor/handlers/utils/JarHandlerUtils.java | 4 +--
.../webmonitor/handlers/JarDeleteHandlerTest.java | 13 ++++-----
.../handlers/JarHandlerParameterTest.java | 6 ++--
.../runtime/webmonitor/handlers/JarHandlers.java | 11 ++++----
.../handlers/JarPlanHandlerParameterTest.java | 3 +-
.../handlers/JarRunHandlerParameterTest.java | 5 ++--
.../webmonitor/handlers/JarUploadHandlerTest.java | 13 ++++-----
.../runtime/rest/handler/AbstractHandler.java | 4 +--
.../runtime/rest/handler/AbstractRestHandler.java | 4 +--
.../flink/runtime/rest/handler/HandlerRequest.java | 11 ++++----
.../AbstractAsynchronousOperationHandlers.java | 10 +++----
.../cluster/AbstractJobManagerFileHandler.java | 4 +--
.../rest/handler/cluster/ClusterConfigHandler.java | 3 +-
.../handler/cluster/ClusterOverviewHandler.java | 3 +-
.../handler/cluster/DashboardConfigHandler.java | 3 +-
.../cluster/JobManagerCustomLogHandler.java | 2 +-
.../handler/cluster/JobManagerLogFileHandler.java | 3 +-
.../handler/cluster/JobManagerLogListHandler.java | 3 +-
.../rest/handler/cluster/ShutdownHandler.java | 2 +-
.../dataset/ClusterDataSetDeleteHandlers.java | 12 ++------
.../handler/dataset/ClusterDataSetListHandler.java | 2 +-
.../job/AbstractAccessExecutionGraphHandler.java | 4 +--
.../handler/job/AbstractExecutionGraphHandler.java | 4 +--
.../rest/handler/job/AbstractJobVertexHandler.java | 4 +--
.../handler/job/AbstractSubtaskAttemptHandler.java | 4 +--
.../rest/handler/job/AbstractSubtaskHandler.java | 4 +--
.../rest/handler/job/JobAccumulatorsHandler.java | 3 +-
.../rest/handler/job/JobCancellationHandler.java | 3 +-
.../runtime/rest/handler/job/JobConfigHandler.java | 3 +-
.../rest/handler/job/JobDetailsHandler.java | 3 +-
.../rest/handler/job/JobExceptionsHandler.java | 3 +-
.../handler/job/JobExecutionResultHandler.java | 2 +-
.../runtime/rest/handler/job/JobIdsHandler.java | 3 +-
.../runtime/rest/handler/job/JobPlanHandler.java | 3 +-
.../runtime/rest/handler/job/JobSubmitHandler.java | 2 +-
.../handler/job/JobVertexAccumulatorsHandler.java | 3 +-
.../handler/job/JobVertexBackPressureHandler.java | 3 +-
.../rest/handler/job/JobVertexDetailsHandler.java | 3 +-
.../handler/job/JobVertexFlameGraphHandler.java | 9 ++----
.../handler/job/JobVertexTaskManagersHandler.java | 3 +-
.../rest/handler/job/JobsOverviewHandler.java | 3 +-
.../job/SubtaskCurrentAttemptDetailsHandler.java | 3 +-
...SubtaskExecutionAttemptAccumulatorsHandler.java | 3 +-
.../job/SubtaskExecutionAttemptDetailsHandler.java | 3 +-
.../job/SubtasksAllAccumulatorsHandler.java | 3 +-
.../rest/handler/job/SubtasksTimesHandler.java | 3 +-
.../job/checkpoints/AbstractCheckpointHandler.java | 4 +--
.../job/checkpoints/CheckpointConfigHandler.java | 3 +-
.../CheckpointStatisticDetailsHandler.java | 3 +-
.../CheckpointingStatisticsHandler.java | 3 +-
.../TaskCheckpointStatisticDetailsHandler.java | 3 +-
.../coordination/ClientCoordinationHandler.java | 6 +---
.../metrics/AbstractAggregatingMetricsHandler.java | 4 +--
.../job/metrics/AbstractMetricsHandler.java | 4 +--
.../job/metrics/AggregatingJobsMetricsHandler.java | 3 +-
.../metrics/AggregatingSubtasksMetricsHandler.java | 3 +-
.../AggregatingTaskManagersMetricsHandler.java | 3 +-
.../job/metrics/JobManagerMetricsHandler.java | 3 +-
.../handler/job/metrics/JobMetricsHandler.java | 3 +-
.../job/metrics/JobVertexMetricsHandler.java | 3 +-
.../job/metrics/JobVertexWatermarksHandler.java | 3 +-
.../handler/job/metrics/SubtaskMetricsHandler.java | 3 +-
.../job/metrics/TaskManagerMetricsHandler.java | 3 +-
.../handler/job/rescaling/RescalingHandlers.java | 16 ++++-------
.../job/savepoints/SavepointDisposalHandlers.java | 9 ++----
.../handler/job/savepoints/SavepointHandlers.java | 13 +++------
.../AbstractResourceManagerHandler.java | 4 +--
.../AbstractTaskManagerFileHandler.java | 4 +--
.../taskmanager/TaskManagerCustomLogHandler.java | 3 +-
.../taskmanager/TaskManagerDetailsHandler.java | 2 +-
.../taskmanager/TaskManagerLogListHandler.java | 2 +-
.../taskmanager/TaskManagerThreadDumpHandler.java | 2 +-
.../handler/taskmanager/TaskManagersHandler.java | 2 +-
.../rest/handler/util/HandlerRequestUtils.java | 5 ++--
.../flink/runtime/rest/FileUploadHandlerTest.java | 8 ++----
.../runtime/rest/MultipartUploadResource.java | 16 ++++-------
.../runtime/rest/RestServerEndpointITCase.java | 8 ++----
.../runtime/rest/handler/AbstractHandlerTest.java | 2 +-
.../AbstractAsynchronousOperationHandlersTest.java | 15 ++++------
.../cluster/JobManagerCustomLogHandlerTest.java | 4 +--
.../cluster/JobManagerLogListHandlerTest.java | 2 +-
.../rest/handler/job/JobConfigHandlerTest.java | 4 +--
.../rest/handler/job/JobExceptionsHandlerTest.java | 16 +++++------
.../handler/job/JobExecutionResultHandlerTest.java | 2 +-
.../job/JobVertexBackPressureHandlerTest.java | 4 +--
.../SubtaskCurrentAttemptDetailsHandlerTest.java | 2 +-
...askExecutionAttemptAccumulatorsHandlerTest.java | 2 +-
.../SubtaskExecutionAttemptDetailsHandlerTest.java | 2 +-
.../job/metrics/AbstractMetricsHandlerTest.java | 3 +-
.../metrics/AggregatingMetricsHandlerTestBase.java | 18 ++++++------
.../metrics/JobVertexWatermarksHandlerTest.java | 2 +-
.../job/savepoints/SavepointHandlersTest.java | 14 +++++-----
.../savepoints/StopWithSavepointHandlersTest.java | 14 +++++-----
.../AbstractTaskManagerFileHandlerTest.java | 2 +-
.../taskmanager/TaskManagerDetailsHandlerTest.java | 6 ++--
.../taskmanager/TaskManagerLogListHandlerTest.java | 6 ++--
.../flink/runtime/rest/util/TestRestHandler.java | 2 +-
104 files changed, 213 insertions(+), 319 deletions(-)
diff --git a/flink-clients/src/test/java/org/apache/flink/client/program/rest/RestClusterClientSavepointTriggerTest.java b/flink-clients/src/test/java/org/apache/flink/client/program/rest/RestClusterClientSavepointTriggerTest.java
index 946c8dc..061abea 100644
--- a/flink-clients/src/test/java/org/apache/flink/client/program/rest/RestClusterClientSavepointTriggerTest.java
+++ b/flink-clients/src/test/java/org/apache/flink/client/program/rest/RestClusterClientSavepointTriggerTest.java
@@ -293,11 +293,7 @@ public class RestClusterClientSavepointTriggerTest extends TestLogger {
@Override
protected CompletableFuture<TriggerResponse> handleRequest(
- @Nonnull
- HandlerRequest<
- SavepointTriggerRequestBody,
- SavepointTriggerMessageParameters>
- request,
+ @Nonnull HandlerRequest<SavepointTriggerRequestBody> request,
@Nonnull DispatcherGateway gateway)
throws RestHandlerException {
@@ -324,7 +320,7 @@ public class RestClusterClientSavepointTriggerTest extends TestLogger {
@Override
protected CompletableFuture<AsynchronousOperationResult<SavepointInfo>> handleRequest(
- @Nonnull HandlerRequest<EmptyRequestBody, SavepointStatusMessageParameters> request,
+ @Nonnull HandlerRequest<EmptyRequestBody> request,
@Nonnull DispatcherGateway gateway)
throws RestHandlerException {
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
index 90273c6..6e55bb5 100644
--- 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
@@ -274,7 +274,7 @@ public class RestClusterClientTest extends TestLogger {
@Override
protected CompletableFuture<JobSubmitResponseBody> handleRequest(
- @Nonnull HandlerRequest<JobSubmitRequestBody, EmptyMessageParameters> request,
+ @Nonnull HandlerRequest<JobSubmitRequestBody> request,
@Nonnull DispatcherGateway gateway)
throws RestHandlerException {
jobSubmitted = true;
@@ -293,7 +293,7 @@ public class RestClusterClientTest extends TestLogger {
@Override
protected CompletableFuture<EmptyResponseBody> handleRequest(
- @Nonnull HandlerRequest<EmptyRequestBody, JobCancellationMessageParameters> request,
+ @Nonnull HandlerRequest<EmptyRequestBody> request,
@Nonnull DispatcherGateway gateway)
throws RestHandlerException {
jobCanceled = true;
@@ -386,9 +386,7 @@ public class RestClusterClientTest extends TestLogger {
@Override
protected CompletableFuture<TriggerResponse> handleRequest(
- @Nonnull
- HandlerRequest<SavepointDisposalRequest, EmptyMessageParameters>
- request,
+ @Nonnull HandlerRequest<SavepointDisposalRequest> request,
@Nonnull DispatcherGateway gateway) {
assertThat(request.getRequestBody().getSavepointPath(), is(savepointPath));
return CompletableFuture.completedFuture(new TriggerResponse(triggerId));
@@ -412,11 +410,7 @@ public class RestClusterClientTest extends TestLogger {
@Override
protected CompletableFuture<AsynchronousOperationResult<AsynchronousOperationInfo>>
handleRequest(
- @Nonnull
- HandlerRequest<
- EmptyRequestBody,
- SavepointDisposalStatusMessageParameters>
- request,
+ @Nonnull HandlerRequest<EmptyRequestBody> request,
@Nonnull DispatcherGateway gateway)
throws RestHandlerException {
final TriggerId actualTriggerId =
@@ -581,7 +575,7 @@ public class RestClusterClientTest extends TestLogger {
@Override
protected CompletableFuture<JobExecutionResultResponseBody> handleRequest(
- @Nonnull HandlerRequest<EmptyRequestBody, JobMessageParameters> request,
+ @Nonnull HandlerRequest<EmptyRequestBody> request,
@Nonnull DispatcherGateway gateway) {
if (jobExecutionResults.hasNext()) {
lastJobExecutionResult = jobExecutionResults.next();
@@ -755,7 +749,7 @@ public class RestClusterClientTest extends TestLogger {
@Override
protected CompletableFuture<JobSubmitResponseBody> handleRequest(
- @Nonnull HandlerRequest<JobSubmitRequestBody, EmptyMessageParameters> request,
+ @Nonnull HandlerRequest<JobSubmitRequestBody> request,
@Nonnull DispatcherGateway gateway)
throws RestHandlerException {
throw new RestHandlerException("expected", HttpResponseStatus.INTERNAL_SERVER_ERROR);
@@ -804,7 +798,7 @@ public class RestClusterClientTest extends TestLogger {
@Override
protected CompletableFuture<EmptyResponseBody> handleRequest(
- @Nonnull HandlerRequest<EmptyRequestBody, EmptyMessageParameters> request,
+ @Nonnull HandlerRequest<EmptyRequestBody> request,
@Nonnull DispatcherGateway gateway)
throws RestHandlerException {
final CompletableFuture<EmptyResponseBody> result = responseQueue.poll();
@@ -935,11 +929,7 @@ public class RestClusterClientTest extends TestLogger {
@Override
@SuppressWarnings("unchecked")
protected CompletableFuture<ClientCoordinationResponseBody> handleRequest(
- @Nonnull
- HandlerRequest<
- ClientCoordinationRequestBody,
- ClientCoordinationMessageParameters>
- request,
+ @Nonnull HandlerRequest<ClientCoordinationRequestBody> request,
@Nonnull DispatcherGateway gateway)
throws RestHandlerException {
try {
@@ -989,7 +979,7 @@ public class RestClusterClientTest extends TestLogger {
@Override
protected CompletableFuture<JobAccumulatorsInfo> handleRequest(
- @Nonnull HandlerRequest<EmptyRequestBody, JobAccumulatorsMessageParameters> request,
+ @Nonnull HandlerRequest<EmptyRequestBody> request,
@Nonnull DispatcherGateway gateway)
throws RestHandlerException {
JobAccumulatorsInfo accumulatorsInfo;
@@ -1046,7 +1036,7 @@ public class RestClusterClientTest extends TestLogger {
@Override
protected CompletableFuture<MultipleJobsDetails> handleRequest(
- @Nonnull HandlerRequest<EmptyRequestBody, EmptyMessageParameters> request,
+ @Nonnull HandlerRequest<EmptyRequestBody> request,
@Nonnull DispatcherGateway gateway)
throws RestHandlerException {
JobDetails running =
@@ -1073,7 +1063,7 @@ public class RestClusterClientTest extends TestLogger {
@Override
protected CompletableFuture<JobDetailsInfo> handleRequest(
- @Nonnull HandlerRequest<EmptyRequestBody, JobMessageParameters> request,
+ @Nonnull HandlerRequest<EmptyRequestBody> request,
@Nonnull DispatcherGateway gateway)
throws RestHandlerException {
if (!jobDetailsInfo.hasNext()) {
diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JarDeleteHandler.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JarDeleteHandler.java
index a7dc88c..bfb059f 100644
--- a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JarDeleteHandler.java
+++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JarDeleteHandler.java
@@ -66,7 +66,7 @@ public class JarDeleteHandler
@Override
protected CompletableFuture<EmptyResponseBody> handleRequest(
- @Nonnull final HandlerRequest<EmptyRequestBody, JarDeleteMessageParameters> request,
+ @Nonnull final HandlerRequest<EmptyRequestBody> request,
@Nonnull final RestfulGateway gateway)
throws RestHandlerException {
diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JarListHandler.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JarListHandler.java
index 6c1fa34..29743d6 100644
--- a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JarListHandler.java
+++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JarListHandler.java
@@ -83,8 +83,7 @@ public class JarListHandler
@Override
protected CompletableFuture<JarListInfo> handleRequest(
- @Nonnull HandlerRequest<EmptyRequestBody, EmptyMessageParameters> request,
- @Nonnull RestfulGateway gateway)
+ @Nonnull HandlerRequest<EmptyRequestBody> request, @Nonnull RestfulGateway gateway)
throws RestHandlerException {
final String localAddress;
Preconditions.checkState(localAddressFuture.isDone());
diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JarPlanHandler.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JarPlanHandler.java
index 4690792..596c9c4 100644
--- a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JarPlanHandler.java
+++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JarPlanHandler.java
@@ -94,7 +94,7 @@ public class JarPlanHandler
@Override
protected CompletableFuture<JobPlanInfo> handleRequest(
- @Nonnull final HandlerRequest<JarPlanRequestBody, JarPlanMessageParameters> request,
+ @Nonnull final HandlerRequest<JarPlanRequestBody> request,
@Nonnull final RestfulGateway gateway)
throws RestHandlerException {
final JarHandlerContext context = JarHandlerContext.fromRequest(request, jarDir, log);
diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JarRunHandler.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JarRunHandler.java
index 0ceb636..f18046b 100644
--- a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JarRunHandler.java
+++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JarRunHandler.java
@@ -83,7 +83,7 @@ public class JarRunHandler
@Override
protected CompletableFuture<JarRunResponseBody> handleRequest(
- @Nonnull final HandlerRequest<JarRunRequestBody, JarRunMessageParameters> request,
+ @Nonnull final HandlerRequest<JarRunRequestBody> request,
@Nonnull final DispatcherGateway gateway)
throws RestHandlerException {
@@ -121,8 +121,7 @@ public class JarRunHandler
}
private SavepointRestoreSettings getSavepointRestoreSettings(
- final @Nonnull HandlerRequest<JarRunRequestBody, JarRunMessageParameters> request)
- throws RestHandlerException {
+ final @Nonnull HandlerRequest<JarRunRequestBody> request) throws RestHandlerException {
final JarRunRequestBody requestBody = request.getRequestBody();
diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JarUploadHandler.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JarUploadHandler.java
index 3dfe94f..31b3c77 100644
--- a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JarUploadHandler.java
+++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JarUploadHandler.java
@@ -69,7 +69,7 @@ public class JarUploadHandler
@Override
protected CompletableFuture<JarUploadResponseBody> handleRequest(
- @Nonnull final HandlerRequest<EmptyRequestBody, EmptyMessageParameters> request,
+ @Nonnull final HandlerRequest<EmptyRequestBody> request,
@Nonnull final RestfulGateway gateway)
throws RestHandlerException {
Collection<File> uploadedFiles = request.getUploadedFiles();
diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/utils/JarHandlerUtils.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/utils/JarHandlerUtils.java
index 1260f96..43527d5 100644
--- a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/utils/JarHandlerUtils.java
+++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/utils/JarHandlerUtils.java
@@ -91,7 +91,7 @@ public class JarHandlerUtils {
}
public static <R extends JarRequestBody> JarHandlerContext fromRequest(
- @Nonnull final HandlerRequest<R, ?> request,
+ @Nonnull final HandlerRequest<R> request,
@Nonnull final Path jarDir,
@Nonnull final Logger log)
throws RestHandlerException {
@@ -188,7 +188,7 @@ public class JarHandlerUtils {
/** Parse program arguments in jar run or plan request. */
private static <R extends JarRequestBody, M extends MessageParameters>
- List<String> getProgramArgs(HandlerRequest<R, M> request, Logger log)
+ List<String> getProgramArgs(HandlerRequest<R> request, Logger log)
throws RestHandlerException {
JarRequestBody requestBody = request.getRequestBody();
@SuppressWarnings("deprecation")
diff --git a/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarDeleteHandlerTest.java b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarDeleteHandlerTest.java
index 4746a1e..32b5097 100644
--- a/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarDeleteHandlerTest.java
+++ b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarDeleteHandlerTest.java
@@ -85,8 +85,7 @@ public class JarDeleteHandlerTest extends TestLogger {
public void testDeleteJarById() throws Exception {
assertThat(Files.exists(jarDir.resolve(TEST_JAR_NAME)), equalTo(true));
- final HandlerRequest<EmptyRequestBody, JarDeleteMessageParameters> request =
- createRequest(TEST_JAR_NAME);
+ final HandlerRequest<EmptyRequestBody> request = createRequest(TEST_JAR_NAME);
jarDeleteHandler.handleRequest(request, restfulGateway).get();
assertThat(Files.exists(jarDir.resolve(TEST_JAR_NAME)), equalTo(false));
@@ -94,8 +93,7 @@ public class JarDeleteHandlerTest extends TestLogger {
@Test
public void testDeleteUnknownJar() throws Exception {
- final HandlerRequest<EmptyRequestBody, JarDeleteMessageParameters> request =
- createRequest("doesnotexist.jar");
+ final HandlerRequest<EmptyRequestBody> request = createRequest("doesnotexist.jar");
try {
jarDeleteHandler.handleRequest(request, restfulGateway).get();
} catch (final ExecutionException e) {
@@ -118,8 +116,7 @@ public class JarDeleteHandlerTest extends TestLogger {
public void testFailedDelete() throws Exception {
makeJarDirReadOnly();
- final HandlerRequest<EmptyRequestBody, JarDeleteMessageParameters> request =
- createRequest(TEST_JAR_NAME);
+ final HandlerRequest<EmptyRequestBody> request = createRequest(TEST_JAR_NAME);
try {
jarDeleteHandler.handleRequest(request, restfulGateway).get();
} catch (final ExecutionException e) {
@@ -134,8 +131,8 @@ public class JarDeleteHandlerTest extends TestLogger {
}
}
- private static HandlerRequest<EmptyRequestBody, JarDeleteMessageParameters> createRequest(
- final String jarFileName) throws HandlerRequestException {
+ private static HandlerRequest<EmptyRequestBody> createRequest(final String jarFileName)
+ throws HandlerRequestException {
return HandlerRequest.resolveParametersAndCreate(
EmptyRequestBody.getInstance(),
new JarDeleteMessageParameters(),
diff --git a/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarHandlerParameterTest.java b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarHandlerParameterTest.java
index 3fcd991..bfbe6d7 100644
--- a/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarHandlerParameterTest.java
+++ b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarHandlerParameterTest.java
@@ -206,7 +206,7 @@ public abstract class JarHandlerParameterTest<
public void testProvideJobId() throws Exception {
JobID jobId = new JobID();
- HandlerRequest<REQB, M> request =
+ HandlerRequest<REQB> request =
createRequest(
getJarRequestBodyWithJobId(jobId),
getUnresolvedJarMessageParameters(),
@@ -279,7 +279,7 @@ public abstract class JarHandlerParameterTest<
}
protected static <REQB extends JarRequestBody, M extends JarMessageParameters>
- HandlerRequest<REQB, M> createRequest(
+ HandlerRequest<REQB> createRequest(
REQB requestBody, M parameters, M unresolvedMessageParameters, Path jar)
throws HandlerRequestException {
@@ -316,7 +316,7 @@ public abstract class JarHandlerParameterTest<
abstract REQB getJarRequestBodyWithJobId(JobID jobId);
- abstract void handleRequest(HandlerRequest<REQB, M> request) throws Exception;
+ abstract void handleRequest(HandlerRequest<REQB> request) throws Exception;
JobGraph validateDefaultGraph() {
JobGraph jobGraph = LAST_SUBMITTED_JOB_GRAPH_REFERENCE.getAndSet(null);
diff --git a/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarHandlers.java b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarHandlers.java
index b726f28..e03a0fb 100644
--- a/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarHandlers.java
+++ b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarHandlers.java
@@ -105,7 +105,8 @@ public class JarHandlers {
public static String uploadJar(
JarUploadHandler handler, Path jar, RestfulGateway restfulGateway) throws Exception {
- HandlerRequest<EmptyRequestBody, EmptyMessageParameters> uploadRequest =
+
+ HandlerRequest<EmptyRequestBody> uploadRequest =
HandlerRequest.create(
EmptyRequestBody.getInstance(),
EmptyMessageParameters.getInstance(),
@@ -117,7 +118,7 @@ public class JarHandlers {
public static JarListInfo listJars(JarListHandler handler, RestfulGateway restfulGateway)
throws Exception {
- HandlerRequest<EmptyRequestBody, EmptyMessageParameters> listRequest =
+ HandlerRequest<EmptyRequestBody> listRequest =
HandlerRequest.create(
EmptyRequestBody.getInstance(), EmptyMessageParameters.getInstance());
return handler.handleRequest(listRequest, restfulGateway).get();
@@ -128,7 +129,7 @@ public class JarHandlers {
throws Exception {
JarPlanMessageParameters planParameters =
JarPlanGetHeaders.getInstance().getUnresolvedMessageParameters();
- HandlerRequest<JarPlanRequestBody, JarPlanMessageParameters> planRequest =
+ HandlerRequest<JarPlanRequestBody> planRequest =
HandlerRequest.resolveParametersAndCreate(
new JarPlanRequestBody(),
planParameters,
@@ -144,7 +145,7 @@ public class JarHandlers {
throws Exception {
final JarRunMessageParameters runParameters =
JarRunHeaders.getInstance().getUnresolvedMessageParameters();
- HandlerRequest<JarRunRequestBody, JarRunMessageParameters> runRequest =
+ HandlerRequest<JarRunRequestBody> runRequest =
HandlerRequest.resolveParametersAndCreate(
new JarRunRequestBody(),
runParameters,
@@ -160,7 +161,7 @@ public class JarHandlers {
throws Exception {
JarDeleteMessageParameters deleteParameters =
JarDeleteHeaders.getInstance().getUnresolvedMessageParameters();
- HandlerRequest<EmptyRequestBody, JarDeleteMessageParameters> deleteRequest =
+ HandlerRequest<EmptyRequestBody> deleteRequest =
HandlerRequest.resolveParametersAndCreate(
EmptyRequestBody.getInstance(),
deleteParameters,
diff --git a/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarPlanHandlerParameterTest.java b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarPlanHandlerParameterTest.java
index 489ed80..2732790 100644
--- a/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarPlanHandlerParameterTest.java
+++ b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarPlanHandlerParameterTest.java
@@ -119,8 +119,7 @@ public class JarPlanHandlerParameterTest
}
@Override
- void handleRequest(HandlerRequest<JarPlanRequestBody, JarPlanMessageParameters> request)
- throws Exception {
+ void handleRequest(HandlerRequest<JarPlanRequestBody> request) throws Exception {
handler.handleRequest(request, restfulGateway).get();
}
}
diff --git a/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarRunHandlerParameterTest.java b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarRunHandlerParameterTest.java
index 4dd8ab9..492035f 100644
--- a/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarRunHandlerParameterTest.java
+++ b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarRunHandlerParameterTest.java
@@ -192,7 +192,7 @@ public class JarRunHandlerParameterTest
@Test
public void testRestHandlerExceptionThrownWithEagerSinks() throws Exception {
- final HandlerRequest<JarRunRequestBody, JarRunMessageParameters> request =
+ final HandlerRequest<JarRunRequestBody> request =
createRequest(
getDefaultJarRequestBody(),
getUnresolvedJarMessageParameters(),
@@ -226,8 +226,7 @@ public class JarRunHandlerParameterTest
}
@Override
- void handleRequest(HandlerRequest<JarRunRequestBody, JarRunMessageParameters> request)
- throws Exception {
+ void handleRequest(HandlerRequest<JarRunRequestBody> request) throws Exception {
handler.handleRequest(request, restfulGateway).get();
}
diff --git a/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarUploadHandlerTest.java b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarUploadHandlerTest.java
index d90b95c..865b896 100644
--- a/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarUploadHandlerTest.java
+++ b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarUploadHandlerTest.java
@@ -80,8 +80,7 @@ public class JarUploadHandlerTest extends TestLogger {
@Test
public void testRejectNonJarFiles() throws Exception {
final Path uploadedFile = Files.createFile(jarDir.resolve("katrin.png"));
- final HandlerRequest<EmptyRequestBody, EmptyMessageParameters> request =
- createRequest(uploadedFile);
+ final HandlerRequest<EmptyRequestBody> request = createRequest(uploadedFile);
try {
jarUploadHandler.handleRequest(request, mockDispatcherGateway).get();
@@ -99,8 +98,7 @@ public class JarUploadHandlerTest extends TestLogger {
@Test
public void testUploadJar() throws Exception {
final Path uploadedFile = Files.createFile(jarDir.resolve("FooBazzleExample.jar"));
- final HandlerRequest<EmptyRequestBody, EmptyMessageParameters> request =
- createRequest(uploadedFile);
+ final HandlerRequest<EmptyRequestBody> request = createRequest(uploadedFile);
final JarUploadResponseBody jarUploadResponseBody =
jarUploadHandler.handleRequest(request, mockDispatcherGateway).get();
@@ -117,8 +115,7 @@ public class JarUploadHandlerTest extends TestLogger {
@Test
public void testFailedUpload() throws Exception {
final Path uploadedFile = jarDir.resolve("FooBazzleExample.jar");
- final HandlerRequest<EmptyRequestBody, EmptyMessageParameters> request =
- createRequest(uploadedFile);
+ final HandlerRequest<EmptyRequestBody> request = createRequest(uploadedFile);
try {
jarUploadHandler.handleRequest(request, mockDispatcherGateway).get();
@@ -136,8 +133,8 @@ public class JarUploadHandlerTest extends TestLogger {
}
}
- private static HandlerRequest<EmptyRequestBody, EmptyMessageParameters> createRequest(
- final Path uploadedFile) throws HandlerRequestException, IOException {
+ private static HandlerRequest<EmptyRequestBody> createRequest(final Path uploadedFile)
+ throws HandlerRequestException, IOException {
return HandlerRequest.create(
EmptyRequestBody.getInstance(),
EmptyMessageParameters.getInstance(),
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/AbstractHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/AbstractHandler.java
index fe8f806..897d732 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/AbstractHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/AbstractHandler.java
@@ -171,7 +171,7 @@ public abstract class AbstractHandler<
}
}
- final HandlerRequest<R, M> handlerRequest;
+ final HandlerRequest<R> handlerRequest;
try {
handlerRequest =
@@ -316,7 +316,7 @@ public abstract class AbstractHandler<
protected abstract CompletableFuture<Void> respondToRequest(
ChannelHandlerContext ctx,
HttpRequest httpRequest,
- HandlerRequest<R, M> handlerRequest,
+ HandlerRequest<R> handlerRequest,
T gateway)
throws RestHandlerException;
}
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/AbstractRestHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/AbstractRestHandler.java
index f5749fc..c3f503d 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/AbstractRestHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/AbstractRestHandler.java
@@ -75,7 +75,7 @@ public abstract class AbstractRestHandler<
protected CompletableFuture<Void> respondToRequest(
ChannelHandlerContext ctx,
HttpRequest httpRequest,
- HandlerRequest<R, M> handlerRequest,
+ HandlerRequest<R> handlerRequest,
T gateway) {
CompletableFuture<P> response;
@@ -113,5 +113,5 @@ public abstract class AbstractRestHandler<
* @throws RestHandlerException if the handling failed
*/
protected abstract CompletableFuture<P> handleRequest(
- @Nonnull HandlerRequest<R, M> request, @Nonnull T gateway) throws RestHandlerException;
+ @Nonnull HandlerRequest<R> request, @Nonnull T gateway) throws RestHandlerException;
}
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/HandlerRequest.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/HandlerRequest.java
index e1695c9..0375b90 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/HandlerRequest.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/HandlerRequest.java
@@ -41,9 +41,8 @@ import java.util.StringJoiner;
* path/query parameters.
*
* @param <R> type of the contained request body
- * @param <M> type of the contained message parameters
*/
-public class HandlerRequest<R extends RequestBody, M extends MessageParameters> {
+public class HandlerRequest<R extends RequestBody> {
private final R requestBody;
private final Collection<File> uploadedFiles;
@@ -123,7 +122,7 @@ public class HandlerRequest<R extends RequestBody, M extends MessageParameters>
* uploaded files.
*/
@VisibleForTesting
- public static <R extends RequestBody, M extends MessageParameters> HandlerRequest<R, M> create(
+ public static <R extends RequestBody, M extends MessageParameters> HandlerRequest<R> create(
R requestBody, M messageParameters) {
return create(requestBody, messageParameters, Collections.emptyList());
}
@@ -133,9 +132,9 @@ public class HandlerRequest<R extends RequestBody, M extends MessageParameters>
* resolved.
*/
@VisibleForTesting
- public static <R extends RequestBody, M extends MessageParameters> HandlerRequest<R, M> create(
+ public static <R extends RequestBody, M extends MessageParameters> HandlerRequest<R> create(
R requestBody, M messageParameters, Collection<File> uploadedFiles) {
- return new HandlerRequest<R, M>(
+ return new HandlerRequest<R>(
requestBody,
mapParameters(messageParameters.getPathParameters()),
mapParameters(messageParameters.getQueryParameters()),
@@ -149,7 +148,7 @@ public class HandlerRequest<R extends RequestBody, M extends MessageParameters>
* <p>For tests it is recommended to resolve the parameters manually and use {@link #create}.
*/
public static <R extends RequestBody, M extends MessageParameters>
- HandlerRequest<R, M> resolveParametersAndCreate(
+ HandlerRequest<R> resolveParametersAndCreate(
R requestBody,
M messageParameters,
Map<String, String> receivedPathParameters,
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/async/AbstractAsynchronousOperationHandlers.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/async/AbstractAsynchronousOperationHandlers.java
index c8b3e57..909389a 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/async/AbstractAsynchronousOperationHandlers.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/async/AbstractAsynchronousOperationHandlers.java
@@ -113,7 +113,7 @@ public abstract class AbstractAsynchronousOperationHandlers<K extends OperationK
@Override
public CompletableFuture<TriggerResponse> handleRequest(
- @Nonnull HandlerRequest<B, M> request, @Nonnull T gateway)
+ @Nonnull HandlerRequest<B> request, @Nonnull T gateway)
throws RestHandlerException {
final CompletableFuture<R> resultFuture = triggerOperation(request, gateway);
@@ -134,7 +134,7 @@ public abstract class AbstractAsynchronousOperationHandlers<K extends OperationK
* @throws RestHandlerException if something went wrong
*/
protected abstract CompletableFuture<R> triggerOperation(
- HandlerRequest<B, M> request, T gateway) throws RestHandlerException;
+ HandlerRequest<B> request, T gateway) throws RestHandlerException;
/**
* Create the operation key under which the result future of the asynchronous operation will
@@ -143,7 +143,7 @@ public abstract class AbstractAsynchronousOperationHandlers<K extends OperationK
* @param request with which the trigger handler has been called.
* @return Operation key under which the result future will be stored
*/
- protected abstract K createOperationKey(HandlerRequest<B, M> request);
+ protected abstract K createOperationKey(HandlerRequest<B> request);
}
/**
@@ -170,7 +170,7 @@ public abstract class AbstractAsynchronousOperationHandlers<K extends OperationK
@Override
public CompletableFuture<AsynchronousOperationResult<V>> handleRequest(
- @Nonnull HandlerRequest<EmptyRequestBody, M> request, @Nonnull T gateway)
+ @Nonnull HandlerRequest<EmptyRequestBody> request, @Nonnull T gateway)
throws RestHandlerException {
final K key = getOperationKey(request);
@@ -210,7 +210,7 @@ public abstract class AbstractAsynchronousOperationHandlers<K extends OperationK
* @param request with which the status handler has been called
* @return Operation key under which the operation result future is stored
*/
- protected abstract K getOperationKey(HandlerRequest<EmptyRequestBody, M> request);
+ protected abstract K getOperationKey(HandlerRequest<EmptyRequestBody> request);
/**
* Create an exceptional operation result from the given {@link Throwable}. This method is
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/cluster/AbstractJobManagerFileHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/cluster/AbstractJobManagerFileHandler.java
index 06692a6..db8b06b 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/cluster/AbstractJobManagerFileHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/cluster/AbstractJobManagerFileHandler.java
@@ -58,7 +58,7 @@ public abstract class AbstractJobManagerFileHandler<M extends MessageParameters>
protected CompletableFuture<Void> respondToRequest(
ChannelHandlerContext ctx,
HttpRequest httpRequest,
- HandlerRequest<EmptyRequestBody, M> handlerRequest,
+ HandlerRequest<EmptyRequestBody> handlerRequest,
RestfulGateway gateway) {
File file = getFile(handlerRequest);
if (file != null && file.exists()) {
@@ -80,5 +80,5 @@ public abstract class AbstractJobManagerFileHandler<M extends MessageParameters>
}
@Nullable
- protected abstract File getFile(HandlerRequest<EmptyRequestBody, M> handlerRequest);
+ protected abstract File getFile(HandlerRequest<EmptyRequestBody> handlerRequest);
}
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/cluster/ClusterConfigHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/cluster/ClusterConfigHandler.java
index ba8873e..26d0aa6 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/cluster/ClusterConfigHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/cluster/ClusterConfigHandler.java
@@ -61,8 +61,7 @@ public class ClusterConfigHandler
@Override
protected CompletableFuture<ClusterConfigurationInfo> handleRequest(
- @Nonnull HandlerRequest<EmptyRequestBody, EmptyMessageParameters> request,
- @Nonnull RestfulGateway gateway)
+ @Nonnull HandlerRequest<EmptyRequestBody> request, @Nonnull RestfulGateway gateway)
throws RestHandlerException {
return CompletableFuture.completedFuture(clusterConfig);
}
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/cluster/ClusterOverviewHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/cluster/ClusterOverviewHandler.java
index 660b439..4a02852 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/cluster/ClusterOverviewHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/cluster/ClusterOverviewHandler.java
@@ -58,8 +58,7 @@ public class ClusterOverviewHandler
@Override
public CompletableFuture<ClusterOverviewWithVersion> handleRequest(
- @Nonnull HandlerRequest<EmptyRequestBody, EmptyMessageParameters> request,
- @Nonnull RestfulGateway gateway) {
+ @Nonnull HandlerRequest<EmptyRequestBody> request, @Nonnull RestfulGateway gateway) {
CompletableFuture<ClusterOverview> overviewFuture = gateway.requestClusterOverview(timeout);
return overviewFuture.thenApply(
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/cluster/DashboardConfigHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/cluster/DashboardConfigHandler.java
index 284db86..8d212d2 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/cluster/DashboardConfigHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/cluster/DashboardConfigHandler.java
@@ -59,8 +59,7 @@ public class DashboardConfigHandler
@Override
public CompletableFuture<DashboardConfiguration> handleRequest(
- @Nonnull HandlerRequest<EmptyRequestBody, EmptyMessageParameters> request,
- @Nonnull RestfulGateway gateway) {
+ @Nonnull HandlerRequest<EmptyRequestBody> request, @Nonnull RestfulGateway gateway) {
return CompletableFuture.completedFuture(dashboardConfiguration);
}
}
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/cluster/JobManagerCustomLogHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/cluster/JobManagerCustomLogHandler.java
index 5ed6dc7..66298f3 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/cluster/JobManagerCustomLogHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/cluster/JobManagerCustomLogHandler.java
@@ -50,7 +50,7 @@ public class JobManagerCustomLogHandler
}
@Override
- protected File getFile(HandlerRequest<EmptyRequestBody, FileMessageParameters> handlerRequest) {
+ protected File getFile(HandlerRequest<EmptyRequestBody> handlerRequest) {
if (logDir == null) {
return null;
}
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/cluster/JobManagerLogFileHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/cluster/JobManagerLogFileHandler.java
index 13a6824..e698646 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/cluster/JobManagerLogFileHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/cluster/JobManagerLogFileHandler.java
@@ -49,8 +49,7 @@ public class JobManagerLogFileHandler
}
@Override
- protected File getFile(
- HandlerRequest<EmptyRequestBody, EmptyMessageParameters> handlerRequest) {
+ protected File getFile(HandlerRequest<EmptyRequestBody> handlerRequest) {
return file;
}
}
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/cluster/JobManagerLogListHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/cluster/JobManagerLogListHandler.java
index 7fc9564..045240e 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/cluster/JobManagerLogListHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/cluster/JobManagerLogListHandler.java
@@ -63,8 +63,7 @@ public class JobManagerLogListHandler
@Override
protected CompletableFuture<LogListInfo> handleRequest(
- @Nonnull HandlerRequest<EmptyRequestBody, EmptyMessageParameters> request,
- @Nonnull RestfulGateway gateway)
+ @Nonnull HandlerRequest<EmptyRequestBody> request, @Nonnull RestfulGateway gateway)
throws RestHandlerException {
if (logDir == null) {
return CompletableFuture.completedFuture(new LogListInfo(Collections.emptyList()));
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/cluster/ShutdownHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/cluster/ShutdownHandler.java
index f356a3d..2a213b6 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/cluster/ShutdownHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/cluster/ShutdownHandler.java
@@ -50,7 +50,7 @@ public class ShutdownHandler
@Override
protected CompletableFuture<EmptyResponseBody> handleRequest(
- @Nonnull final HandlerRequest<EmptyRequestBody, EmptyMessageParameters> request,
+ @Nonnull final HandlerRequest<EmptyRequestBody> request,
@Nonnull final RestfulGateway gateway)
throws RestHandlerException {
return gateway.shutDownCluster().thenApply(ignored -> EmptyResponseBody.getInstance());
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/dataset/ClusterDataSetDeleteHandlers.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/dataset/ClusterDataSetDeleteHandlers.java
index 95c4b52..27096c5 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/dataset/ClusterDataSetDeleteHandlers.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/dataset/ClusterDataSetDeleteHandlers.java
@@ -69,9 +69,7 @@ public class ClusterDataSetDeleteHandlers
@Override
protected CompletableFuture<Void> triggerOperation(
- HandlerRequest<EmptyRequestBody, ClusterDataSetDeleteTriggerMessageParameters>
- request,
- RestfulGateway gateway)
+ HandlerRequest<EmptyRequestBody> request, RestfulGateway gateway)
throws RestHandlerException {
final IntermediateDataSetID clusterPartitionId =
request.getPathParameter(ClusterDataSetIdPathParameter.class);
@@ -82,9 +80,7 @@ public class ClusterDataSetDeleteHandlers
}
@Override
- protected OperationKey createOperationKey(
- HandlerRequest<EmptyRequestBody, ClusterDataSetDeleteTriggerMessageParameters>
- request) {
+ protected OperationKey createOperationKey(HandlerRequest<EmptyRequestBody> request) {
return new OperationKey(new TriggerId());
}
}
@@ -108,9 +104,7 @@ public class ClusterDataSetDeleteHandlers
}
@Override
- protected OperationKey getOperationKey(
- HandlerRequest<EmptyRequestBody, ClusterDataSetDeleteStatusMessageParameters>
- request) {
+ protected OperationKey getOperationKey(HandlerRequest<EmptyRequestBody> request) {
final TriggerId triggerId = request.getPathParameter(TriggerIdPathParameter.class);
return new OperationKey(triggerId);
}
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/dataset/ClusterDataSetListHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/dataset/ClusterDataSetListHandler.java
index 9c46c14..af75004 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/dataset/ClusterDataSetListHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/dataset/ClusterDataSetListHandler.java
@@ -56,7 +56,7 @@ public class ClusterDataSetListHandler
@Override
protected CompletableFuture<ClusterDataSetListResponseBody> handleRequest(
- @Nonnull HandlerRequest<EmptyRequestBody, EmptyMessageParameters> request,
+ @Nonnull HandlerRequest<EmptyRequestBody> request,
@Nonnull ResourceManagerGateway gateway)
throws RestHandlerException {
return gateway.listDataSets().thenApply(ClusterDataSetListResponseBody::from);
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/AbstractAccessExecutionGraphHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/AbstractAccessExecutionGraphHandler.java
index f8d2aab..317f0ed 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/AbstractAccessExecutionGraphHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/AbstractAccessExecutionGraphHandler.java
@@ -63,12 +63,12 @@ public abstract class AbstractAccessExecutionGraphHandler<
@Override
protected R handleRequest(
- HandlerRequest<EmptyRequestBody, M> request, ExecutionGraphInfo executionGraphInfo)
+ HandlerRequest<EmptyRequestBody> request, ExecutionGraphInfo executionGraphInfo)
throws RestHandlerException {
return handleRequest(request, executionGraphInfo.getArchivedExecutionGraph());
}
protected abstract R handleRequest(
- HandlerRequest<EmptyRequestBody, M> request, AccessExecutionGraph executionGraph)
+ HandlerRequest<EmptyRequestBody> request, AccessExecutionGraph executionGraph)
throws RestHandlerException;
}
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/AbstractExecutionGraphHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/AbstractExecutionGraphHandler.java
index e8910a1..d05f6b7 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/AbstractExecutionGraphHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/AbstractExecutionGraphHandler.java
@@ -73,7 +73,7 @@ public abstract class AbstractExecutionGraphHandler<
@Override
protected CompletableFuture<R> handleRequest(
- @Nonnull HandlerRequest<EmptyRequestBody, M> request, @Nonnull RestfulGateway gateway)
+ @Nonnull HandlerRequest<EmptyRequestBody> request, @Nonnull RestfulGateway gateway)
throws RestHandlerException {
JobID jobId = request.getPathParameter(JobIDPathParameter.class);
@@ -114,6 +114,6 @@ public abstract class AbstractExecutionGraphHandler<
* @throws RestHandlerException if the handler could not process the request
*/
protected abstract R handleRequest(
- HandlerRequest<EmptyRequestBody, M> request, ExecutionGraphInfo executionGraphInfo)
+ HandlerRequest<EmptyRequestBody> request, ExecutionGraphInfo executionGraphInfo)
throws RestHandlerException;
}
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/AbstractJobVertexHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/AbstractJobVertexHandler.java
index 1e001ac..efed650 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/AbstractJobVertexHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/AbstractJobVertexHandler.java
@@ -80,7 +80,7 @@ public abstract class AbstractJobVertexHandler<
@Override
protected R handleRequest(
- HandlerRequest<EmptyRequestBody, M> request, AccessExecutionGraph executionGraph)
+ HandlerRequest<EmptyRequestBody> request, AccessExecutionGraph executionGraph)
throws RestHandlerException {
final JobVertexID jobVertexID = request.getPathParameter(JobVertexIdPathParameter.class);
@@ -105,6 +105,6 @@ public abstract class AbstractJobVertexHandler<
* @throws RestHandlerException if the handler could not process the request
*/
protected abstract R handleRequest(
- HandlerRequest<EmptyRequestBody, M> request, AccessExecutionJobVertex jobVertex)
+ HandlerRequest<EmptyRequestBody> request, AccessExecutionJobVertex jobVertex)
throws RestHandlerException;
}
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/AbstractSubtaskAttemptHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/AbstractSubtaskAttemptHandler.java
index 65f58e3..aaa3371 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/AbstractSubtaskAttemptHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/AbstractSubtaskAttemptHandler.java
@@ -82,7 +82,7 @@ public abstract class AbstractSubtaskAttemptHandler<
@Override
protected R handleRequest(
- HandlerRequest<EmptyRequestBody, M> request, AccessExecutionVertex executionVertex)
+ HandlerRequest<EmptyRequestBody> request, AccessExecutionVertex executionVertex)
throws RestHandlerException {
final Integer attemptNumber = request.getPathParameter(SubtaskAttemptPathParameter.class);
@@ -119,6 +119,6 @@ public abstract class AbstractSubtaskAttemptHandler<
* @throws RestHandlerException the rest handler exception
*/
protected abstract R handleRequest(
- HandlerRequest<EmptyRequestBody, M> request, AccessExecution execution)
+ HandlerRequest<EmptyRequestBody> request, AccessExecution execution)
throws RestHandlerException;
}
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/AbstractSubtaskHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/AbstractSubtaskHandler.java
index fca5a18..80162bb 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/AbstractSubtaskHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/AbstractSubtaskHandler.java
@@ -81,7 +81,7 @@ public abstract class AbstractSubtaskHandler<
@Override
protected R handleRequest(
- HandlerRequest<EmptyRequestBody, M> request, AccessExecutionJobVertex jobVertex)
+ HandlerRequest<EmptyRequestBody> request, AccessExecutionJobVertex jobVertex)
throws RestHandlerException {
final Integer subtaskIndex = request.getPathParameter(SubtaskIndexPathParameter.class);
@@ -106,6 +106,6 @@ public abstract class AbstractSubtaskHandler<
* @throws RestHandlerException the rest handler exception
*/
protected abstract R handleRequest(
- HandlerRequest<EmptyRequestBody, M> request, AccessExecutionVertex executionVertex)
+ HandlerRequest<EmptyRequestBody> request, AccessExecutionVertex executionVertex)
throws RestHandlerException;
}
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobAccumulatorsHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobAccumulatorsHandler.java
index b1ace61..cc9f33d 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobAccumulatorsHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobAccumulatorsHandler.java
@@ -71,8 +71,7 @@ public class JobAccumulatorsHandler
@Override
protected JobAccumulatorsInfo handleRequest(
- HandlerRequest<EmptyRequestBody, JobAccumulatorsMessageParameters> request,
- AccessExecutionGraph graph)
+ HandlerRequest<EmptyRequestBody> request, AccessExecutionGraph graph)
throws RestHandlerException {
List<Boolean> queryParams =
request.getQueryParameter(AccumulatorsIncludeSerializedValueQueryParameter.class);
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobCancellationHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobCancellationHandler.java
index e9b871d..934d235 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobCancellationHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobCancellationHandler.java
@@ -69,8 +69,7 @@ public class JobCancellationHandler
@Override
public CompletableFuture<EmptyResponseBody> handleRequest(
- HandlerRequest<EmptyRequestBody, JobCancellationMessageParameters> request,
- RestfulGateway gateway)
+ HandlerRequest<EmptyRequestBody> request, RestfulGateway gateway)
throws RestHandlerException {
final JobID jobId = request.getPathParameter(JobIDPathParameter.class);
final List<TerminationModeQueryParameter.TerminationMode> terminationModes =
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobConfigHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobConfigHandler.java
index 18cc63c..51778c4 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobConfigHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobConfigHandler.java
@@ -64,8 +64,7 @@ public class JobConfigHandler
@Override
protected JobConfigInfo handleRequest(
- HandlerRequest<EmptyRequestBody, JobMessageParameters> request,
- AccessExecutionGraph executionGraph) {
+ HandlerRequest<EmptyRequestBody> request, AccessExecutionGraph executionGraph) {
return createJobConfigInfo(executionGraph);
}
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobDetailsHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobDetailsHandler.java
index 8ef2e51..68b16fd 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobDetailsHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobDetailsHandler.java
@@ -82,8 +82,7 @@ public class JobDetailsHandler
@Override
protected JobDetailsInfo handleRequest(
- HandlerRequest<EmptyRequestBody, JobMessageParameters> request,
- AccessExecutionGraph executionGraph)
+ HandlerRequest<EmptyRequestBody> request, AccessExecutionGraph executionGraph)
throws RestHandlerException {
return createJobDetailsInfo(executionGraph, metricFetcher);
}
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobExceptionsHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobExceptionsHandler.java
index f9e0393..f5df249 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobExceptionsHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobExceptionsHandler.java
@@ -90,8 +90,7 @@ public class JobExceptionsHandler
@Override
protected JobExceptionsInfoWithHistory handleRequest(
- HandlerRequest<EmptyRequestBody, JobExceptionsMessageParameters> request,
- ExecutionGraphInfo executionGraph) {
+ HandlerRequest<EmptyRequestBody> request, ExecutionGraphInfo executionGraph) {
List<Integer> exceptionToReportMaxSizes =
request.getQueryParameter(UpperLimitExceptionParameter.class);
final int exceptionToReportMaxSize =
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobExecutionResultHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobExecutionResultHandler.java
index 4536893..a32f0b2 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobExecutionResultHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobExecutionResultHandler.java
@@ -59,7 +59,7 @@ public class JobExecutionResultHandler
@Override
protected CompletableFuture<JobExecutionResultResponseBody> handleRequest(
- @Nonnull final HandlerRequest<EmptyRequestBody, JobMessageParameters> request,
+ @Nonnull final HandlerRequest<EmptyRequestBody> request,
@Nonnull final RestfulGateway gateway)
throws RestHandlerException {
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobIdsHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobIdsHandler.java
index c4dec9d..29b9ed2 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobIdsHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobIdsHandler.java
@@ -54,8 +54,7 @@ public class JobIdsHandler
@Override
protected CompletableFuture<JobIdsWithStatusOverview> handleRequest(
- @Nonnull HandlerRequest<EmptyRequestBody, EmptyMessageParameters> request,
- @Nonnull RestfulGateway gateway)
+ @Nonnull HandlerRequest<EmptyRequestBody> request, @Nonnull RestfulGateway gateway)
throws RestHandlerException {
return gateway.requestMultipleJobDetails(timeout)
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobPlanHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobPlanHandler.java
index 0726fca..7dcbf5f 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobPlanHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobPlanHandler.java
@@ -57,8 +57,7 @@ public class JobPlanHandler
@Override
protected JobPlanInfo handleRequest(
- HandlerRequest<EmptyRequestBody, JobMessageParameters> request,
- AccessExecutionGraph executionGraph)
+ HandlerRequest<EmptyRequestBody> request, AccessExecutionGraph executionGraph)
throws RestHandlerException {
return createJobPlanInfo(executionGraph);
}
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobSubmitHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobSubmitHandler.java
index c890316..d040f36 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobSubmitHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobSubmitHandler.java
@@ -80,7 +80,7 @@ public final class JobSubmitHandler
@Override
protected CompletableFuture<JobSubmitResponseBody> handleRequest(
- @Nonnull HandlerRequest<JobSubmitRequestBody, EmptyMessageParameters> request,
+ @Nonnull HandlerRequest<JobSubmitRequestBody> request,
@Nonnull DispatcherGateway gateway)
throws RestHandlerException {
final Collection<File> uploadedFiles = request.getUploadedFiles();
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobVertexAccumulatorsHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobVertexAccumulatorsHandler.java
index fe17c7b..35af929 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobVertexAccumulatorsHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobVertexAccumulatorsHandler.java
@@ -59,8 +59,7 @@ public class JobVertexAccumulatorsHandler
@Override
protected JobVertexAccumulatorsInfo handleRequest(
- HandlerRequest<EmptyRequestBody, JobVertexMessageParameters> request,
- AccessExecutionJobVertex jobVertex)
+ HandlerRequest<EmptyRequestBody> request, AccessExecutionJobVertex jobVertex)
throws RestHandlerException {
StringifiedAccumulatorResult[] accs = jobVertex.getAggregatedUserAccumulatorsStringified();
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobVertexBackPressureHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobVertexBackPressureHandler.java
index edeacf1..895fe70 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobVertexBackPressureHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobVertexBackPressureHandler.java
@@ -69,8 +69,7 @@ public class JobVertexBackPressureHandler
@Override
protected CompletableFuture<JobVertexBackPressureInfo> handleRequest(
- @Nonnull HandlerRequest<EmptyRequestBody, JobVertexMessageParameters> request,
- @Nonnull RestfulGateway gateway)
+ @Nonnull HandlerRequest<EmptyRequestBody> request, @Nonnull RestfulGateway gateway)
throws RestHandlerException {
metricFetcher.update();
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobVertexDetailsHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobVertexDetailsHandler.java
index 7186704..e4ac770 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobVertexDetailsHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobVertexDetailsHandler.java
@@ -79,8 +79,7 @@ public class JobVertexDetailsHandler
@Override
protected JobVertexDetailsInfo handleRequest(
- HandlerRequest<EmptyRequestBody, JobVertexMessageParameters> request,
- AccessExecutionGraph executionGraph)
+ HandlerRequest<EmptyRequestBody> request, AccessExecutionGraph executionGraph)
throws NotFoundException {
JobID jobID = request.getPathParameter(JobIDPathParameter.class);
JobVertexID jobVertexID = request.getPathParameter(JobVertexIdPathParameter.class);
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobVertexFlameGraphHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobVertexFlameGraphHandler.java
index e082148..eb23f0f 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobVertexFlameGraphHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobVertexFlameGraphHandler.java
@@ -71,8 +71,7 @@ public class JobVertexFlameGraphHandler
@Override
protected JobVertexFlameGraph handleRequest(
- HandlerRequest<EmptyRequestBody, JobVertexFlameGraphParameters> request,
- AccessExecutionJobVertex jobVertex)
+ HandlerRequest<EmptyRequestBody> request, AccessExecutionJobVertex jobVertex)
throws RestHandlerException {
if (jobVertex.getAggregateState().isTerminal()) {
@@ -109,8 +108,7 @@ public class JobVertexFlameGraphHandler
return operatorFlameGraph.orElse(JobVertexFlameGraph.waiting());
}
- private static FlameGraphTypeQueryParameter.Type getFlameGraphType(
- HandlerRequest<?, JobVertexFlameGraphParameters> request) {
+ private static FlameGraphTypeQueryParameter.Type getFlameGraphType(HandlerRequest<?> request) {
final List<FlameGraphTypeQueryParameter.Type> flameGraphTypeParameter =
request.getQueryParameter(FlameGraphTypeQueryParameter.class);
@@ -152,8 +150,7 @@ public class JobVertexFlameGraphHandler
@Override
protected CompletableFuture<JobVertexFlameGraph> handleRequest(
- @Nonnull HandlerRequest<EmptyRequestBody, JobVertexFlameGraphParameters> request,
- @Nonnull RestfulGateway gateway)
+ @Nonnull HandlerRequest<EmptyRequestBody> request, @Nonnull RestfulGateway gateway)
throws RestHandlerException {
return CompletableFuture.completedFuture(JobVertexFlameGraph.disabled());
}
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobVertexTaskManagersHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobVertexTaskManagersHandler.java
index 672576f..d1ed403 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobVertexTaskManagersHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobVertexTaskManagersHandler.java
@@ -88,8 +88,7 @@ public class JobVertexTaskManagersHandler
@Override
protected JobVertexTaskManagersInfo handleRequest(
- HandlerRequest<EmptyRequestBody, JobVertexMessageParameters> request,
- AccessExecutionGraph executionGraph)
+ HandlerRequest<EmptyRequestBody> request, AccessExecutionGraph executionGraph)
throws RestHandlerException {
JobID jobID = request.getPathParameter(JobIDPathParameter.class);
JobVertexID jobVertexID = request.getPathParameter(JobVertexIdPathParameter.class);
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobsOverviewHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobsOverviewHandler.java
index 2448354..dbb8bec 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobsOverviewHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobsOverviewHandler.java
@@ -60,8 +60,7 @@ public class JobsOverviewHandler
@Override
protected CompletableFuture<MultipleJobsDetails> handleRequest(
- @Nonnull HandlerRequest<EmptyRequestBody, EmptyMessageParameters> request,
- @Nonnull RestfulGateway gateway)
+ @Nonnull HandlerRequest<EmptyRequestBody> request, @Nonnull RestfulGateway gateway)
throws RestHandlerException {
return gateway.requestMultipleJobDetails(timeout);
}
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/SubtaskCurrentAttemptDetailsHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/SubtaskCurrentAttemptDetailsHandler.java
index 6204fa0..ba25ac5 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/SubtaskCurrentAttemptDetailsHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/SubtaskCurrentAttemptDetailsHandler.java
@@ -73,8 +73,7 @@ public class SubtaskCurrentAttemptDetailsHandler
@Override
protected SubtaskExecutionAttemptDetailsInfo handleRequest(
- HandlerRequest<EmptyRequestBody, SubtaskMessageParameters> request,
- AccessExecutionVertex executionVertex)
+ HandlerRequest<EmptyRequestBody> request, AccessExecutionVertex executionVertex)
throws RestHandlerException {
final AccessExecution execution = executionVertex.getCurrentExecutionAttempt();
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/SubtaskExecutionAttemptAccumulatorsHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/SubtaskExecutionAttemptAccumulatorsHandler.java
index 3bf04ba..f10cfbf 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/SubtaskExecutionAttemptAccumulatorsHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/SubtaskExecutionAttemptAccumulatorsHandler.java
@@ -88,8 +88,7 @@ public class SubtaskExecutionAttemptAccumulatorsHandler
@Override
protected SubtaskExecutionAttemptAccumulatorsInfo handleRequest(
- HandlerRequest<EmptyRequestBody, SubtaskAttemptMessageParameters> request,
- AccessExecution execution)
+ HandlerRequest<EmptyRequestBody> request, AccessExecution execution)
throws RestHandlerException {
return createAccumulatorInfo(execution);
}
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/SubtaskExecutionAttemptDetailsHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/SubtaskExecutionAttemptDetailsHandler.java
index 0f6370c..0a1d166 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/SubtaskExecutionAttemptDetailsHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/SubtaskExecutionAttemptDetailsHandler.java
@@ -95,8 +95,7 @@ public class SubtaskExecutionAttemptDetailsHandler
@Override
protected SubtaskExecutionAttemptDetailsInfo handleRequest(
- HandlerRequest<EmptyRequestBody, SubtaskAttemptMessageParameters> request,
- AccessExecution execution)
+ HandlerRequest<EmptyRequestBody> request, AccessExecution execution)
throws RestHandlerException {
final JobID jobID = request.getPathParameter(JobIDPathParameter.class);
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/SubtasksAllAccumulatorsHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/SubtasksAllAccumulatorsHandler.java
index 82d965a..88c3cc8 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/SubtasksAllAccumulatorsHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/SubtasksAllAccumulatorsHandler.java
@@ -66,8 +66,7 @@ public class SubtasksAllAccumulatorsHandler
@Override
protected SubtasksAllAccumulatorsInfo handleRequest(
- HandlerRequest<EmptyRequestBody, JobVertexMessageParameters> request,
- AccessExecutionJobVertex jobVertex)
+ HandlerRequest<EmptyRequestBody> request, AccessExecutionJobVertex jobVertex)
throws RestHandlerException {
JobVertexID jobVertexId = jobVertex.getJobVertexId();
int parallelism = jobVertex.getParallelism();
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/SubtasksTimesHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/SubtasksTimesHandler.java
index ff4507f..32f0489 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/SubtasksTimesHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/SubtasksTimesHandler.java
@@ -69,8 +69,7 @@ public class SubtasksTimesHandler
@Override
protected SubtasksTimesInfo handleRequest(
- HandlerRequest<EmptyRequestBody, JobVertexMessageParameters> request,
- AccessExecutionJobVertex jobVertex) {
+ HandlerRequest<EmptyRequestBody> request, AccessExecutionJobVertex jobVertex) {
return createSubtaskTimesInfo(jobVertex);
}
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/checkpoints/AbstractCheckpointHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/checkpoints/AbstractCheckpointHandler.java
index 1e2817e..61a4480 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/checkpoints/AbstractCheckpointHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/checkpoints/AbstractCheckpointHandler.java
@@ -72,7 +72,7 @@ public abstract class AbstractCheckpointHandler<
@Override
protected R handleRequest(
- HandlerRequest<EmptyRequestBody, M> request, AccessExecutionGraph executionGraph)
+ HandlerRequest<EmptyRequestBody> request, AccessExecutionGraph executionGraph)
throws RestHandlerException {
final long checkpointId = request.getPathParameter(CheckpointIdPathParameter.class);
@@ -114,6 +114,6 @@ public abstract class AbstractCheckpointHandler<
* @throws RestHandlerException if the handler could not handle the request
*/
protected abstract R handleCheckpointRequest(
- HandlerRequest<EmptyRequestBody, M> request, AbstractCheckpointStats checkpointStats)
+ HandlerRequest<EmptyRequestBody> request, AbstractCheckpointStats checkpointStats)
throws RestHandlerException;
}
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/checkpoints/CheckpointConfigHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/checkpoints/CheckpointConfigHandler.java
index 8ba71d9..11f0083 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/checkpoints/CheckpointConfigHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/checkpoints/CheckpointConfigHandler.java
@@ -71,8 +71,7 @@ public class CheckpointConfigHandler
@Override
protected CheckpointConfigInfo handleRequest(
- HandlerRequest<EmptyRequestBody, JobMessageParameters> request,
- AccessExecutionGraph executionGraph)
+ HandlerRequest<EmptyRequestBody> request, AccessExecutionGraph executionGraph)
throws RestHandlerException {
return createCheckpointConfigInfo(executionGraph);
}
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/checkpoints/CheckpointStatisticDetailsHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/checkpoints/CheckpointStatisticDetailsHandler.java
index 37d7f81..cea6da2 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/checkpoints/CheckpointStatisticDetailsHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/checkpoints/CheckpointStatisticDetailsHandler.java
@@ -71,8 +71,7 @@ public class CheckpointStatisticDetailsHandler
@Override
protected CheckpointStatistics handleCheckpointRequest(
- HandlerRequest<EmptyRequestBody, CheckpointMessageParameters> ignored,
- AbstractCheckpointStats checkpointStats) {
+ HandlerRequest<EmptyRequestBody> ignored, AbstractCheckpointStats checkpointStats) {
return CheckpointStatistics.generateCheckpointStatistics(checkpointStats, true);
}
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/checkpoints/CheckpointingStatisticsHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/checkpoints/CheckpointingStatisticsHandler.java
index 760c0f9..a10a71c 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/checkpoints/CheckpointingStatisticsHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/checkpoints/CheckpointingStatisticsHandler.java
@@ -78,8 +78,7 @@ public class CheckpointingStatisticsHandler
@Override
protected CheckpointingStatistics handleRequest(
- HandlerRequest<EmptyRequestBody, JobMessageParameters> request,
- AccessExecutionGraph executionGraph)
+ HandlerRequest<EmptyRequestBody> request, AccessExecutionGraph executionGraph)
throws RestHandlerException {
return createCheckpointingStatistics(executionGraph);
}
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/checkpoints/TaskCheckpointStatisticDetailsHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/checkpoints/TaskCheckpointStatisticDetailsHandler.java
index 0446e93..c0de0e4 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/checkpoints/TaskCheckpointStatisticDetailsHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/checkpoints/TaskCheckpointStatisticDetailsHandler.java
@@ -84,8 +84,7 @@ public class TaskCheckpointStatisticDetailsHandler
@Override
protected TaskCheckpointStatisticsWithSubtaskDetails handleCheckpointRequest(
- HandlerRequest<EmptyRequestBody, TaskCheckpointMessageParameters> request,
- AbstractCheckpointStats checkpointStats)
+ HandlerRequest<EmptyRequestBody> request, AbstractCheckpointStats checkpointStats)
throws RestHandlerException {
final JobVertexID jobVertexId = request.getPathParameter(JobVertexIdPathParameter.class);
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/coordination/ClientCoordinationHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/coordination/ClientCoordinationHandler.java
index ae1d91c..acf9f28 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/coordination/ClientCoordinationHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/coordination/ClientCoordinationHandler.java
@@ -70,11 +70,7 @@ public class ClientCoordinationHandler
@Override
protected CompletableFuture<ClientCoordinationResponseBody> handleRequest(
- @Nonnull
- HandlerRequest<
- ClientCoordinationRequestBody,
- ClientCoordinationMessageParameters>
- request,
+ @Nonnull HandlerRequest<ClientCoordinationRequestBody> request,
@Nonnull RestfulGateway gateway)
throws RestHandlerException {
JobID jobId = request.getPathParameter(JobIDPathParameter.class);
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/metrics/AbstractAggregatingMetricsHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/metrics/AbstractAggregatingMetricsHandler.java
index 3f56f9a..5c89cf9 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/metrics/AbstractAggregatingMetricsHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/metrics/AbstractAggregatingMetricsHandler.java
@@ -93,11 +93,11 @@ public abstract class AbstractAggregatingMetricsHandler<
@Nonnull
abstract Collection<? extends MetricStore.ComponentMetricStore> getStores(
- MetricStore store, HandlerRequest<EmptyRequestBody, P> request);
+ MetricStore store, HandlerRequest<EmptyRequestBody> request);
@Override
protected CompletableFuture<AggregatedMetricsResponseBody> handleRequest(
- @Nonnull HandlerRequest<EmptyRequestBody, P> request, @Nonnull RestfulGateway gateway)
+ @Nonnull HandlerRequest<EmptyRequestBody> request, @Nonnull RestfulGateway gateway)
throws RestHandlerException {
return CompletableFuture.supplyAsync(
() -> {
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/metrics/AbstractMetricsHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/metrics/AbstractMetricsHandler.java
index baa8f7d..05600a4 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/metrics/AbstractMetricsHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/metrics/AbstractMetricsHandler.java
@@ -79,7 +79,7 @@ public abstract class AbstractMetricsHandler<M extends MessageParameters>
@Override
protected final CompletableFuture<MetricCollectionResponseBody> handleRequest(
- @Nonnull HandlerRequest<EmptyRequestBody, M> request, @Nonnull RestfulGateway gateway)
+ @Nonnull HandlerRequest<EmptyRequestBody> request, @Nonnull RestfulGateway gateway)
throws RestHandlerException {
metricFetcher.update();
@@ -107,7 +107,7 @@ public abstract class AbstractMetricsHandler<M extends MessageParameters>
/** Returns the {@link MetricStore.ComponentMetricStore} that should be queried for metrics. */
@Nullable
protected abstract MetricStore.ComponentMetricStore getComponentMetricStore(
- HandlerRequest<EmptyRequestBody, M> request, MetricStore metricStore);
+ HandlerRequest<EmptyRequestBody> request, MetricStore metricStore);
private static List<Metric> getAvailableMetrics(
MetricStore.ComponentMetricStore componentMetricStore) {
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/metrics/AggregatingJobsMetricsHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/metrics/AggregatingJobsMetricsHandler.java
index 0cf7d9a..30f011a 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/metrics/AggregatingJobsMetricsHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/metrics/AggregatingJobsMetricsHandler.java
@@ -66,8 +66,7 @@ public class AggregatingJobsMetricsHandler
@Nonnull
@Override
Collection<? extends MetricStore.ComponentMetricStore> getStores(
- MetricStore store,
- HandlerRequest<EmptyRequestBody, AggregatedJobMetricsParameters> request) {
+ MetricStore store, HandlerRequest<EmptyRequestBody> request) {
List<JobID> jobs = request.getQueryParameter(JobsFilterQueryParameter.class);
if (jobs.isEmpty()) {
return store.getJobs().values();
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/metrics/AggregatingSubtasksMetricsHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/metrics/AggregatingSubtasksMetricsHandler.java
index eef3387..c6a4994 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/metrics/AggregatingSubtasksMetricsHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/metrics/AggregatingSubtasksMetricsHandler.java
@@ -72,8 +72,7 @@ public class AggregatingSubtasksMetricsHandler
@Nonnull
@Override
Collection<? extends MetricStore.ComponentMetricStore> getStores(
- MetricStore store,
- HandlerRequest<EmptyRequestBody, AggregatedSubtaskMetricsParameters> request) {
+ MetricStore store, HandlerRequest<EmptyRequestBody> request) {
JobID jobID = request.getPathParameter(JobIDPathParameter.class);
JobVertexID taskID = request.getPathParameter(JobVertexIdPathParameter.class);
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/metrics/AggregatingTaskManagersMetricsHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/metrics/AggregatingTaskManagersMetricsHandler.java
index cc591d1..057c955 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/metrics/AggregatingTaskManagersMetricsHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/metrics/AggregatingTaskManagersMetricsHandler.java
@@ -66,8 +66,7 @@ public class AggregatingTaskManagersMetricsHandler
@Nonnull
@Override
Collection<? extends MetricStore.ComponentMetricStore> getStores(
- MetricStore store,
- HandlerRequest<EmptyRequestBody, AggregateTaskManagerMetricsParameters> request) {
+ MetricStore store, HandlerRequest<EmptyRequestBody> request) {
List<ResourceID> taskmanagers =
request.getQueryParameter(TaskManagersFilterQueryParameter.class);
if (taskmanagers.isEmpty()) {
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/metrics/JobManagerMetricsHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/metrics/JobManagerMetricsHandler.java
index 42bcd70..09fbc13 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/metrics/JobManagerMetricsHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/metrics/JobManagerMetricsHandler.java
@@ -52,8 +52,7 @@ public class JobManagerMetricsHandler
@Nullable
@Override
protected MetricStore.ComponentMetricStore getComponentMetricStore(
- final HandlerRequest<EmptyRequestBody, JobManagerMetricsMessageParameters> request,
- final MetricStore metricStore) {
+ final HandlerRequest<EmptyRequestBody> request, final MetricStore metricStore) {
return metricStore.getJobManagerMetricStore();
}
}
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/metrics/JobMetricsHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/metrics/JobMetricsHandler.java
index cda99d3..49e83c1 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/metrics/JobMetricsHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/metrics/JobMetricsHandler.java
@@ -50,8 +50,7 @@ public class JobMetricsHandler extends AbstractMetricsHandler<JobMetricsMessageP
@Nullable
@Override
protected MetricStore.ComponentMetricStore getComponentMetricStore(
- final HandlerRequest<EmptyRequestBody, JobMetricsMessageParameters> request,
- final MetricStore metricStore) {
+ final HandlerRequest<EmptyRequestBody> request, final MetricStore metricStore) {
return metricStore.getJobMetricStore(
request.getPathParameter(JobIDPathParameter.class).toString());
}
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/metrics/JobVertexMetricsHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/metrics/JobVertexMetricsHandler.java
index d586a70..ef62dd0 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/metrics/JobVertexMetricsHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/metrics/JobVertexMetricsHandler.java
@@ -60,8 +60,7 @@ public class JobVertexMetricsHandler
@Override
protected MetricStore.ComponentMetricStore getComponentMetricStore(
- HandlerRequest<EmptyRequestBody, JobVertexMetricsMessageParameters> request,
- MetricStore metricStore) {
+ HandlerRequest<EmptyRequestBody> request, MetricStore metricStore) {
final JobID jobId = request.getPathParameter(JobIDPathParameter.class);
final JobVertexID vertexId = request.getPathParameter(JobVertexIdPathParameter.class);
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/metrics/JobVertexWatermarksHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/metrics/JobVertexWatermarksHandler.java
index d9ecce4..0e07c4c 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/metrics/JobVertexWatermarksHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/metrics/JobVertexWatermarksHandler.java
@@ -70,8 +70,7 @@ public class JobVertexWatermarksHandler
@Override
protected MetricCollectionResponseBody handleRequest(
- HandlerRequest<EmptyRequestBody, JobVertexMessageParameters> request,
- AccessExecutionJobVertex jobVertex)
+ HandlerRequest<EmptyRequestBody> request, AccessExecutionJobVertex jobVertex)
throws RestHandlerException {
String jobID = request.getPathParameter(JobIDPathParameter.class).toString();
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/metrics/SubtaskMetricsHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/metrics/SubtaskMetricsHandler.java
index ee06bb8..43e346a 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/metrics/SubtaskMetricsHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/metrics/SubtaskMetricsHandler.java
@@ -61,8 +61,7 @@ public class SubtaskMetricsHandler extends AbstractMetricsHandler<SubtaskMetrics
@Nullable
@Override
protected MetricStore.ComponentMetricStore getComponentMetricStore(
- HandlerRequest<EmptyRequestBody, SubtaskMetricsMessageParameters> request,
- MetricStore metricStore) {
+ HandlerRequest<EmptyRequestBody> request, MetricStore metricStore) {
final JobID jobId = request.getPathParameter(JobIDPathParameter.class);
final JobVertexID vertexId = request.getPathParameter(JobVertexIdPathParameter.class);
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/metrics/TaskManagerMetricsHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/metrics/TaskManagerMetricsHandler.java
index 478db58..2c31836 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/metrics/TaskManagerMetricsHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/metrics/TaskManagerMetricsHandler.java
@@ -58,8 +58,7 @@ public class TaskManagerMetricsHandler
@Nullable
@Override
protected MetricStore.ComponentMetricStore getComponentMetricStore(
- final HandlerRequest<EmptyRequestBody, TaskManagerMetricsMessageParameters> request,
- final MetricStore metricStore) {
+ final HandlerRequest<EmptyRequestBody> request, final MetricStore metricStore) {
final ResourceID taskManagerId = request.getPathParameter(TaskManagerIdPathParameter.class);
return metricStore.getTaskManagerMetricStore(taskManagerId.toString());
}
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/rescaling/RescalingHandlers.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/rescaling/RescalingHandlers.java
index 4345918..f121a9f 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/rescaling/RescalingHandlers.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/rescaling/RescalingHandlers.java
@@ -62,9 +62,7 @@ public class RescalingHandlers
@Override
public CompletableFuture<TriggerResponse> handleRequest(
- @Nonnull
- final HandlerRequest<EmptyRequestBody, RescalingTriggerMessageParameters>
- request,
+ @Nonnull final HandlerRequest<EmptyRequestBody> request,
@Nonnull final RestfulGateway gateway)
throws RestHandlerException {
throw featureDisabledException();
@@ -72,14 +70,13 @@ public class RescalingHandlers
@Override
protected CompletableFuture<Acknowledge> triggerOperation(
- HandlerRequest<EmptyRequestBody, RescalingTriggerMessageParameters> request,
- RestfulGateway gateway) {
+ HandlerRequest<EmptyRequestBody> request, RestfulGateway gateway) {
throw new UnsupportedOperationException();
}
@Override
protected AsynchronousJobOperationKey createOperationKey(
- HandlerRequest<EmptyRequestBody, RescalingTriggerMessageParameters> request) {
+ HandlerRequest<EmptyRequestBody> request) {
throw new UnsupportedOperationException();
}
}
@@ -99,10 +96,7 @@ public class RescalingHandlers
@Override
public CompletableFuture<AsynchronousOperationResult<AsynchronousOperationInfo>>
handleRequest(
- @Nonnull
- final HandlerRequest<
- EmptyRequestBody, RescalingStatusMessageParameters>
- request,
+ @Nonnull final HandlerRequest<EmptyRequestBody> request,
@Nonnull final RestfulGateway gateway)
throws RestHandlerException {
throw featureDisabledException();
@@ -110,7 +104,7 @@ public class RescalingHandlers
@Override
protected AsynchronousJobOperationKey getOperationKey(
- HandlerRequest<EmptyRequestBody, RescalingStatusMessageParameters> request) {
+ HandlerRequest<EmptyRequestBody> request) {
throw new UnsupportedOperationException();
}
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/savepoints/SavepointDisposalHandlers.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/savepoints/SavepointDisposalHandlers.java
index f050ca7..e310168 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/savepoints/SavepointDisposalHandlers.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/savepoints/SavepointDisposalHandlers.java
@@ -65,8 +65,7 @@ public class SavepointDisposalHandlers
@Override
protected CompletableFuture<Acknowledge> triggerOperation(
- HandlerRequest<SavepointDisposalRequest, EmptyMessageParameters> request,
- RestfulGateway gateway)
+ HandlerRequest<SavepointDisposalRequest> request, RestfulGateway gateway)
throws RestHandlerException {
final String savepointPath = request.getRequestBody().getSavepointPath();
if (savepointPath == null) {
@@ -81,7 +80,7 @@ public class SavepointDisposalHandlers
@Override
protected OperationKey createOperationKey(
- HandlerRequest<SavepointDisposalRequest, EmptyMessageParameters> request) {
+ HandlerRequest<SavepointDisposalRequest> request) {
return new OperationKey(new TriggerId());
}
}
@@ -105,9 +104,7 @@ public class SavepointDisposalHandlers
}
@Override
- protected OperationKey getOperationKey(
- HandlerRequest<EmptyRequestBody, SavepointDisposalStatusMessageParameters>
- request) {
+ protected OperationKey getOperationKey(HandlerRequest<EmptyRequestBody> request) {
final TriggerId triggerId = request.getPathParameter(TriggerIdPathParameter.class);
return new OperationKey(triggerId);
}
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/savepoints/SavepointHandlers.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/savepoints/SavepointHandlers.java
index 35bfe85..76fbd2a 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/savepoints/SavepointHandlers.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/savepoints/SavepointHandlers.java
@@ -125,8 +125,7 @@ public class SavepointHandlers
}
@Override
- protected AsynchronousJobOperationKey createOperationKey(
- final HandlerRequest<T, SavepointTriggerMessageParameters> request) {
+ protected AsynchronousJobOperationKey createOperationKey(final HandlerRequest<T> request) {
final JobID jobId = request.getPathParameter(JobIDPathParameter.class);
return AsynchronousJobOperationKey.of(new TriggerId(), jobId);
}
@@ -149,9 +148,7 @@ public class SavepointHandlers
@Override
protected CompletableFuture<String> triggerOperation(
- final HandlerRequest<
- StopWithSavepointRequestBody, SavepointTriggerMessageParameters>
- request,
+ final HandlerRequest<StopWithSavepointRequestBody> request,
final RestfulGateway gateway)
throws RestHandlerException {
@@ -189,9 +186,7 @@ public class SavepointHandlers
@Override
protected CompletableFuture<String> triggerOperation(
- HandlerRequest<SavepointTriggerRequestBody, SavepointTriggerMessageParameters>
- request,
- RestfulGateway gateway)
+ HandlerRequest<SavepointTriggerRequestBody> request, RestfulGateway gateway)
throws RestHandlerException {
final JobID jobId = request.getPathParameter(JobIDPathParameter.class);
final String requestedTargetDirectory = request.getRequestBody().getTargetDirectory();
@@ -228,7 +223,7 @@ public class SavepointHandlers
@Override
protected AsynchronousJobOperationKey getOperationKey(
- HandlerRequest<EmptyRequestBody, SavepointStatusMessageParameters> request) {
+ HandlerRequest<EmptyRequestBody> request) {
final TriggerId triggerId = request.getPathParameter(TriggerIdPathParameter.class);
final JobID jobId = request.getPathParameter(JobIDPathParameter.class);
return AsynchronousJobOperationKey.of(triggerId, jobId);
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/resourcemanager/AbstractResourceManagerHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/resourcemanager/AbstractResourceManagerHandler.java
index c09d50c..ad8c558 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/resourcemanager/AbstractResourceManagerHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/resourcemanager/AbstractResourceManagerHandler.java
@@ -70,7 +70,7 @@ public abstract class AbstractResourceManagerHandler<
@Override
protected CompletableFuture<P> handleRequest(
- @Nonnull HandlerRequest<R, M> request, @Nonnull T gateway) throws RestHandlerException {
+ @Nonnull HandlerRequest<R> request, @Nonnull T gateway) throws RestHandlerException {
ResourceManagerGateway resourceManagerGateway =
getResourceManagerGateway(resourceManagerGatewayRetriever);
@@ -78,7 +78,7 @@ public abstract class AbstractResourceManagerHandler<
}
protected abstract CompletableFuture<P> handleRequest(
- @Nonnull HandlerRequest<R, M> request, @Nonnull ResourceManagerGateway gateway)
+ @Nonnull HandlerRequest<R> request, @Nonnull ResourceManagerGateway gateway)
throws RestHandlerException;
public static ResourceManagerGateway getResourceManagerGateway(
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/taskmanager/AbstractTaskManagerFileHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/taskmanager/AbstractTaskManagerFileHandler.java
index 708896a..d621f48 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/taskmanager/AbstractTaskManagerFileHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/taskmanager/AbstractTaskManagerFileHandler.java
@@ -108,7 +108,7 @@ public abstract class AbstractTaskManagerFileHandler<M extends TaskManagerMessag
protected CompletableFuture<Void> respondToRequest(
ChannelHandlerContext ctx,
HttpRequest httpRequest,
- HandlerRequest<EmptyRequestBody, M> handlerRequest,
+ HandlerRequest<EmptyRequestBody> handlerRequest,
RestfulGateway gateway)
throws RestHandlerException {
final ResourceID taskManagerId =
@@ -216,7 +216,7 @@ public abstract class AbstractTaskManagerFileHandler<M extends TaskManagerMessag
}
}
- protected String getFileName(HandlerRequest<EmptyRequestBody, M> handlerRequest) {
+ protected String getFileName(HandlerRequest<EmptyRequestBody> handlerRequest) {
return null;
}
}
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/taskmanager/TaskManagerCustomLogHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/taskmanager/TaskManagerCustomLogHandler.java
index b54693a..39a013a 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/taskmanager/TaskManagerCustomLogHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/taskmanager/TaskManagerCustomLogHandler.java
@@ -72,8 +72,7 @@ public class TaskManagerCustomLogHandler
}
@Override
- protected String getFileName(
- HandlerRequest<EmptyRequestBody, TaskManagerFileMessageParameters> handlerRequest) {
+ protected String getFileName(HandlerRequest<EmptyRequestBody> handlerRequest) {
return handlerRequest.getPathParameter(LogFileNamePathParameter.class);
}
}
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/taskmanager/TaskManagerDetailsHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/taskmanager/TaskManagerDetailsHandler.java
index 5e0b4276..9eacd75 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/taskmanager/TaskManagerDetailsHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/taskmanager/TaskManagerDetailsHandler.java
@@ -81,7 +81,7 @@ public class TaskManagerDetailsHandler
@Override
protected CompletableFuture<TaskManagerDetailsInfo> handleRequest(
- @Nonnull HandlerRequest<EmptyRequestBody, TaskManagerMessageParameters> request,
+ @Nonnull HandlerRequest<EmptyRequestBody> request,
@Nonnull ResourceManagerGateway gateway)
throws RestHandlerException {
final ResourceID taskManagerResourceId =
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/taskmanager/TaskManagerLogListHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/taskmanager/TaskManagerLogListHandler.java
index b2c8838..1a1fe78 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/taskmanager/TaskManagerLogListHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/taskmanager/TaskManagerLogListHandler.java
@@ -72,7 +72,7 @@ public class TaskManagerLogListHandler
@Override
protected CompletableFuture<LogListInfo> handleRequest(
- @Nonnull HandlerRequest<EmptyRequestBody, TaskManagerMessageParameters> request,
+ @Nonnull HandlerRequest<EmptyRequestBody> request,
@Nonnull ResourceManagerGateway gateway)
throws RestHandlerException {
final ResourceID taskManagerId = request.getPathParameter(TaskManagerIdPathParameter.class);
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/taskmanager/TaskManagerThreadDumpHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/taskmanager/TaskManagerThreadDumpHandler.java
index 0a6be61..67399a7 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/taskmanager/TaskManagerThreadDumpHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/taskmanager/TaskManagerThreadDumpHandler.java
@@ -60,7 +60,7 @@ public class TaskManagerThreadDumpHandler
@Override
protected CompletableFuture<ThreadDumpInfo> handleRequest(
- @Nonnull HandlerRequest<EmptyRequestBody, TaskManagerMessageParameters> request,
+ @Nonnull HandlerRequest<EmptyRequestBody> request,
@Nonnull ResourceManagerGateway gateway)
throws RestHandlerException {
final ResourceID taskManagerId = request.getPathParameter(TaskManagerIdPathParameter.class);
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/taskmanager/TaskManagersHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/taskmanager/TaskManagersHandler.java
index a2c9478..da9b78b 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/taskmanager/TaskManagersHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/taskmanager/TaskManagersHandler.java
@@ -57,7 +57,7 @@ public class TaskManagersHandler
@Override
protected CompletableFuture<TaskManagersInfo> handleRequest(
- @Nonnull HandlerRequest<EmptyRequestBody, EmptyMessageParameters> request,
+ @Nonnull HandlerRequest<EmptyRequestBody> request,
@Nonnull ResourceManagerGateway gateway)
throws RestHandlerException {
return gateway.requestTaskManagerInfo(timeout).thenApply(TaskManagersInfo::new);
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/util/HandlerRequestUtils.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/util/HandlerRequestUtils.java
index f8d64d6..0a55190 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/util/HandlerRequestUtils.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/util/HandlerRequestUtils.java
@@ -44,8 +44,7 @@ public class HandlerRequestUtils {
P extends MessageQueryParameter<X>,
R extends RequestBody,
M extends MessageParameters>
- X getQueryParameter(
- final HandlerRequest<R, M> request, final Class<P> queryParameterClass)
+ X getQueryParameter(final HandlerRequest<R> request, final Class<P> queryParameterClass)
throws RestHandlerException {
return getQueryParameter(request, queryParameterClass, null);
@@ -57,7 +56,7 @@ public class HandlerRequestUtils {
R extends RequestBody,
M extends MessageParameters>
X getQueryParameter(
- final HandlerRequest<R, M> request,
+ final HandlerRequest<R> request,
final Class<P> queryParameterClass,
final X defaultValue)
throws RestHandlerException {
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/FileUploadHandlerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/FileUploadHandlerTest.java
index cb01b5c..76170f6 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/FileUploadHandlerTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/FileUploadHandlerTest.java
@@ -21,7 +21,6 @@ package org.apache.flink.runtime.rest;
import org.apache.flink.runtime.io.network.netty.NettyLeakDetectionResource;
import org.apache.flink.runtime.rest.handler.HandlerRequest;
import org.apache.flink.runtime.rest.messages.MessageHeaders;
-import org.apache.flink.runtime.rest.messages.MessageParameters;
import org.apache.flink.runtime.rest.messages.RequestBody;
import org.apache.flink.runtime.rest.util.RestMapperUtils;
import org.apache.flink.runtime.webmonitor.RestfulGateway;
@@ -395,9 +394,7 @@ public class FileUploadHandlerTest extends TestLogger {
private static class CustomFilenameVerifier
implements BiConsumerWithException<
- HandlerRequest<? extends RequestBody, ? extends MessageParameters>,
- RestfulGateway,
- Exception> {
+ HandlerRequest<? extends RequestBody>, RestfulGateway, Exception> {
private final String customFilename1;
private final Path fileContent1;
@@ -419,8 +416,7 @@ public class FileUploadHandlerTest extends TestLogger {
@Override
public void accept(
- HandlerRequest<? extends RequestBody, ? extends MessageParameters> request,
- RestfulGateway restfulGateway)
+ HandlerRequest<? extends RequestBody> request, RestfulGateway restfulGateway)
throws Exception {
List<Path> uploadedFiles =
request.getUploadedFiles().stream()
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/MultipartUploadResource.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/MultipartUploadResource.java
index c3f8919..c83ffa0 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/MultipartUploadResource.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/MultipartUploadResource.java
@@ -29,7 +29,6 @@ import org.apache.flink.runtime.rest.messages.EmptyMessageParameters;
import org.apache.flink.runtime.rest.messages.EmptyRequestBody;
import org.apache.flink.runtime.rest.messages.EmptyResponseBody;
import org.apache.flink.runtime.rest.messages.MessageHeaders;
-import org.apache.flink.runtime.rest.messages.MessageParameters;
import org.apache.flink.runtime.rest.messages.RequestBody;
import org.apache.flink.runtime.rest.util.TestRestServerEndpoint;
import org.apache.flink.runtime.rpc.RpcUtils;
@@ -89,7 +88,7 @@ public class MultipartUploadResource extends ExternalResource {
private Path configuredUploadDir;
- private BiConsumerWithException<HandlerRequest<?, ?>, RestfulGateway, RestHandlerException>
+ private BiConsumerWithException<HandlerRequest<?>, RestfulGateway, RestHandlerException>
fileUploadVerifier;
@Override
@@ -167,9 +166,7 @@ public class MultipartUploadResource extends ExternalResource {
public void setFileUploadVerifier(
BiConsumerWithException<
- HandlerRequest<? extends RequestBody, ? extends MessageParameters>,
- RestfulGateway,
- Exception>
+ HandlerRequest<? extends RequestBody>, RestfulGateway, Exception>
verifier) {
this.fileUploadVerifier =
(request, restfulGateway) -> {
@@ -266,8 +263,7 @@ public class MultipartUploadResource extends ExternalResource {
@Override
protected CompletableFuture<EmptyResponseBody> handleRequest(
- @Nonnull HandlerRequest<TestRequestBody, EmptyMessageParameters> request,
- @Nonnull RestfulGateway gateway)
+ @Nonnull HandlerRequest<TestRequestBody> request, @Nonnull RestfulGateway gateway)
throws RestHandlerException {
MultipartUploadResource.this.fileUploadVerifier.accept(request, gateway);
this.lastReceivedRequest = request.getRequestBody();
@@ -338,8 +334,7 @@ public class MultipartUploadResource extends ExternalResource {
@Override
protected CompletableFuture<EmptyResponseBody> handleRequest(
- @Nonnull HandlerRequest<TestRequestBody, EmptyMessageParameters> request,
- @Nonnull RestfulGateway gateway)
+ @Nonnull HandlerRequest<TestRequestBody> request, @Nonnull RestfulGateway gateway)
throws RestHandlerException {
Collection<Path> uploadedFiles =
request.getUploadedFiles().stream()
@@ -394,8 +389,7 @@ public class MultipartUploadResource extends ExternalResource {
@Override
protected CompletableFuture<EmptyResponseBody> handleRequest(
- @Nonnull HandlerRequest<EmptyRequestBody, EmptyMessageParameters> request,
- @Nonnull RestfulGateway gateway)
+ @Nonnull HandlerRequest<EmptyRequestBody> request, @Nonnull RestfulGateway gateway)
throws RestHandlerException {
MultipartUploadResource.this.fileUploadVerifier.accept(request, gateway);
return CompletableFuture.completedFuture(EmptyResponseBody.getInstance());
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/RestServerEndpointITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/RestServerEndpointITCase.java
index 1bd181e..58e47b2 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/RestServerEndpointITCase.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/RestServerEndpointITCase.java
@@ -744,8 +744,7 @@ public class RestServerEndpointITCase extends TestLogger {
@Override
protected CompletableFuture<TestResponse> handleRequest(
- @Nonnull HandlerRequest<TestRequest, TestParameters> request,
- RestfulGateway gateway) {
+ @Nonnull HandlerRequest<TestRequest> request, RestfulGateway gateway) {
assertEquals(request.getPathParameter(JobIDPathParameter.class), PATH_JOB_ID);
assertEquals(request.getQueryParameter(JobIDQueryParameter.class).get(0), QUERY_JOB_ID);
@@ -967,7 +966,7 @@ public class RestServerEndpointITCase extends TestLogger {
@Override
protected CompletableFuture<EmptyResponseBody> handleRequest(
- @Nonnull final HandlerRequest<EmptyRequestBody, EmptyMessageParameters> request,
+ @Nonnull final HandlerRequest<EmptyRequestBody> request,
@Nonnull final RestfulGateway gateway)
throws RestHandlerException {
Collection<Path> uploadedFiles =
@@ -1013,8 +1012,7 @@ public class RestServerEndpointITCase extends TestLogger {
@Override
protected CompletableFuture<EmptyResponseBody> handleRequest(
- @Nonnull HandlerRequest<EmptyRequestBody, EmptyMessageParameters> request,
- @Nonnull RestfulGateway gateway)
+ @Nonnull HandlerRequest<EmptyRequestBody> request, @Nonnull RestfulGateway gateway)
throws RestHandlerException {
return CompletableFuture.completedFuture(EmptyResponseBody.getInstance());
}
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/AbstractHandlerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/AbstractHandlerTest.java
index 507c417..974cab7 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/AbstractHandlerTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/AbstractHandlerTest.java
@@ -173,7 +173,7 @@ public class AbstractHandlerTest extends TestLogger {
protected CompletableFuture<Void> respondToRequest(
ChannelHandlerContext ctx,
HttpRequest httpRequest,
- HandlerRequest<EmptyRequestBody, EmptyMessageParameters> handlerRequest,
+ HandlerRequest<EmptyRequestBody> handlerRequest,
RestfulGateway gateway)
throws RestHandlerException {
return completionFuture;
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/async/AbstractAsynchronousOperationHandlersTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/async/AbstractAsynchronousOperationHandlersTest.java
index 411867f..e06f52b 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/async/AbstractAsynchronousOperationHandlersTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/async/AbstractAsynchronousOperationHandlersTest.java
@@ -222,14 +222,13 @@ public class AbstractAsynchronousOperationHandlersTest extends TestLogger {
assertThat(closeFuture.isDone(), is(true));
}
- private static HandlerRequest<EmptyRequestBody, EmptyMessageParameters>
- triggerOperationRequest() {
+ private static HandlerRequest<EmptyRequestBody> triggerOperationRequest() {
return HandlerRequest.create(
EmptyRequestBody.getInstance(), EmptyMessageParameters.getInstance());
}
- private static HandlerRequest<EmptyRequestBody, TriggerMessageParameters>
- statusOperationRequest(TriggerId triggerId) throws HandlerRequestException {
+ private static HandlerRequest<EmptyRequestBody> statusOperationRequest(TriggerId triggerId)
+ throws HandlerRequestException {
return HandlerRequest.resolveParametersAndCreate(
EmptyRequestBody.getInstance(),
new TriggerMessageParameters(),
@@ -377,15 +376,14 @@ public class AbstractAsynchronousOperationHandlersTest extends TestLogger {
@Override
protected CompletableFuture<String> triggerOperation(
- HandlerRequest<EmptyRequestBody, EmptyMessageParameters> request,
- RestfulGateway gateway)
+ HandlerRequest<EmptyRequestBody> request, RestfulGateway gateway)
throws RestHandlerException {
return gateway.triggerSavepoint(new JobID(), null, false, timeout);
}
@Override
protected TestOperationKey createOperationKey(
- HandlerRequest<EmptyRequestBody, EmptyMessageParameters> request) {
+ HandlerRequest<EmptyRequestBody> request) {
return new TestOperationKey(new TriggerId());
}
}
@@ -406,8 +404,7 @@ public class AbstractAsynchronousOperationHandlersTest extends TestLogger {
}
@Override
- protected TestOperationKey getOperationKey(
- HandlerRequest<EmptyRequestBody, TriggerMessageParameters> request) {
+ protected TestOperationKey getOperationKey(HandlerRequest<EmptyRequestBody> request) {
final TriggerId triggerId = request.getPathParameter(TriggerIdPathParameter.class);
return new TestOperationKey(triggerId);
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/cluster/JobManagerCustomLogHandlerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/cluster/JobManagerCustomLogHandlerTest.java
index 0392c8d..ac51d06 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/cluster/JobManagerCustomLogHandlerTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/cluster/JobManagerCustomLogHandlerTest.java
@@ -90,8 +90,8 @@ public class JobManagerCustomLogHandlerTest extends TestLogger {
FileUtils.writeStringToFile(file, content, StandardCharsets.UTF_8);
}
- private static HandlerRequest<EmptyRequestBody, FileMessageParameters> createHandlerRequest(
- String path) throws HandlerRequestException {
+ private static HandlerRequest<EmptyRequestBody> createHandlerRequest(String path)
+ throws HandlerRequestException {
FileMessageParameters messageParameters = new FileMessageParameters();
Map<String, String> pathParameters = new HashMap<>();
pathParameters.put(messageParameters.logFileNamePathParameter.getKey(), path);
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/cluster/JobManagerLogListHandlerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/cluster/JobManagerLogListHandlerTest.java
index 143d717..2335c1e 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/cluster/JobManagerLogListHandlerTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/cluster/JobManagerLogListHandlerTest.java
@@ -57,7 +57,7 @@ import static org.junit.Assert.assertThat;
/** Unit tests for {@link JobManagerLogListHandler}. */
public class JobManagerLogListHandlerTest extends TestLogger {
- private static HandlerRequest<EmptyRequestBody, EmptyMessageParameters> testRequest;
+ private static HandlerRequest<EmptyRequestBody> testRequest;
@Rule public TemporaryFolder temporaryFolder = new TemporaryFolder();
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/JobConfigHandlerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/JobConfigHandlerTest.java
index 4e13cff..4446390 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/JobConfigHandlerTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/JobConfigHandlerTest.java
@@ -73,7 +73,7 @@ public class JobConfigHandlerTest extends TestLogger {
new ArchivedExecutionGraphBuilder()
.setArchivedExecutionConfig(archivedExecutionConfig)
.build();
- final HandlerRequest<EmptyRequestBody, JobMessageParameters> handlerRequest =
+ final HandlerRequest<EmptyRequestBody> handlerRequest =
createRequest(archivedExecutionGraph.getJobID());
final JobConfigInfo jobConfigInfoResponse =
@@ -91,7 +91,7 @@ public class JobConfigHandlerTest extends TestLogger {
return ConfigurationUtils.hideSensitiveValues(globalJobParameters);
}
- private HandlerRequest<EmptyRequestBody, JobMessageParameters> createRequest(JobID jobId)
+ private HandlerRequest<EmptyRequestBody> createRequest(JobID jobId)
throws HandlerRequestException {
final Map<String, String> pathParameters = new HashMap<>();
pathParameters.put(JobIDPathParameter.KEY, jobId.toString());
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/JobExceptionsHandlerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/JobExceptionsHandlerTest.java
index 154c55c..ce7d9dd 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/JobExceptionsHandlerTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/JobExceptionsHandlerTest.java
@@ -96,7 +96,7 @@ public class JobExceptionsHandlerTest extends TestLogger {
final ExecutionGraphInfo executionGraphInfo =
new ExecutionGraphInfo(new ArchivedExecutionGraphBuilder().build());
- final HandlerRequest<EmptyRequestBody, JobExceptionsMessageParameters> request =
+ final HandlerRequest<EmptyRequestBody> request =
createRequest(executionGraphInfo.getJobId(), 10);
final JobExceptionsInfoWithHistory response =
testInstance.handleRequest(request, executionGraphInfo);
@@ -115,7 +115,7 @@ public class JobExceptionsHandlerTest extends TestLogger {
final ExecutionGraphInfo executionGraphInfo =
createExecutionGraphInfo(fromGlobalFailure(rootCause, rootCauseTimestamp));
- final HandlerRequest<EmptyRequestBody, JobExceptionsMessageParameters> request =
+ final HandlerRequest<EmptyRequestBody> request =
createRequest(executionGraphInfo.getJobId(), 10);
final JobExceptionsInfoWithHistory response =
testInstance.handleRequest(request, executionGraphInfo);
@@ -144,7 +144,7 @@ public class JobExceptionsHandlerTest extends TestLogger {
final ExecutionGraphInfo executionGraphInfo =
createExecutionGraphInfo(rootCause, otherFailure);
- final HandlerRequest<EmptyRequestBody, JobExceptionsMessageParameters> request =
+ final HandlerRequest<EmptyRequestBody> request =
createRequest(executionGraphInfo.getJobId(), 10);
final JobExceptionsInfoWithHistory response =
testInstance.handleRequest(request, executionGraphInfo);
@@ -175,7 +175,7 @@ public class JobExceptionsHandlerTest extends TestLogger {
Collections.emptySet());
final ExecutionGraphInfo executionGraphInfo = createExecutionGraphInfo(failure);
- final HandlerRequest<EmptyRequestBody, JobExceptionsMessageParameters> request =
+ final HandlerRequest<EmptyRequestBody> request =
createRequest(executionGraphInfo.getJobId(), 10);
final JobExceptionsInfoWithHistory response =
testInstance.handleRequest(request, executionGraphInfo);
@@ -205,7 +205,7 @@ public class JobExceptionsHandlerTest extends TestLogger {
final ExecutionGraphInfo executionGraphInfo =
createExecutionGraphInfo(rootCause, otherFailure);
- final HandlerRequest<EmptyRequestBody, JobExceptionsMessageParameters> request =
+ final HandlerRequest<EmptyRequestBody> request =
createRequest(executionGraphInfo.getJobId(), 1);
final JobExceptionsInfoWithHistory response =
testInstance.handleRequest(request, executionGraphInfo);
@@ -271,7 +271,7 @@ public class JobExceptionsHandlerTest extends TestLogger {
int maxNumExceptions,
int numExpectedException)
throws HandlerRequestException {
- final HandlerRequest<EmptyRequestBody, JobExceptionsMessageParameters> handlerRequest =
+ final HandlerRequest<EmptyRequestBody> handlerRequest =
createRequest(graph.getJobId(), numExpectedException);
final JobExceptionsInfo jobExceptionsInfo =
jobExceptionsHandler.handleRequest(handlerRequest, graph);
@@ -370,8 +370,8 @@ public class JobExceptionsHandlerTest extends TestLogger {
return new ExecutionGraphInfo(executionGraphBuilder.build(), historyEntryCollection);
}
- private static HandlerRequest<EmptyRequestBody, JobExceptionsMessageParameters> createRequest(
- JobID jobId, int size) throws HandlerRequestException {
+ private static HandlerRequest<EmptyRequestBody> createRequest(JobID jobId, int size)
+ throws HandlerRequestException {
final Map<String, String> pathParameters = new HashMap<>();
pathParameters.put(JobIDPathParameter.KEY, jobId.toString());
final Map<String, List<String>> queryParameters = new HashMap<>();
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/JobExecutionResultHandlerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/JobExecutionResultHandlerTest.java
index 46ff2c2..36e450c 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/JobExecutionResultHandlerTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/JobExecutionResultHandlerTest.java
@@ -59,7 +59,7 @@ public class JobExecutionResultHandlerTest extends TestLogger {
private JobExecutionResultHandler jobExecutionResultHandler;
- private HandlerRequest<EmptyRequestBody, JobMessageParameters> testRequest;
+ private HandlerRequest<EmptyRequestBody> testRequest;
@Before
public void setUp() throws Exception {
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/JobVertexBackPressureHandlerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/JobVertexBackPressureHandlerTest.java
index 9f8bed9..d38b7c1 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/JobVertexBackPressureHandlerTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/JobVertexBackPressureHandlerTest.java
@@ -147,7 +147,7 @@ public class JobVertexBackPressureHandlerTest {
JobIDPathParameter.KEY, TEST_JOB_ID_BACK_PRESSURE_STATS_AVAILABLE.toString());
pathParameters.put(JobVertexIdPathParameter.KEY, TEST_JOB_VERTEX_ID.toString());
- final HandlerRequest<EmptyRequestBody, JobVertexMessageParameters> request =
+ final HandlerRequest<EmptyRequestBody> request =
HandlerRequest.resolveParametersAndCreate(
EmptyRequestBody.getInstance(),
new JobVertexMessageParameters(),
@@ -202,7 +202,7 @@ public class JobVertexBackPressureHandlerTest {
JobIDPathParameter.KEY, TEST_JOB_ID_BACK_PRESSURE_STATS_ABSENT.toString());
pathParameters.put(JobVertexIdPathParameter.KEY, new JobVertexID().toString());
- final HandlerRequest<EmptyRequestBody, JobVertexMessageParameters> request =
+ final HandlerRequest<EmptyRequestBody> request =
HandlerRequest.resolveParametersAndCreate(
EmptyRequestBody.getInstance(),
new JobVertexMessageParameters(),
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/SubtaskCurrentAttemptDetailsHandlerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/SubtaskCurrentAttemptDetailsHandlerTest.java
index 5b3d66a..835c5ce 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/SubtaskCurrentAttemptDetailsHandlerTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/SubtaskCurrentAttemptDetailsHandlerTest.java
@@ -134,7 +134,7 @@ public class SubtaskCurrentAttemptDetailsHandlerTest extends TestLogger {
receivedPathParameters.put(JobIDPathParameter.KEY, jobID.toString());
receivedPathParameters.put(JobVertexIdPathParameter.KEY, jobVertexID.toString());
- final HandlerRequest<EmptyRequestBody, SubtaskMessageParameters> request =
+ final HandlerRequest<EmptyRequestBody> request =
HandlerRequest.resolveParametersAndCreate(
EmptyRequestBody.getInstance(),
new SubtaskMessageParameters(),
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/SubtaskExecutionAttemptAccumulatorsHandlerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/SubtaskExecutionAttemptAccumulatorsHandlerTest.java
index e2ba1f2..57dea7e 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/SubtaskExecutionAttemptAccumulatorsHandlerTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/SubtaskExecutionAttemptAccumulatorsHandlerTest.java
@@ -71,7 +71,7 @@ public class SubtaskExecutionAttemptAccumulatorsHandlerTest extends TestLogger {
TestingUtils.defaultExecutor());
// Instance a empty request.
- final HandlerRequest<EmptyRequestBody, SubtaskAttemptMessageParameters> request =
+ final HandlerRequest<EmptyRequestBody> request =
HandlerRequest.create(
EmptyRequestBody.getInstance(), new SubtaskAttemptMessageParameters());
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/SubtaskExecutionAttemptDetailsHandlerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/SubtaskExecutionAttemptDetailsHandlerTest.java
index f49d9d8..575edd0 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/SubtaskExecutionAttemptDetailsHandlerTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/SubtaskExecutionAttemptDetailsHandlerTest.java
@@ -138,7 +138,7 @@ public class SubtaskExecutionAttemptDetailsHandlerTest extends TestLogger {
receivedPathParameters.put(SubtaskIndexPathParameter.KEY, Integer.toString(subtaskIndex));
receivedPathParameters.put(SubtaskAttemptPathParameter.KEY, Integer.toString(attempt));
- final HandlerRequest<EmptyRequestBody, SubtaskAttemptMessageParameters> request =
+ final HandlerRequest<EmptyRequestBody> request =
HandlerRequest.resolveParametersAndCreate(
EmptyRequestBody.getInstance(),
new SubtaskAttemptMessageParameters(),
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/metrics/AbstractMetricsHandlerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/metrics/AbstractMetricsHandlerTest.java
index c9f5c0b..4ca852e 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/metrics/AbstractMetricsHandlerTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/metrics/AbstractMetricsHandlerTest.java
@@ -201,8 +201,7 @@ public class AbstractMetricsHandlerTest extends TestLogger {
@Nullable
@Override
protected MetricStore.ComponentMetricStore getComponentMetricStore(
- HandlerRequest<EmptyRequestBody, TestMessageParameters> request,
- MetricStore metricStore) {
+ HandlerRequest<EmptyRequestBody> request, MetricStore metricStore) {
return returnComponentMetricStore ? metricStore.getJobManager() : null;
}
}
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/metrics/AggregatingMetricsHandlerTestBase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/metrics/AggregatingMetricsHandlerTestBase.java
index bef4d7e..4ff19d9 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/metrics/AggregatingMetricsHandlerTestBase.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/metrics/AggregatingMetricsHandlerTestBase.java
@@ -125,7 +125,7 @@ public abstract class AggregatingMetricsHandlerTestBase<
@Test
public void getStores() throws Exception {
{ // test without filter
- HandlerRequest<EmptyRequestBody, P> request =
+ HandlerRequest<EmptyRequestBody> request =
HandlerRequest.resolveParametersAndCreate(
EmptyRequestBody.getInstance(),
handler.getMessageHeaders().getUnresolvedMessageParameters(),
@@ -165,7 +165,7 @@ public abstract class AggregatingMetricsHandlerTestBase<
Tuple2<String, List<String>> filter = getFilter();
Map<String, List<String>> queryParameters = new HashMap<>(4);
queryParameters.put(filter.f0, filter.f1);
- HandlerRequest<EmptyRequestBody, P> request =
+ HandlerRequest<EmptyRequestBody> request =
HandlerRequest.resolveParametersAndCreate(
EmptyRequestBody.getInstance(),
handler.getMessageHeaders().getUnresolvedMessageParameters(),
@@ -203,7 +203,7 @@ public abstract class AggregatingMetricsHandlerTestBase<
@Test
public void testListMetrics() throws Exception {
- HandlerRequest<EmptyRequestBody, P> request =
+ HandlerRequest<EmptyRequestBody> request =
HandlerRequest.resolveParametersAndCreate(
EmptyRequestBody.getInstance(),
handler.getMessageHeaders().getUnresolvedMessageParameters(),
@@ -231,7 +231,7 @@ public abstract class AggregatingMetricsHandlerTestBase<
queryParams.put("get", Collections.singletonList("abc.metric1"));
queryParams.put("agg", Collections.singletonList("min"));
- HandlerRequest<EmptyRequestBody, P> request =
+ HandlerRequest<EmptyRequestBody> request =
HandlerRequest.resolveParametersAndCreate(
EmptyRequestBody.getInstance(),
handler.getMessageHeaders().getUnresolvedMessageParameters(),
@@ -260,7 +260,7 @@ public abstract class AggregatingMetricsHandlerTestBase<
queryParams.put("get", Collections.singletonList("abc.metric1"));
queryParams.put("agg", Collections.singletonList("max"));
- HandlerRequest<EmptyRequestBody, P> request =
+ HandlerRequest<EmptyRequestBody> request =
HandlerRequest.resolveParametersAndCreate(
EmptyRequestBody.getInstance(),
handler.getMessageHeaders().getUnresolvedMessageParameters(),
@@ -289,7 +289,7 @@ public abstract class AggregatingMetricsHandlerTestBase<
queryParams.put("get", Collections.singletonList("abc.metric1"));
queryParams.put("agg", Collections.singletonList("sum"));
- HandlerRequest<EmptyRequestBody, P> request =
+ HandlerRequest<EmptyRequestBody> request =
HandlerRequest.resolveParametersAndCreate(
EmptyRequestBody.getInstance(),
handler.getMessageHeaders().getUnresolvedMessageParameters(),
@@ -318,7 +318,7 @@ public abstract class AggregatingMetricsHandlerTestBase<
queryParams.put("get", Collections.singletonList("abc.metric1"));
queryParams.put("agg", Collections.singletonList("avg"));
- HandlerRequest<EmptyRequestBody, P> request =
+ HandlerRequest<EmptyRequestBody> request =
HandlerRequest.resolveParametersAndCreate(
EmptyRequestBody.getInstance(),
handler.getMessageHeaders().getUnresolvedMessageParameters(),
@@ -347,7 +347,7 @@ public abstract class AggregatingMetricsHandlerTestBase<
queryParams.put("get", Collections.singletonList("abc.metric1"));
queryParams.put("agg", Arrays.asList("min", "max", "avg"));
- HandlerRequest<EmptyRequestBody, P> request =
+ HandlerRequest<EmptyRequestBody> request =
HandlerRequest.resolveParametersAndCreate(
EmptyRequestBody.getInstance(),
handler.getMessageHeaders().getUnresolvedMessageParameters(),
@@ -375,7 +375,7 @@ public abstract class AggregatingMetricsHandlerTestBase<
Map<String, List<String>> queryParams = new HashMap<>(4);
queryParams.put("get", Collections.singletonList("abc.metric1"));
- HandlerRequest<EmptyRequestBody, P> request =
+ HandlerRequest<EmptyRequestBody> request =
HandlerRequest.resolveParametersAndCreate(
EmptyRequestBody.getInstance(),
handler.getMessageHeaders().getUnresolvedMessageParameters(),
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/metrics/JobVertexWatermarksHandlerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/metrics/JobVertexWatermarksHandlerTest.java
index 7e48114..e295564 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/metrics/JobVertexWatermarksHandlerTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/metrics/JobVertexWatermarksHandlerTest.java
@@ -66,7 +66,7 @@ public class JobVertexWatermarksHandlerTest {
private MetricFetcher metricFetcher;
private MetricStore.TaskMetricStore taskMetricStore;
private JobVertexWatermarksHandler watermarkHandler;
- private HandlerRequest<EmptyRequestBody, JobVertexMessageParameters> request;
+ private HandlerRequest<EmptyRequestBody> request;
private AccessExecutionJobVertex vertex;
@Before
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/savepoints/SavepointHandlersTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/savepoints/SavepointHandlersTest.java
index 0187731..db8a564 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/savepoints/SavepointHandlersTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/savepoints/SavepointHandlersTest.java
@@ -200,18 +200,18 @@ public class SavepointHandlersTest extends TestLogger {
assertThat(savepointError, instanceOf(RuntimeException.class));
}
- private static HandlerRequest<SavepointTriggerRequestBody, SavepointTriggerMessageParameters>
- triggerSavepointRequest() throws HandlerRequestException {
+ private static HandlerRequest<SavepointTriggerRequestBody> triggerSavepointRequest()
+ throws HandlerRequestException {
return triggerSavepointRequest(DEFAULT_REQUESTED_SAVEPOINT_TARGET_DIRECTORY);
}
- private static HandlerRequest<SavepointTriggerRequestBody, SavepointTriggerMessageParameters>
+ private static HandlerRequest<SavepointTriggerRequestBody>
triggerSavepointRequestWithDefaultDirectory() throws HandlerRequestException {
return triggerSavepointRequest(null);
}
- private static HandlerRequest<SavepointTriggerRequestBody, SavepointTriggerMessageParameters>
- triggerSavepointRequest(final String targetDirectory) throws HandlerRequestException {
+ private static HandlerRequest<SavepointTriggerRequestBody> triggerSavepointRequest(
+ final String targetDirectory) throws HandlerRequestException {
return HandlerRequest.resolveParametersAndCreate(
new SavepointTriggerRequestBody(targetDirectory, false),
new SavepointTriggerMessageParameters(),
@@ -220,8 +220,8 @@ public class SavepointHandlersTest extends TestLogger {
Collections.emptyList());
}
- private static HandlerRequest<EmptyRequestBody, SavepointStatusMessageParameters>
- savepointStatusRequest(final TriggerId triggerId) throws HandlerRequestException {
+ private static HandlerRequest<EmptyRequestBody> savepointStatusRequest(
+ final TriggerId triggerId) throws HandlerRequestException {
final Map<String, String> pathParameters = new HashMap<>();
pathParameters.put(JobIDPathParameter.KEY, JOB_ID.toString());
pathParameters.put(TriggerIdPathParameter.KEY, triggerId.toString());
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/savepoints/StopWithSavepointHandlersTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/savepoints/StopWithSavepointHandlersTest.java
index aa18350..fbfe5bd 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/savepoints/StopWithSavepointHandlersTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/job/savepoints/StopWithSavepointHandlersTest.java
@@ -205,18 +205,18 @@ public class StopWithSavepointHandlersTest extends TestLogger {
assertThat(savepointError, instanceOf(RuntimeException.class));
}
- private static HandlerRequest<StopWithSavepointRequestBody, SavepointTriggerMessageParameters>
- triggerSavepointRequest() throws HandlerRequestException {
+ private static HandlerRequest<StopWithSavepointRequestBody> triggerSavepointRequest()
+ throws HandlerRequestException {
return triggerSavepointRequest(DEFAULT_REQUESTED_SAVEPOINT_TARGET_DIRECTORY);
}
- private static HandlerRequest<StopWithSavepointRequestBody, SavepointTriggerMessageParameters>
+ private static HandlerRequest<StopWithSavepointRequestBody>
triggerSavepointRequestWithDefaultDirectory() throws HandlerRequestException {
return triggerSavepointRequest(null);
}
- private static HandlerRequest<StopWithSavepointRequestBody, SavepointTriggerMessageParameters>
- triggerSavepointRequest(final String targetDirectory) throws HandlerRequestException {
+ private static HandlerRequest<StopWithSavepointRequestBody> triggerSavepointRequest(
+ final String targetDirectory) throws HandlerRequestException {
return HandlerRequest.resolveParametersAndCreate(
new StopWithSavepointRequestBody(targetDirectory, false),
new SavepointTriggerMessageParameters(),
@@ -225,8 +225,8 @@ public class StopWithSavepointHandlersTest extends TestLogger {
Collections.emptyList());
}
- private static HandlerRequest<EmptyRequestBody, SavepointStatusMessageParameters>
- savepointStatusRequest(final TriggerId triggerId) throws HandlerRequestException {
+ private static HandlerRequest<EmptyRequestBody> savepointStatusRequest(
+ final TriggerId triggerId) throws HandlerRequestException {
final Map<String, String> pathParameters = new HashMap<>();
pathParameters.put(JobIDPathParameter.KEY, JOB_ID.toString());
pathParameters.put(TriggerIdPathParameter.KEY, triggerId.toString());
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/taskmanager/AbstractTaskManagerFileHandlerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/taskmanager/AbstractTaskManagerFileHandlerTest.java
index 4f8608c..531bfe0 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/taskmanager/AbstractTaskManagerFileHandlerTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/taskmanager/AbstractTaskManagerFileHandlerTest.java
@@ -105,7 +105,7 @@ public class AbstractTaskManagerFileHandlerTest extends TestLogger {
private static BlobServer blobServer;
- private static HandlerRequest<EmptyRequestBody, TaskManagerMessageParameters> handlerRequest;
+ private static HandlerRequest<EmptyRequestBody> handlerRequest;
private String fileContent1;
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/taskmanager/TaskManagerDetailsHandlerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/taskmanager/TaskManagerDetailsHandlerTest.java
index 565c3a1..c53c9dc 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/taskmanager/TaskManagerDetailsHandlerTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/taskmanager/TaskManagerDetailsHandlerTest.java
@@ -36,7 +36,6 @@ import org.apache.flink.runtime.rest.messages.taskmanager.TaskManagerDetailsInfo
import org.apache.flink.runtime.rest.messages.taskmanager.TaskManagerFileMessageParameters;
import org.apache.flink.runtime.rest.messages.taskmanager.TaskManagerIdPathParameter;
import org.apache.flink.runtime.rest.messages.taskmanager.TaskManagerInfo;
-import org.apache.flink.runtime.rest.messages.taskmanager.TaskManagerMessageParameters;
import org.apache.flink.runtime.rest.messages.taskmanager.TaskManagerMetricsInfo;
import org.apache.flink.runtime.taskexecutor.TaskExecutorMemoryConfiguration;
import org.apache.flink.runtime.testutils.TestingUtils;
@@ -94,7 +93,7 @@ public class TaskManagerDetailsHandlerTest extends TestLogger {
new TaskManagerInfoWithSlots(
createEmptyTaskManagerInfo(), Collections.emptyList())));
- HandlerRequest<EmptyRequestBody, TaskManagerMessageParameters> request = createRequest();
+ HandlerRequest<EmptyRequestBody> request = createRequest();
TaskManagerDetailsInfo taskManagerDetailsInfo =
testInstance.handleRequest(request, resourceManagerGateway).get();
@@ -178,8 +177,7 @@ public class TaskManagerDetailsHandlerTest extends TestLogger {
new TaskExecutorMemoryConfiguration(0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L));
}
- private static HandlerRequest<EmptyRequestBody, TaskManagerMessageParameters> createRequest()
- throws HandlerRequestException {
+ private static HandlerRequest<EmptyRequestBody> createRequest() throws HandlerRequestException {
Map<String, String> pathParameters = new HashMap<>();
pathParameters.put(TaskManagerIdPathParameter.KEY, TASK_MANAGER_ID.toString());
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/taskmanager/TaskManagerLogListHandlerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/taskmanager/TaskManagerLogListHandlerTest.java
index 48e063d..70b6df9 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/taskmanager/TaskManagerLogListHandlerTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/taskmanager/TaskManagerLogListHandlerTest.java
@@ -60,7 +60,7 @@ public class TaskManagerLogListHandlerTest extends TestLogger {
private static final ResourceID EXPECTED_TASK_MANAGER_ID = ResourceID.generate();
private TestingResourceManagerGateway resourceManagerGateway;
private TaskManagerLogListHandler taskManagerLogListHandler;
- private HandlerRequest<EmptyRequestBody, TaskManagerMessageParameters> handlerRequest;
+ private HandlerRequest<EmptyRequestBody> handlerRequest;
@Before
public void setUp() throws HandlerRequestException {
@@ -113,8 +113,8 @@ public class TaskManagerLogListHandlerTest extends TestLogger {
}
}
- private static HandlerRequest<EmptyRequestBody, TaskManagerMessageParameters> createRequest(
- ResourceID taskManagerId) throws HandlerRequestException {
+ private static HandlerRequest<EmptyRequestBody> createRequest(ResourceID taskManagerId)
+ throws HandlerRequestException {
Map<String, String> pathParameters = new HashMap<>();
pathParameters.put(TaskManagerIdPathParameter.KEY, taskManagerId.toString());
Map<String, List<String>> queryParameters = Collections.emptyMap();
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/util/TestRestHandler.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/util/TestRestHandler.java
index 1de287a..b8d9192 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/util/TestRestHandler.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/util/TestRestHandler.java
@@ -67,7 +67,7 @@ public class TestRestHandler<
@Override
protected CompletableFuture<RES> handleRequest(
- @Nullable HandlerRequest<REQ, M> request, @Nullable G gateway)
+ @Nullable HandlerRequest<REQ> request, @Nullable G gateway)
throws RestHandlerException {
final CompletableFuture<RES> result = responseQueue.poll();