Skip to content

Commit abcbb63

Browse files
reswqareswqa
committed
[FLINK-36275][rest] Remove deprecated ProgramArgsQueryParameter
1 parent 8d4e985 commit abcbb63

File tree

12 files changed

+49
-271
lines changed

12 files changed

+49
-271
lines changed

Diff for: ‎flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JarMessageParameters.java

-3
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ abstract class JarMessageParameters extends MessageParameters {
3737

3838
final ParallelismQueryParameter parallelismQueryParameter = new ParallelismQueryParameter();
3939

40-
final ProgramArgsQueryParameter programArgsQueryParameter = new ProgramArgsQueryParameter();
41-
4240
final ProgramArgQueryParameter programArgQueryParameter = new ProgramArgQueryParameter();
4341

4442
@Override
@@ -50,7 +48,6 @@ public Collection<MessagePathParameter<?>> getPathParameters() {
5048
public Collection<MessageQueryParameter<?>> getQueryParameters() {
5149
return Collections.unmodifiableList(
5250
Arrays.asList(
53-
programArgsQueryParameter,
5451
programArgQueryParameter,
5552
entryClassQueryParameter,
5653
parallelismQueryParameter));

Diff for: ‎flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JarPlanRequestBody.java

+2-9
Original file line numberDiff line numberDiff line change
@@ -36,25 +36,18 @@
3636
public class JarPlanRequestBody extends JarRequestBody {
3737
@VisibleForTesting
3838
public JarPlanRequestBody() {
39-
super(null, null, null, null, null, null);
39+
super(null, null, null, null, null);
4040
}
4141

4242
@JsonCreator
4343
public JarPlanRequestBody(
4444
@Nullable @JsonProperty(FIELD_NAME_ENTRY_CLASS) String entryClassName,
45-
@Nullable @JsonProperty(FIELD_NAME_PROGRAM_ARGUMENTS) String programArguments,
4645
@Nullable @JsonProperty(FIELD_NAME_PROGRAM_ARGUMENTS_LIST)
4746
List<String> programArgumentsList,
4847
@Nullable @JsonProperty(FIELD_NAME_PARALLELISM) Integer parallelism,
4948
@Nullable @JsonProperty(FIELD_NAME_JOB_ID) JobID jobId,
5049
@Nullable @JsonProperty(FIELD_NAME_FLINK_CONFIGURATION)
5150
Map<String, String> flinkConfiguration) {
52-
super(
53-
entryClassName,
54-
programArguments,
55-
programArgumentsList,
56-
parallelism,
57-
jobId,
58-
flinkConfiguration);
51+
super(entryClassName, programArgumentsList, parallelism, jobId, flinkConfiguration);
5952
}
6053
}

Diff for: ‎flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JarRequestBody.java

+1-14
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
public abstract class JarRequestBody implements RequestBody {
4343

4444
static final String FIELD_NAME_ENTRY_CLASS = "entryClass";
45-
static final String FIELD_NAME_PROGRAM_ARGUMENTS = "programArgs";
4645
static final String FIELD_NAME_PROGRAM_ARGUMENTS_LIST = "programArgsList";
4746
static final String FIELD_NAME_PARALLELISM = "parallelism";
4847
static final String FIELD_NAME_FLINK_CONFIGURATION = "flinkConfiguration";
@@ -52,10 +51,6 @@ public abstract class JarRequestBody implements RequestBody {
5251
@Nullable
5352
private String entryClassName;
5453

55-
@JsonProperty(FIELD_NAME_PROGRAM_ARGUMENTS)
56-
@Nullable
57-
private String programArguments;
58-
5954
@JsonProperty(FIELD_NAME_PROGRAM_ARGUMENTS_LIST)
6055
@Nullable
6156
private List<String> programArgumentsList;
@@ -75,21 +70,19 @@ public abstract class JarRequestBody implements RequestBody {
7570
private Map<String, String> flinkConfiguration;
7671

7772
JarRequestBody() {
78-
this(null, null, null, null, null, null);
73+
this(null, null, null, null, null);
7974
}
8075

8176
@JsonCreator
8277
JarRequestBody(
8378
@Nullable @JsonProperty(FIELD_NAME_ENTRY_CLASS) String entryClassName,
84-
@Nullable @JsonProperty(FIELD_NAME_PROGRAM_ARGUMENTS) String programArguments,
8579
@Nullable @JsonProperty(FIELD_NAME_PROGRAM_ARGUMENTS_LIST)
8680
List<String> programArgumentsList,
8781
@Nullable @JsonProperty(FIELD_NAME_PARALLELISM) Integer parallelism,
8882
@Nullable @JsonProperty(FIELD_NAME_JOB_ID) JobID jobId,
8983
@Nullable @JsonProperty(FIELD_NAME_FLINK_CONFIGURATION)
9084
Map<String, String> flinkConfiguration) {
9185
this.entryClassName = entryClassName;
92-
this.programArguments = programArguments;
9386
this.programArgumentsList = programArgumentsList;
9487
this.parallelism = parallelism;
9588
this.jobId = jobId;
@@ -102,12 +95,6 @@ public String getEntryClassName() {
10295
return entryClassName;
10396
}
10497

105-
@Nullable
106-
@JsonIgnore
107-
public String getProgramArguments() {
108-
return programArguments;
109-
}
110-
11198
@Nullable
11299
@JsonIgnore
113100
public List<String> getProgramArgumentsList() {

Diff for: ‎flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/JarRunRequestBody.java

+2-11
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,13 @@ public class JarRunRequestBody extends JarRequestBody {
6464
private RecoveryClaimMode recoveryClaimMode;
6565

6666
public JarRunRequestBody() {
67-
this(null, null, null, null, null, null, null, null, null, null);
67+
this(null, null, null, null, null, null, null, null, null);
6868
}
6969

7070
/** Fallback constructor ONLY for tests. */
7171
@VisibleForTesting
7272
public JarRunRequestBody(
7373
@Nullable String entryClassName,
74-
@Nullable String programArguments,
7574
@Nullable List<String> programArgumentsList,
7675
@Nullable Integer parallelism,
7776
@Nullable JobID jobId,
@@ -81,7 +80,6 @@ public JarRunRequestBody(
8180
@Nullable Map<String, String> flinkConfiguration) {
8281
this(
8382
entryClassName,
84-
programArguments,
8583
programArgumentsList,
8684
parallelism,
8785
jobId,
@@ -95,7 +93,6 @@ public JarRunRequestBody(
9593
@JsonCreator
9694
public JarRunRequestBody(
9795
@Nullable @JsonProperty(FIELD_NAME_ENTRY_CLASS) String entryClassName,
98-
@Nullable @JsonProperty(FIELD_NAME_PROGRAM_ARGUMENTS) String programArguments,
9996
@Nullable @JsonProperty(FIELD_NAME_PROGRAM_ARGUMENTS_LIST)
10097
List<String> programArgumentsList,
10198
@Nullable @JsonProperty(FIELD_NAME_PARALLELISM) Integer parallelism,
@@ -109,13 +106,7 @@ public JarRunRequestBody(
109106
RecoveryClaimMode recoveryClaimMode,
110107
@Nullable @JsonProperty(FIELD_NAME_FLINK_CONFIGURATION)
111108
Map<String, String> flinkConfiguration) {
112-
super(
113-
entryClassName,
114-
programArguments,
115-
programArgumentsList,
116-
parallelism,
117-
jobId,
118-
flinkConfiguration);
109+
super(entryClassName, programArgumentsList, parallelism, jobId, flinkConfiguration);
119110
this.allowNonRestoredState = allowNonRestoredState;
120111
this.savepointPath = savepointPath;
121112
this.deprecatedRecoveryClaimMode = deprecatedRecoveryClaimMode;

Diff for: ‎flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/ProgramArgsQueryParameter.java

-41
This file was deleted.

Diff for: ‎flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/handlers/utils/JarHandlerUtils.java

+5-25
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
import org.apache.flink.runtime.webmonitor.handlers.JarRequestBody;
3838
import org.apache.flink.runtime.webmonitor.handlers.ParallelismQueryParameter;
3939
import org.apache.flink.runtime.webmonitor.handlers.ProgramArgQueryParameter;
40-
import org.apache.flink.runtime.webmonitor.handlers.ProgramArgsQueryParameter;
4140

4241
import org.apache.flink.shaded.netty4.io.netty.handler.codec.http.HttpResponseStatus;
4342

@@ -240,30 +239,11 @@ private static List<URL> getClasspaths(Configuration configuration) {
240239
List<String> getProgramArgs(HandlerRequest<R> request, Logger log)
241240
throws RestHandlerException {
242241
JarRequestBody requestBody = request.getRequestBody();
243-
@SuppressWarnings("deprecation")
244-
List<String> programArgs =
245-
tokenizeArguments(
246-
fromRequestBodyOrQueryParameter(
247-
emptyToNull(requestBody.getProgramArguments()),
248-
() -> getQueryParameter(request, ProgramArgsQueryParameter.class),
249-
null,
250-
log));
251-
List<String> programArgsList =
252-
fromRequestBodyOrQueryParameter(
253-
requestBody.getProgramArgumentsList(),
254-
() -> request.getQueryParameter(ProgramArgQueryParameter.class),
255-
null,
256-
log);
257-
if (!programArgsList.isEmpty()) {
258-
if (!programArgs.isEmpty()) {
259-
throw new RestHandlerException(
260-
"Confusing request: programArgs and programArgsList are specified, please, use only programArgsList",
261-
HttpResponseStatus.BAD_REQUEST);
262-
}
263-
return programArgsList;
264-
} else {
265-
return programArgs;
266-
}
242+
return fromRequestBodyOrQueryParameter(
243+
requestBody.getProgramArgumentsList(),
244+
() -> request.getQueryParameter(ProgramArgQueryParameter.class),
245+
null,
246+
log);
267247
}
268248

269249
private static final Pattern ARGUMENTS_TOKENIZE_PATTERN =

0 commit comments

Comments
 (0)