[CELEBORN-1607] Enable useEnumCaseInsensitive for openapi-generator

common/src/main/scala/org/apache/celeborn/common/protocol/message/ControlMessages.scala

@@ -425,11 +425,11 @@ object ControlMessages extends Logging {
   object WorkerEventRequest {
     def apply(
         workers: util.List[WorkerInfo],
-        eventType: String,
+        eventType: WorkerEventType,
         requestId: String): PbWorkerEventRequest =
       PbWorkerEventRequest.newBuilder()
         .setRequestId(requestId)
-        .setWorkerEventType(WorkerEventType.valueOf(eventType))
+        .setWorkerEventType(eventType)
         .addAllWorkers(workers.asScala.map { workerInfo =>
           PbSerDeUtils.toPbWorkerInfo(workerInfo, true, false)
         }.toList.asJava)

master/src/main/scala/org/apache/celeborn/service/deploy/master/Master.scala

@@ -1218,7 +1218,7 @@ private[celeborn] class Master(
   }
 
   override def handleWorkerEvent(
-      workerEventType: String,
+      workerEventType: WorkerEventType,
       workers: Seq[WorkerInfo]): HandleResponse = {
     val sb = new StringBuilder()
     try {

master/src/main/scala/org/apache/celeborn/service/deploy/master/http/api/ApiMasterResource.scala

@@ -26,6 +26,7 @@ import io.swagger.v3.oas.annotations.tags.Tag
 import org.apache.commons.lang3.StringUtils
 
 import org.apache.celeborn.common.meta.WorkerInfo
+import org.apache.celeborn.common.protocol.WorkerEventType
 import org.apache.celeborn.server.common.http.api.ApiRequestContext
 
 @Tag(name = "Deprecated")
@@ -136,7 +137,9 @@ class ApiMasterResource extends ApiRequestContext {
     }
     sb.append("============================ Handle Worker Event =============================\n")
     val workerList = workers.split(",").filter(_.nonEmpty).map(WorkerInfo.fromUniqueId)
-    sb.append(httpService.handleWorkerEvent(normalizeParam(eventType), workerList)._2)
+    sb.append(httpService.handleWorkerEvent(
+      WorkerEventType.valueOf(normalizeParam(eventType)),
+      workerList)._2)
     sb.toString()
   }
 }

master/src/main/scala/org/apache/celeborn/service/deploy/master/http/api/v1/WorkerResource.scala

@@ -26,7 +26,9 @@ import io.swagger.v3.oas.annotations.media.{Content, Schema}
 import io.swagger.v3.oas.annotations.responses.ApiResponse
 import io.swagger.v3.oas.annotations.tags.Tag
 
+import org.apache.celeborn.common.protocol.WorkerEventType
 import org.apache.celeborn.rest.v1.model._
+import org.apache.celeborn.rest.v1.model.SendWorkerEventRequest.EventTypeEnum
 import org.apache.celeborn.server.common.http.api.ApiRequestContext
 import org.apache.celeborn.server.common.http.api.v1.ApiUtils
 import org.apache.celeborn.service.deploy.master.Master
@@ -137,7 +139,8 @@ class WorkerResource extends ApiRequestContext {
         throw new BadRequestException(
           s"None of the workers are known: ${unknownWorkers.map(_.readableAddress).mkString(", ")}")
       }
-      val (success, msg) = httpService.handleWorkerEvent(request.getEventType.toString, workers)
+      val (success, msg) =
+        httpService.handleWorkerEvent(toWorkerEventType(request.getEventType), workers)
       val finalMsg =
         if (unknownWorkers.isEmpty) {
           msg
@@ -146,4 +149,16 @@ class WorkerResource extends ApiRequestContext {
         }
       new HandleResponse().success(success).message(finalMsg)
     }
+
+  private def toWorkerEventType(enum: EventTypeEnum): WorkerEventType = {
+    enum match {
+      case EventTypeEnum.NONE => WorkerEventType.None
+      case EventTypeEnum.IMMEDIATELY => WorkerEventType.Immediately
+      case EventTypeEnum.DECOMMISSION => WorkerEventType.Decommission
+      case EventTypeEnum.DECOMMISSIONTHENIDLE => WorkerEventType.DecommissionThenIdle
+      case EventTypeEnum.GRACEFUL => WorkerEventType.Graceful
+      case EventTypeEnum.RECOMMISSION => WorkerEventType.Recommission
+      case _ => WorkerEventType.UNRECOGNIZED
+    }
+  }
 }

master/src/test/scala/org/apache/celeborn/service/deploy/master/http/api/v1/ApiV1MasterResourceSuite.scala

@@ -143,7 +143,7 @@ class ApiV1MasterResourceSuite extends ApiV1BaseResourceSuite {
       Entity.entity(sendWorkerEventRequest, MediaType.APPLICATION_JSON))
     assert(HttpServletResponse.SC_BAD_REQUEST == response.getStatus)
     assert(
-      response.readEntity(classOf[String]).contains("eventType(None) and workers([]) are required"))
+      response.readEntity(classOf[String]).contains("eventType(NONE) and workers([]) are required"))
     sendWorkerEventRequest.workers(Collections.singletonList(worker))
     response = webTarget.path("workers/events").request(MediaType.APPLICATION_JSON).post(
       Entity.entity(sendWorkerEventRequest, MediaType.APPLICATION_JSON))

openapi/openapi-client/pom.xml

@@ -244,6 +244,7 @@
                     <hideGenerationTimestamp>true</hideGenerationTimestamp>
                     <supportUrlQuery>false</supportUrlQuery>
                     <annotationLibrary>none</annotationLibrary>
+                    <useEnumCaseInsensitive>true</useEnumCaseInsensitive>
                   </configOptions>
                 </configuration>
               </execution>
@@ -278,6 +279,7 @@
                     <hideGenerationTimestamp>true</hideGenerationTimestamp>
                     <supportUrlQuery>false</supportUrlQuery>
                     <annotationLibrary>none</annotationLibrary>
+                    <useEnumCaseInsensitive>true</useEnumCaseInsensitive>
                   </configOptions>
                 </configuration>
               </execution>

openapi/openapi-client/src/main/java/org/apache/celeborn/rest/v1/model/DynamicConfig.java

@@ -71,7 +71,7 @@ public String toString() {
     @JsonCreator
     public static LevelEnum fromValue(String value) {
       for (LevelEnum b : LevelEnum.values()) {
-        if (b.value.equals(value)) {
+        if (b.value.equalsIgnoreCase(value)) {
           return b;
         }
       }

openapi/openapi-client/src/main/java/org/apache/celeborn/rest/v1/model/PartitionLocationData.java

@@ -74,7 +74,7 @@ public String toString() {
     @JsonCreator
     public static ModeEnum fromValue(String value) {
       for (ModeEnum b : ModeEnum.values()) {
-        if (b.value.equals(value)) {
+        if (b.value.equalsIgnoreCase(value)) {
           return b;
         }
       }
@@ -123,7 +123,7 @@ public String toString() {
     @JsonCreator
     public static StorageEnum fromValue(String value) {
       for (StorageEnum b : StorageEnum.values()) {
-        if (b.value.equals(value)) {
+        if (b.value.equalsIgnoreCase(value)) {
           return b;
         }
       }

openapi/openapi-client/src/main/java/org/apache/celeborn/rest/v1/model/SendWorkerEventRequest.java

@@ -45,17 +45,17 @@ public class SendWorkerEventRequest {
    * The type of the event.
    */
   public enum EventTypeEnum {
-    IMMEDIATELY("Immediately"),
+    IMMEDIATELY("IMMEDIATELY"),
 
-    DECOMMISSION("Decommission"),
+    DECOMMISSION("DECOMMISSION"),
 
-    DECOMMISSION_THEN_IDLE("DecommissionThenIdle"),
+    DECOMMISSIONTHENIDLE("DECOMMISSIONTHENIDLE"),
 
-    GRACEFUL("Graceful"),
+    GRACEFUL("GRACEFUL"),
 
-    RECOMMISSION("Recommission"),
+    RECOMMISSION("RECOMMISSION"),
 
-    NONE("None");
+    NONE("NONE");
 
     private String value;
 
@@ -76,7 +76,7 @@ public String toString() {
     @JsonCreator
     public static EventTypeEnum fromValue(String value) {
       for (EventTypeEnum b : EventTypeEnum.values()) {
-        if (b.value.equals(value)) {
+        if (b.value.equalsIgnoreCase(value)) {
           return b;
         }
       }

openapi/openapi-client/src/main/java/org/apache/celeborn/rest/v1/model/WorkerExitRequest.java

@@ -40,13 +40,13 @@ public class WorkerExitRequest {
    * The type of the worker exit request.
    */
   public enum TypeEnum {
-    DECOMMISSION("Decommission"),
+    DECOMMISSION("DECOMMISSION"),
 
-    GRACEFUL("Graceful"),
+    GRACEFUL("GRACEFUL"),
 
-    IMMEDIATELY("Immediately"),
+    IMMEDIATELY("IMMEDIATELY"),
 
-    NONE("None");
+    NONE("NONE");
 
     private String value;
 
@@ -67,7 +67,7 @@ public String toString() {
     @JsonCreator
     public static TypeEnum fromValue(String value) {
       for (TypeEnum b : TypeEnum.values()) {
-        if (b.value.equals(value)) {
+        if (b.value.equalsIgnoreCase(value)) {
           return b;
         }
       }

openapi/openapi-client/src/main/openapi3/master_rest_v1.yaml

@@ -706,12 +706,12 @@ components:
           type: string
           description: The type of the event.
           enum:
-            - Immediately
-            - Decommission
-            - DecommissionThenIdle
-            - Graceful
-            - Recommission
-            - None
+            - IMMEDIATELY
+            - DECOMMISSION
+            - DECOMMISSIONTHENIDLE
+            - GRACEFUL
+            - RECOMMISSION
+            - NONE
         workers:
           type: array
           description: The workers to send the event.

openapi/openapi-client/src/main/openapi3/worker_rest_v1.yaml

@@ -602,13 +602,13 @@ components:
       properties:
         type:
           type: string
-          default: None
+          default: NONE
           description: The type of the worker exit request.
           enum:
-            - Decommission
-            - Graceful
-            - Immediately
-            - None
+            - DECOMMISSION
+            - GRACEFUL
+            - IMMEDIATELY
+            - NONE
 
     HandleResponse:
       type: object

project/CelebornBuild.scala

@@ -1364,6 +1364,7 @@ object CelebornOpenApi {
       "supportUrlQuery" -> "false",
       "annotationLibrary" -> "none",
       "templateDir" -> s"$openApiSpecDir/templates",
+      "useEnumCaseInsensitive" -> "true"
     )
   )
 

service/src/main/scala/org/apache/celeborn/server/common/HttpService.scala

@@ -27,7 +27,7 @@ import org.eclipse.jetty.servlet.FilterHolder
 import org.apache.celeborn.common.CelebornConf
 import org.apache.celeborn.common.internal.Logging
 import org.apache.celeborn.common.meta.WorkerInfo
-import org.apache.celeborn.common.protocol.TransportModuleConstants
+import org.apache.celeborn.common.protocol.{TransportModuleConstants, WorkerEventType}
 import org.apache.celeborn.common.util.Utils
 import org.apache.celeborn.server.common.http.HttpServer
 import org.apache.celeborn.server.common.http.api.ApiRootResource
@@ -187,7 +187,9 @@ abstract class HttpService extends Service with Logging {
 
   def exit(exitType: String): String = throw new UnsupportedOperationException()
 
-  def handleWorkerEvent(workerEventType: String, workers: Seq[WorkerInfo]): HandleResponse =
+  def handleWorkerEvent(
+      workerEventType: WorkerEventType,
+      workers: Seq[WorkerInfo]): HandleResponse =
     throw new UnsupportedOperationException()
 
   def getWorkerEventInfo(): String = throw new UnsupportedOperationException()

worker/src/test/scala/org/apache/celeborn/service/deploy/worker/http/api/v1/ApiV1OpenapiClientSuite.scala

@@ -108,7 +108,7 @@ class ApiV1OpenapiClientSuite extends ApiV1WorkerOpenapiClientSuite {
 
     handleResponse = api.sendWorkerEvent(
       new SendWorkerEventRequest().addWorkersItem(workerId).eventType(
-        EventTypeEnum.DECOMMISSION_THEN_IDLE))
+        EventTypeEnum.DECOMMISSIONTHENIDLE))
     assert(handleResponse.getSuccess)
 
     assert(!api.getWorkerEvents.getWorkerEvents.isEmpty)