add enum name mapping option to swift generators (#17297)

OpenAPITools · Dec 5, 2023 · cdb020d · cdb020d
1 parent bbd0ce3
commit cdb020d
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 3 deletions.
diff --git a/bin/configs/swift-combine-petstore-new.yaml b/bin/configs/swift-combine-petstore-new.yaml
@@ -5,3 +5,5 @@ templateDir: modules/openapi-generator/src/main/resources/swift-combine
 additionalProperties:
   hideGenerationTimestamp: "true"
   projectName: "PetstoreOpenAPI"
+enumNameMappings:
+  delivered: shipped
diff --git a/bin/configs/swift5-default.yaml b/bin/configs/swift5-default.yaml
@@ -8,3 +8,5 @@ additionalProperties:
   podSummary: PetstoreClient
   projectName: PetstoreClient
   podHomepage: https://github.com/openapitools/openapi-generator
+enumNameMappings:
+  delivered: shipped
diff --git a/...enapi-generator/src/main/java/org/openapitools/codegen/languages/Swift5ClientCodegen.java b/...enapi-generator/src/main/java/org/openapitools/codegen/languages/Swift5ClientCodegen.java
@@ -1027,6 +1027,10 @@ public String toEnumDefaultValue(String value, String datatype) {
 
     @Override
     public String toEnumVarName(String name, String datatype) {
+        if (enumNameMapping.containsKey(name)) {
+            return enumNameMapping.get(name);
+        }
+
         if (name.length() == 0) {
             return "empty";
         }
@@ -1127,6 +1131,10 @@ private String titleCase(final String input) {
 
     @Override
     public String toEnumName(CodegenProperty property) {
+        if (enumNameMapping.containsKey(property.name)) {
+            return enumNameMapping.get(property.name);
+        }
+
         String enumName = toModelName(property.name);
 
         // Ensure that the enum type doesn't match a reserved word or

diff --git a/...generator/src/main/java/org/openapitools/codegen/languages/SwiftCombineClientCodegen.java b/...generator/src/main/java/org/openapitools/codegen/languages/SwiftCombineClientCodegen.java
@@ -575,6 +575,10 @@ public String toEnumDefaultValue(String value, String datatype) {
 
     @Override
     public String toEnumVarName(String name, String datatype) {
+        if (enumNameMapping.containsKey(name)) {
+            return enumNameMapping.get(name);
+        }
+
         if (name.length() == 0) {
             return "empty";
         }
@@ -630,6 +634,10 @@ public String toEnumVarName(String name, String datatype) {
 
     @Override
     public String toEnumName(CodegenProperty property) {
+        if (enumNameMapping.containsKey(property.name)) {
+            return enumNameMapping.get(property.name);
+        }
+
         String enumName = toModelName(property.name);
 
         // Ensure that the enum type doesn't match a reserved word or

diff --git a/samples/client/petstore/swift-combine/client/PetstoreOpenAPI/Sources/Models/Order.swift b/samples/client/petstore/swift-combine/client/PetstoreOpenAPI/Sources/Models/Order.swift
@@ -12,7 +12,7 @@ public struct Order: Codable {
     public enum Status: String, Codable, CaseIterable {
         case placed = "placed"
         case approved = "approved"
-        case delivered = "delivered"
+        case shipped = "delivered"
     }
     public var id: Int64?
     public var petId: Int64?

diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Order.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
@@ -15,7 +15,7 @@ public struct Order: Codable, JSONEncodable, Hashable {
     public enum Status: String, Codable, CaseIterable {
         case placed = "placed"
         case approved = "approved"
-        case delivered = "delivered"
+        case shipped = "delivered"
     }
     public var id: Int64?
     public var petId: Int64?

diff --git a/...les/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift b/...les/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
@@ -13,5 +13,5 @@ import AnyCodable
 public enum OuterEnum: String, Codable, CaseIterable {
     case placed = "placed"
     case approved = "approved"
-    case delivered = "delivered"
+    case shipped = "delivered"
 }