[flink] branch master updated: [FLINK-31738] Prevent name clash in generated clients

[dmvk]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 4f15da77dcb [FLINK-31738] Prevent name clash in generated clients
4f15da77dcb is described below

commit 4f15da77dcb7d83e211eb65f24e1b49cb46618a2
Author: Chesnay Schepler <ches...@apache.org>
AuthorDate: Wed Apr 5 16:41:17 2023 +0200

    [FLINK-31738] Prevent name clash in generated clients
---
 docs/static/generated/rest_v1_dispatcher.yml               | 14 +++++++-------
 .../rest/messages/FlameGraphTypeQueryParameter.java        |  3 +++
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/docs/static/generated/rest_v1_dispatcher.yml 
b/docs/static/generated/rest_v1_dispatcher.yml
index 7b0a1fac3cc..2e8d49145a2 100644
--- a/docs/static/generated/rest_v1_dispatcher.yml
+++ b/docs/static/generated/rest_v1_dispatcher.yml
@@ -1104,7 +1104,7 @@ paths:
         required: false
         style: form
         schema:
-          $ref: '#/components/schemas/Type'
+          $ref: '#/components/schemas/ThreadStates'
       - name: subtaskindex
         in: query
         description: Positive integer value that identifies a subtask.
@@ -3287,6 +3287,12 @@ components:
           type: string
         threadName:
           type: string
+    ThreadStates:
+      type: string
+      enum:
+      - FULL
+      - ON_CPU
+      - OFF_CPU
     TriggerId:
       pattern: "[0-9a-f]{32}"
       type: string
@@ -3295,12 +3301,6 @@ components:
       properties:
         request-id:
           $ref: '#/components/schemas/TriggerId'
-    Type:
-      type: string
-      enum:
-      - FULL
-      - ON_CPU
-      - OFF_CPU
     UploadStatus:
       type: string
       enum:
diff --git 
a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/FlameGraphTypeQueryParameter.java
 
b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/FlameGraphTypeQueryParameter.java
index a0625394469..6e7aba5b358 100644
--- 
a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/FlameGraphTypeQueryParameter.java
+++ 
b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/FlameGraphTypeQueryParameter.java
@@ -18,6 +18,8 @@
 
 package org.apache.flink.runtime.rest.messages;
 
+import io.swagger.v3.oas.annotations.media.Schema;
+
 import java.util.Arrays;
 
 /** Flame Graph type query parameter. */
@@ -48,6 +50,7 @@ public class FlameGraphTypeQueryParameter
     }
 
     /** Flame Graph type. */
+    @Schema(name = "ThreadStates")
     public enum Type {
         /** Type of the Flame Graph that includes threads in all possible 
states. */
         FULL,