#25, should generate valid type name

(cherry picked from commit 9014b54)

Author: hauner

openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/writer/java/ModelClassNameCreator.kt

@@ -13,13 +13,15 @@ import io.openapiprocessor.core.support.capitalizeFirstChar
 class ModelClassNameCreator(private val suffix: String) {
 
     fun createName(dataTypeName: String): String {
+        val classTypeName = toClass(dataTypeName)
+
         if (dataTypeName.isEmpty())
-            return dataTypeName
+            return classTypeName
 
         if (dataTypeName.endsWith(suffix.capitalizeFirstChar()))
-            return dataTypeName
+            return classTypeName
 
-        return "$dataTypeName${suffix.capitalizeFirstChar()}"
+        return "$classTypeName${suffix.capitalizeFirstChar()}"
     }
 
 }

openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/writer/java/ModelClassNameCreatorSpec.kt

@@ -20,4 +20,8 @@ class ModelClassNameCreatorSpec : StringSpec({
         creator.createName("FooX") shouldBe "FooX"
     }
 
+    "create valid java class name" {
+        val creator = ModelClassNameCreator("")
+        creator.createName("foo-foo") shouldBe "FooFoo"
+    }
 })

openapi-processor-core/src/testInt/resources/tests/params-enum/generated.yaml

@@ -2,3 +2,4 @@ items:
   - generated/api/EnumApi.java
   - generated/model/Bar.java
   - generated/model/Foo.java
+  - generated/model/FooFoo.java

openapi-processor-core/src/testInt/resources/tests/params-enum/generated/api/EnumApi.java

@@ -4,6 +4,7 @@
 import annotation.Parameter;
 import generated.model.Bar;
 import generated.model.Foo;
+import generated.model.FooFoo;
 import generated.support.Generated;
 
 @Generated(value = "openapi-processor-core", version = "test")
@@ -14,4 +15,7 @@ void getEndpoint(
             @Parameter Foo foo,
             @Parameter Bar bar);
 
+    @Mapping("/endpoint-dashed")
+    void getEndpointDashed(@Parameter FooFoo fooFoo);
+
 }

openapi-processor-core/src/testInt/resources/tests/params-enum/generated/model/FooFoo.java

@@ -0,0 +1,34 @@
+package generated.model;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import generated.support.Generated;
+
+@Generated(value = "openapi-processor-core", version = "test")
+public enum FooFoo {
+    FOO("foo"),
+    FOO_2("foo-2"),
+    FOO_FOO("foo-foo");
+
+    private final String value;
+
+    FooFoo(String value) {
+        this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+        return this.value;
+    }
+
+    @JsonCreator
+    public static FooFoo fromValue(String value) {
+        for (FooFoo val : FooFoo.values()) {
+            if (val.value.equals(value)) {
+                return val;
+            }
+        }
+        throw new IllegalArgumentException(value);
+    }
+
+}

openapi-processor-core/src/testInt/resources/tests/params-enum/inputs/openapi30.yaml

@@ -30,6 +30,25 @@ paths:
         '204':
           description: empty
 
+  /endpoint-dashed:
+    get:
+      tags:
+        - enum
+      parameters:
+        - name: foo-foo
+          description: enum parameter
+          in: query
+          required: true
+          schema:
+            type: string
+            enum:
+              - foo
+              - foo-2
+              - foo-foo
+      responses:
+        '204':
+          description: empty
+
 components:
   schemas:
 

openapi-processor-core/src/testInt/resources/tests/params-enum/inputs/openapi31.yaml

@@ -30,6 +30,25 @@ paths:
         '204':
           description: empty
 
+  /endpoint-dashed:
+    get:
+      tags:
+        - enum
+      parameters:
+        - name: foo-foo
+          description: enum parameter
+          in: query
+          required: true
+          schema:
+            type: string
+            enum:
+              - foo
+              - foo-2
+              - foo-foo
+      responses:
+        '204':
+          description: empty
+
 components:
   schemas: