[FLINK-36275][rest] Remove deprecated ProgramArgsQueryParameter

Author: reswqa

flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JarMessageParameters.java

@@ -37,8 +37,6 @@ abstract class JarMessageParameters extends MessageParameters {
 
     final ParallelismQueryParameter parallelismQueryParameter = new ParallelismQueryParameter();
 
-    final ProgramArgsQueryParameter programArgsQueryParameter = new ProgramArgsQueryParameter();
-
     final ProgramArgQueryParameter programArgQueryParameter = new ProgramArgQueryParameter();
 
     @Override
@@ -50,7 +48,6 @@ public Collection<MessagePathParameter<?>> getPathParameters() {
     public Collection<MessageQueryParameter<?>> getQueryParameters() {
         return Collections.unmodifiableList(
                 Arrays.asList(
-                        programArgsQueryParameter,
                         programArgQueryParameter,
                         entryClassQueryParameter,
                         parallelismQueryParameter));

flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JarPlanRequestBody.java

@@ -36,25 +36,18 @@
 public class JarPlanRequestBody extends JarRequestBody {
     @VisibleForTesting
     public JarPlanRequestBody() {
-        super(null, null, null, null, null, null);
+        super(null, null, null, null, null);
     }
 
     @JsonCreator
     public JarPlanRequestBody(
             @Nullable @JsonProperty(FIELD_NAME_ENTRY_CLASS) String entryClassName,
-            @Nullable @JsonProperty(FIELD_NAME_PROGRAM_ARGUMENTS) String programArguments,
             @Nullable @JsonProperty(FIELD_NAME_PROGRAM_ARGUMENTS_LIST)
                     List<String> programArgumentsList,
             @Nullable @JsonProperty(FIELD_NAME_PARALLELISM) Integer parallelism,
             @Nullable @JsonProperty(FIELD_NAME_JOB_ID) JobID jobId,
             @Nullable @JsonProperty(FIELD_NAME_FLINK_CONFIGURATION)
                     Map<String, String> flinkConfiguration) {
-        super(
-                entryClassName,
-                programArguments,
-                programArgumentsList,
-                parallelism,
-                jobId,
-                flinkConfiguration);
+        super(entryClassName, programArgumentsList, parallelism, jobId, flinkConfiguration);
     }
 }

flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JarRequestBody.java

@@ -42,7 +42,6 @@
 public abstract class JarRequestBody implements RequestBody {
 
     static final String FIELD_NAME_ENTRY_CLASS = "entryClass";
-    static final String FIELD_NAME_PROGRAM_ARGUMENTS = "programArgs";
     static final String FIELD_NAME_PROGRAM_ARGUMENTS_LIST = "programArgsList";
     static final String FIELD_NAME_PARALLELISM = "parallelism";
     static final String FIELD_NAME_FLINK_CONFIGURATION = "flinkConfiguration";
@@ -52,10 +51,6 @@ public abstract class JarRequestBody implements RequestBody {
     @Nullable
     private String entryClassName;
 
-    @JsonProperty(FIELD_NAME_PROGRAM_ARGUMENTS)
-    @Nullable
-    private String programArguments;
-
     @JsonProperty(FIELD_NAME_PROGRAM_ARGUMENTS_LIST)
     @Nullable
     private List<String> programArgumentsList;
@@ -75,21 +70,19 @@ public abstract class JarRequestBody implements RequestBody {
     private Map<String, String> flinkConfiguration;
 
     JarRequestBody() {
-        this(null, null, null, null, null, null);
+        this(null, null, null, null, null);
     }
 
     @JsonCreator
     JarRequestBody(
             @Nullable @JsonProperty(FIELD_NAME_ENTRY_CLASS) String entryClassName,
-            @Nullable @JsonProperty(FIELD_NAME_PROGRAM_ARGUMENTS) String programArguments,
             @Nullable @JsonProperty(FIELD_NAME_PROGRAM_ARGUMENTS_LIST)
                     List<String> programArgumentsList,
             @Nullable @JsonProperty(FIELD_NAME_PARALLELISM) Integer parallelism,
             @Nullable @JsonProperty(FIELD_NAME_JOB_ID) JobID jobId,
             @Nullable @JsonProperty(FIELD_NAME_FLINK_CONFIGURATION)
                     Map<String, String> flinkConfiguration) {
         this.entryClassName = entryClassName;
-        this.programArguments = programArguments;
         this.programArgumentsList = programArgumentsList;
         this.parallelism = parallelism;
         this.jobId = jobId;
@@ -102,12 +95,6 @@ public String getEntryClassName() {
         return entryClassName;
     }
 
-    @Nullable
-    @JsonIgnore
-    public String getProgramArguments() {
-        return programArguments;
-    }
-
     @Nullable
     @JsonIgnore
     public List<String> getProgramArgumentsList() {

flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JarRunRequestBody.java

@@ -64,14 +64,13 @@ public class JarRunRequestBody extends JarRequestBody {
     private RecoveryClaimMode recoveryClaimMode;
 
     public JarRunRequestBody() {
-        this(null, null, null, null, null, null, null, null, null, null);
+        this(null, null, null, null, null, null, null, null, null);
     }
 
     /** Fallback constructor ONLY for tests. */
     @VisibleForTesting
     public JarRunRequestBody(
             @Nullable String entryClassName,
-            @Nullable String programArguments,
             @Nullable List<String> programArgumentsList,
             @Nullable Integer parallelism,
             @Nullable JobID jobId,
@@ -81,7 +80,6 @@ public JarRunRequestBody(
             @Nullable Map<String, String> flinkConfiguration) {
         this(
                 entryClassName,
-                programArguments,
                 programArgumentsList,
                 parallelism,
                 jobId,
@@ -95,7 +93,6 @@ public JarRunRequestBody(
     @JsonCreator
     public JarRunRequestBody(
             @Nullable @JsonProperty(FIELD_NAME_ENTRY_CLASS) String entryClassName,
-            @Nullable @JsonProperty(FIELD_NAME_PROGRAM_ARGUMENTS) String programArguments,
             @Nullable @JsonProperty(FIELD_NAME_PROGRAM_ARGUMENTS_LIST)
                     List<String> programArgumentsList,
             @Nullable @JsonProperty(FIELD_NAME_PARALLELISM) Integer parallelism,
@@ -109,13 +106,7 @@ public JarRunRequestBody(
                     RecoveryClaimMode recoveryClaimMode,
             @Nullable @JsonProperty(FIELD_NAME_FLINK_CONFIGURATION)
                     Map<String, String> flinkConfiguration) {
-        super(
-                entryClassName,
-                programArguments,
-                programArgumentsList,
-                parallelism,
-                jobId,
-                flinkConfiguration);
+        super(entryClassName, programArgumentsList, parallelism, jobId, flinkConfiguration);
         this.allowNonRestoredState = allowNonRestoredState;
         this.savepointPath = savepointPath;
         this.deprecatedRecoveryClaimMode = deprecatedRecoveryClaimMode;

flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/ProgramArgsQueryParameter.java

@@ -37,7 +37,6 @@
 import org.apache.flink.runtime.webmonitor.handlers.JarRequestBody;
 import org.apache.flink.runtime.webmonitor.handlers.ParallelismQueryParameter;
 import org.apache.flink.runtime.webmonitor.handlers.ProgramArgQueryParameter;
-import org.apache.flink.runtime.webmonitor.handlers.ProgramArgsQueryParameter;
 
 import org.apache.flink.shaded.netty4.io.netty.handler.codec.http.HttpResponseStatus;
 
@@ -240,30 +239,11 @@ private static List<URL> getClasspaths(Configuration configuration) {
             List<String> getProgramArgs(HandlerRequest<R> request, Logger log)
                     throws RestHandlerException {
         JarRequestBody requestBody = request.getRequestBody();
-        @SuppressWarnings("deprecation")
-        List<String> programArgs =
-                tokenizeArguments(
-                        fromRequestBodyOrQueryParameter(
-                                emptyToNull(requestBody.getProgramArguments()),
-                                () -> getQueryParameter(request, ProgramArgsQueryParameter.class),
-                                null,
-                                log));
-        List<String> programArgsList =
-                fromRequestBodyOrQueryParameter(
-                        requestBody.getProgramArgumentsList(),
-                        () -> request.getQueryParameter(ProgramArgQueryParameter.class),
-                        null,
-                        log);
-        if (!programArgsList.isEmpty()) {
-            if (!programArgs.isEmpty()) {
-                throw new RestHandlerException(
-                        "Confusing request: programArgs and programArgsList are specified, please, use only programArgsList",
-                        HttpResponseStatus.BAD_REQUEST);
-            }
-            return programArgsList;
-        } else {
-            return programArgs;
-        }
+        return fromRequestBodyOrQueryParameter(
+                requestBody.getProgramArgumentsList(),
+                () -> request.getQueryParameter(ProgramArgQueryParameter.class),
+                null,
+                log);
     }
 
     private static final Pattern ARGUMENTS_TOKENIZE_PATTERN =