create model enum classes

Author: hauner

src/main/groovy/com/github/hauner/openapi/spring/model/DataTypes.groovy

@@ -18,6 +18,7 @@ package com.github.hauner.openapi.spring.model
 
 import com.github.hauner.openapi.spring.model.datatypes.DataType
 import com.github.hauner.openapi.spring.model.datatypes.ObjectDataType
+import com.github.hauner.openapi.spring.model.datatypes.StringEnumDataType
 
 /**
  * Container for Java data types from OpenAPI '#/component/schemas'.
@@ -49,6 +50,18 @@ class DataTypes {
         } as List<ObjectDataType>
     }
 
+    /**
+     * provides the enum data types (model classes) used by the api endpoints. For this object
+     * the generatr will create enum classes.
+     *
+     * @return list of enum data types
+     */
+    List<StringEnumDataType> getEnumDataTypes () {
+        types.values ().findAll {
+          it instanceof StringEnumDataType
+        } as List<StringEnumDataType>
+    }
+
     void add (List<DataType> dataTypes) {
         dataTypes.each {
             types.put (it.name, it)

src/main/groovy/com/github/hauner/openapi/spring/writer/ApiWriter.groovy

@@ -19,6 +19,7 @@ package com.github.hauner.openapi.spring.writer
 import com.github.hauner.openapi.spring.converter.ApiOptions
 import com.github.hauner.openapi.spring.model.Api
 import com.github.hauner.openapi.spring.model.datatypes.ObjectDataType
+import com.github.hauner.openapi.spring.model.datatypes.StringEnumDataType
 import groovy.util.logging.Slf4j
 
 /**
@@ -32,6 +33,7 @@ class ApiWriter {
     private ApiOptions options
     InterfaceWriter interfaceWriter
     DataTypeWriter dataTypeWriter
+    StringEnumWriter enumWriter
 
     File apiFolder
     File modelFolder
@@ -41,12 +43,17 @@ class ApiWriter {
         this.options = options
         this.interfaceWriter = interfaceWriter
         this.dataTypeWriter = new DataTypeWriter(headerWriter: new HeaderWriter ())
+        this.enumWriter = new StringEnumWriter()
     }
 
-    ApiWriter(ApiOptions options, InterfaceWriter interfaceWriter, DataTypeWriter dataTypeWriter) {
+    ApiWriter(ApiOptions options,
+              InterfaceWriter interfaceWriter,
+              DataTypeWriter dataTypeWriter,
+              StringEnumWriter enumWriter) {
         this.options = options
         this.interfaceWriter = interfaceWriter
         this.dataTypeWriter = dataTypeWriter
+        this.enumWriter = enumWriter
     }
 
     void write(Api api) {
@@ -65,6 +72,13 @@ class ApiWriter {
             dataTypeWriter.write (writer, it as ObjectDataType)
             writer.close ()
         }
+
+        api.models.enumDataTypes.each {
+            def target = new File (modelFolder, "${it.name}.java")
+            def writer = new FileWriter(target)
+            enumWriter.write (writer, it as StringEnumDataType)
+            writer.close ()
+        }
     }
 
     private void createTargetFolders () {

src/main/groovy/com/github/hauner/openapi/spring/writer/StringEnumWriter.groovy

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2019 the original authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.github.hauner.openapi.spring.writer
+
+import com.github.hauner.openapi.spring.model.datatypes.StringEnumDataType
+
+/**
+ * Writer for String enum.
+ *
+ * @author Martin Hauner
+ */
+class StringEnumWriter {
+
+    void write (Writer target, StringEnumDataType dataType) {
+    }
+
+}

src/test/groovy/com/github/hauner/openapi/spring/writer/ApiWriterSpec.groovy

@@ -23,6 +23,7 @@ import com.github.hauner.openapi.spring.model.Interface
 import com.github.hauner.openapi.spring.model.datatypes.MappedDataType
 import com.github.hauner.openapi.spring.model.datatypes.ObjectDataType
 import com.github.hauner.openapi.spring.model.datatypes.StringDataType
+import com.github.hauner.openapi.spring.model.datatypes.StringEnumDataType
 import com.github.hauner.openapi.spring.support.Sl4jMockRule
 import org.junit.Rule
 import org.junit.rules.TemporaryFolder
@@ -46,7 +47,7 @@ class ApiWriterSpec extends Specification {
         )
 
         when:
-        new ApiWriter (opts, Stub (InterfaceWriter)).write (new Api())
+        new ApiWriter (opts, Stub (InterfaceWriter), null, null).write (new Api())
 
         then:
         def api = new File([opts.targetDir, 'com', 'github', 'hauner', 'openapi', 'api'].join(File.separator))
@@ -66,7 +67,7 @@ class ApiWriterSpec extends Specification {
         when:
         target.newFolder ('java', 'src', 'com', 'github', 'hauner', 'openapi', 'api')
         target.newFolder ('java', 'src', 'com', 'github', 'hauner', 'openapi', 'model')
-        new ApiWriter (opts, Stub (InterfaceWriter)).write (new Api())
+        new ApiWriter (opts, Stub (InterfaceWriter), null, null).write (new Api())
 
         then:
         0 * log.error (*_)
@@ -94,7 +95,7 @@ class ApiWriterSpec extends Specification {
         ])
 
         when:
-        new ApiWriter (opts, interfaceWriter).write (api)
+        new ApiWriter (opts, interfaceWriter, null, null).write (api)
 
         then:
         def fooSource = new File(getApiPath (opts.targetDir, 'FooApi.java'))
@@ -129,7 +130,7 @@ Bar interface!
         def api = new Api(dt)
 
         when:
-        new ApiWriter (opts, Stub(InterfaceWriter), dataTypeWriter).write (api)
+        new ApiWriter (opts, Stub(InterfaceWriter), dataTypeWriter, Stub(StringEnumWriter)).write (api)
 
         then:
         def fooSource = new File(getModelPath (opts.targetDir, 'Foo.java'))
@@ -142,6 +143,41 @@ Bar class!
 """
     }
 
+    void "generates model enum sources in model target folder"() {
+        def enumWriter = Stub (StringEnumWriter) {
+            write (_ as Writer, _ as StringEnumDataType) >> {
+                Writer writer = it.get(0)
+                writer.write ('Foo enum!\n')
+            } >> {
+                Writer writer = it.get(0)
+                writer.write ('Bar enum!\n')
+            }
+        }
+
+        def opts = new ApiOptions(
+            packageName: 'com.github.hauner.openapi',
+            targetDir: [target.root.toString (), 'java', 'src'].join (File.separator)
+        )
+
+        def dt = new DataTypes()
+        dt.add ('foo', new StringEnumDataType(pkg: "${opts.packageName}.model", type: 'foo'))
+        dt.add (new StringEnumDataType(pkg: "${opts.packageName}.model", type: 'Bar'))
+        def api = new Api(dt)
+
+        when:
+        new ApiWriter (opts, Stub(InterfaceWriter), Stub(DataTypeWriter), enumWriter).write (api)
+
+        then:
+        def fooSource = new File(getModelPath (opts.targetDir, 'Foo.java'))
+        fooSource.text == """\
+Foo enum!
+"""
+        def barSource = new File(getModelPath (opts.targetDir, 'Bar.java'))
+        barSource.text == """\
+Bar enum!
+"""
+    }
+
     void "generates model for object data types only" () {
         def dataTypeWriter = Mock (DataTypeWriter) {
             write (_ as Writer, _ as ObjectDataType) >> {
@@ -166,7 +202,7 @@ Bar class!
         def api = new Api(dt)
 
         when:
-        new ApiWriter (opts, Stub(InterfaceWriter), dataTypeWriter).write (api)
+        new ApiWriter (opts, Stub(InterfaceWriter), dataTypeWriter, Stub(StringEnumWriter)).write (api)
 
         then:
         0 * dataTypeWriter.write (_, dt.find ('simple'))