Resolve issue with enums with spaces (#47)

Fixes #46
dart-ogurets · Jun 15, 2021 · 440a465 · 440a465
1 parent 713a8f3
commit 440a465
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 7 deletions.
diff --git a/src/it/k8s/test.yaml b/src/it/k8s/test.yaml
@@ -549,4 +549,9 @@ components:
           type: string
         count:
           type: number
-
+    NumericAndSpacedEnum:
+      type: string
+      enum:
+        - Ahoy There
+        - 18 Spaces Here
+        - 667
diff --git a/src/it/k8s_null/test.yaml b/src/it/k8s_null/test.yaml
@@ -549,4 +549,9 @@ components:
           type: string
         count:
           type: number
-
+    NumericAndSpacedEnum:
+      type: string
+      enum:
+        - Ahoy There
+        - 18 Spaces Here
+        - 667
diff --git a/src/main/java/cd/connect/openapi/DartV3ApiGenerator.java b/src/main/java/cd/connect/openapi/DartV3ApiGenerator.java
@@ -167,9 +167,10 @@ public String toVarName(String name) {
     }
 
     name = name.replaceAll("-", "_")
+      .replaceAll(" ", "_")
       .replaceAll("\\$", "__")
       .replaceAll("\\^", "__")
-      .replaceAll("\\=", "__");
+      .replaceAll("\\=", "__").trim();
 
     if (name.matches("^[A-Z_]*$")) {
       return name;
@@ -399,6 +400,8 @@ public Map<String, Object> updateAllModels(Map<String, Object> objs) {
     return objs;
   }
 
+
+
   // TODO: check with multiple levels of hierarchy
   private void updateModelsWithAllOfInheritance(Map<String, CodegenModel> models) {
     for (CodegenModel cm : models.values()) {

diff --git a/src/test/java/cd/connect/openapi/SampleRunner.java b/src/test/java/cd/connect/openapi/SampleRunner.java
@@ -22,10 +22,9 @@ public void runGenerator() {
       "--additional-properties", "pubName=sample_app",
 //      "--type-mappings", "int-or-string=IntOrString",
 //      "--import-mappings", "IntOrString=./int_or_string.dart",
-      "--global-property", "skipFormModel=false",
-//      "--additional-properties", "nullSafe=true",
-//      "--additional-properties", "nullSafe-array-default=true",
-      "--additional-properties", "listAnyOf=true",
+//      "--global-property", "skipFormModel=false",
+      "--additional-properties", "nullSafe=true",
+      "--additional-properties", "nullSafe-array-default=true",
       "--output", "target/" + getClass().getSimpleName())
       .toArray(new String[0]));
   }

diff --git a/src/test/resources/test.yaml b/src/test/resources/test.yaml
@@ -404,6 +404,12 @@ components:
           type: string
         imageUrl:
           type: string
+    NumericAndSpacedEnum:
+      type: string
+      enum:
+        - Ahoy There
+        - 18 Spaces Here
+        - 667
     EventStatus:
       type: string
       enum: